diff options
| author | Chris Craik <ccraik@google.com> | 2013-10-11 14:00:31 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-10-11 14:00:31 -0700 |
| commit | 1ae78c07807e0db300f965bf3b0371f3eddc2d15 (patch) | |
| tree | 3089ff1683a28d553e3ff2c5bedf8493d72f83ea /core/java/android/widget/TextView.java | |
| parent | c8c943a93044f63e27b725901568dc62a84606a8 (diff) | |
| parent | c2245e1ac7b4419936e9891113d9c1e7ea7d65d4 (diff) | |
am c2245e1a: Merge "Workaround fading edge incompatibility with alpha modulation" into klp-dev
* commit 'c2245e1ac7b4419936e9891113d9c1e7ea7d65d4':
Workaround fading edge incompatibility with alpha modulation
Diffstat (limited to 'core/java/android/widget/TextView.java')
| -rw-r--r-- | core/java/android/widget/TextView.java | 4 |
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()); } /** |