diff options
| author | Chet Haase <chet@google.com> | 2014-09-12 00:54:16 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-09-12 00:54:18 +0000 |
| commit | 25877af238133e7e621a48b35e041a03c27cf645 (patch) | |
| tree | 518bd6983d695a6eb32706a18ef962470620a167 /graphics | |
| parent | cf79a56c717d29d59d0e585aa9d94eb1238c726e (diff) | |
| parent | 22cf0b0cb856336d36961280b1e968a91d4488d5 (diff) | |
| download | frameworks_base-25877af238133e7e621a48b35e041a03c27cf645.zip frameworks_base-25877af238133e7e621a48b35e041a03c27cf645.tar.gz frameworks_base-25877af238133e7e621a48b35e041a03c27cf645.tar.bz2 | |
Merge "Unfilled shapes should not report themselves as opaque" into lmp-dev
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/java/android/graphics/drawable/GradientDrawable.java | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/graphics/java/android/graphics/drawable/GradientDrawable.java b/graphics/java/android/graphics/drawable/GradientDrawable.java index e1c88cb..2916d6c 100644 --- a/graphics/java/android/graphics/drawable/GradientDrawable.java +++ b/graphics/java/android/graphics/drawable/GradientDrawable.java @@ -1638,6 +1638,11 @@ public class GradientDrawable extends Drawable { } } + // An unfilled shape is not opaque over bounds or shape + if (mColors == null && mColorStateList == null) { + return; + } + // Colors are opaque, so opaqueOverShape=true, mOpaqueOverShape = true; // and opaqueOverBounds=true if shape fills bounds |