summaryrefslogtreecommitdiff
path: root/core/java/android
diff options
context:
space:
mode:
authorDerek Sollenberger <djsollen@google.com>2018-07-16 15:49:42 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2018-07-16 15:49:42 +0000
commitb6c4f6cda9bda2bfdb106eb1d6e375d644a88ef1 (patch)
tree8dfeb2cc373df8dcbeaa9bfb714cdb7c23b81734 /core/java/android
parentb1d24c0aced9371c286f4cc3219a7561394bc176 (diff)
parentd4ca6d1c7ae5ad3736717c04ffb368a7d9d26ac0 (diff)
Merge "TextView setOverlappingRendering must be true when shadows are used."
Diffstat (limited to 'core/java/android')
-rw-r--r--core/java/android/widget/TextView.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java
index 2e7ef8b4e28a..ea546969ae4d 100644
--- a/core/java/android/widget/TextView.java
+++ b/core/java/android/widget/TextView.java
@@ -6973,7 +6973,8 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
public boolean hasOverlappingRendering() {
// horizontal fading edge causes SaveLayerAlpha, which doesn't support alpha modulation
return ((getBackground() != null && getBackground().getCurrent() != null)
- || mSpannable != null || hasSelection() || isHorizontalFadingEdgeEnabled());
+ || mSpannable != null || hasSelection() || isHorizontalFadingEdgeEnabled()
+ || mShadowColor != 0);
}
/**