summaryrefslogtreecommitdiff
path: root/core/java/android/widget/TextView.java
diff options
context:
space:
mode:
authorChris Craik <ccraik@google.com>2013-10-11 20:57:34 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-10-11 20:57:34 +0000
commitc2245e1ac7b4419936e9891113d9c1e7ea7d65d4 (patch)
tree9b9666b2ffd9d6f3882eeef91684d3611efe5594 /core/java/android/widget/TextView.java
parent3691dd063f297162facebf723ac53831126395b5 (diff)
parent7bcde5009d4478d6f1af22687e2fa43be400fcfa (diff)
Merge "Workaround fading edge incompatibility with alpha modulation" into klp-dev
Diffstat (limited to 'core/java/android/widget/TextView.java')
-rw-r--r--core/java/android/widget/TextView.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java
index 61e071b8673b..cb930d6fbcb2 100644
--- a/core/java/android/widget/TextView.java
+++ b/core/java/android/widget/TextView.java
@@ -4870,8 +4870,10 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
@Override
public boolean hasOverlappingRendering() {
+ // horizontal fading edge causes SaveLayerAlpha, which doesn't support alpha modulation
return ((getBackground() != null && getBackground().getCurrent() != null)
- || mText instanceof Spannable || hasSelection());
+ || mText instanceof Spannable || hasSelection()
+ || isHorizontalFadingEdgeEnabled());
}
/**