diff options
| author | Alan Viverette <alanv@google.com> | 2014-05-21 18:10:53 -0700 |
|---|---|---|
| committer | Alan Viverette <alanv@google.com> | 2014-05-21 18:10:53 -0700 |
| commit | 0a1c6f021be032f5aecb341c2794efb06c0a8a0d (patch) | |
| tree | 82a605f2da8c3fcd0d1221b60445e9207e81bd10 /graphics | |
| parent | c106c12e566d48e81a0ad0bf7ee614c50c6aef39 (diff) | |
| download | frameworks_base-0a1c6f021be032f5aecb341c2794efb06c0a8a0d.zip frameworks_base-0a1c6f021be032f5aecb341c2794efb06c0a8a0d.tar.gz frameworks_base-0a1c6f021be032f5aecb341c2794efb06c0a8a0d.tar.bz2 | |
Style and asset cleanup
Updates button drawable and colors, cleans up Quantum styles, updates
highlight attribute name and color, fixes popup backgrounds.
Also fixes GradientDrawable opacity check.
Change-Id: I75dd35e815a8a33ec9f0b16e881e774edfb8c092
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/java/android/graphics/drawable/GradientDrawable.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/graphics/java/android/graphics/drawable/GradientDrawable.java b/graphics/java/android/graphics/drawable/GradientDrawable.java index 4a4a06b..f82acc3 100644 --- a/graphics/java/android/graphics/drawable/GradientDrawable.java +++ b/graphics/java/android/graphics/drawable/GradientDrawable.java @@ -818,7 +818,8 @@ public class GradientDrawable extends Drawable { @Override public int getOpacity() { - return mGradientState.mOpaque ? PixelFormat.OPAQUE : PixelFormat.TRANSLUCENT; + return (mAlpha == 255 && mGradientState.mOpaque) ? + PixelFormat.OPAQUE : PixelFormat.TRANSLUCENT; } @Override |