diff options
| author | Alan Viverette <alanv@google.com> | 2014-05-22 01:11:19 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-05-22 01:11:20 +0000 |
| commit | 190dad431747ccf7e3623e65a933b26fb6ee97d8 (patch) | |
| tree | e54c5166c0dc17e77521a24505624a17d9eb27df /graphics | |
| parent | f1cc12950c52ba7669fe1edfd8900aab1c40b78b (diff) | |
| parent | 0a1c6f021be032f5aecb341c2794efb06c0a8a0d (diff) | |
| download | frameworks_base-190dad431747ccf7e3623e65a933b26fb6ee97d8.zip frameworks_base-190dad431747ccf7e3623e65a933b26fb6ee97d8.tar.gz frameworks_base-190dad431747ccf7e3623e65a933b26fb6ee97d8.tar.bz2 | |
Merge "Style and asset cleanup"
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 |