diff options
| author | Alan Viverette <alanv@google.com> | 2014-09-11 00:39:58 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-09-11 00:39:58 +0000 |
| commit | 72b834a3019b725afbdc549315adf8e6c5b5cfe9 (patch) | |
| tree | eb4a0bf987b0a8a4c73cd3ad42502847fdfd667f /graphics/java | |
| parent | 86f062d98a8d42d64aef220870db75f51aa70ede (diff) | |
| parent | 7c676aab9f13318a2dc5d4eb9f1b1c398db57048 (diff) | |
| download | frameworks_base-72b834a3019b725afbdc549315adf8e6c5b5cfe9.zip frameworks_base-72b834a3019b725afbdc549315adf8e6c5b5cfe9.tar.gz frameworks_base-72b834a3019b725afbdc549315adf8e6c5b5cfe9.tar.bz2 | |
am 5d1f9528: am 2a94c34d: Merge "Copy opaque over shape in GradientDrawable copy constructor" into lmp-dev
* commit '5d1f9528fd1b6f4c7919c9e19f69c86bbf1dc561':
Copy opaque over shape in GradientDrawable copy constructor
Diffstat (limited to 'graphics/java')
| -rw-r--r-- | graphics/java/android/graphics/drawable/GradientDrawable.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/graphics/java/android/graphics/drawable/GradientDrawable.java b/graphics/java/android/graphics/drawable/GradientDrawable.java index f3d06b1..43f8bc6 100644 --- a/graphics/java/android/graphics/drawable/GradientDrawable.java +++ b/graphics/java/android/graphics/drawable/GradientDrawable.java @@ -1552,6 +1552,7 @@ public class GradientDrawable extends Drawable { mUseLevel = state.mUseLevel; mUseLevelForShape = state.mUseLevelForShape; mOpaqueOverBounds = state.mOpaqueOverBounds; + mOpaqueOverShape = state.mOpaqueOverShape; mThemeAttrs = state.mThemeAttrs; mAttrSize = state.mAttrSize; mAttrGradient = state.mAttrGradient; |