summaryrefslogtreecommitdiffstats
path: root/graphics/java
diff options
context:
space:
mode:
authorAlan Viverette <alanv@google.com>2014-09-11 00:22:02 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-09-11 00:22:10 +0000
commit87610e535d6aaec9983e1a476506a2fa6885800d (patch)
tree35e1abb38651db392c4711aa8a1dea3d3499343c /graphics/java
parent593f2d33bb1741123263e0179edda21315ea590c (diff)
parentc3a63c1fbb47f167f6736ad637fd6c6e3ee9d1d8 (diff)
downloadframeworks_base-87610e535d6aaec9983e1a476506a2fa6885800d.zip
frameworks_base-87610e535d6aaec9983e1a476506a2fa6885800d.tar.gz
frameworks_base-87610e535d6aaec9983e1a476506a2fa6885800d.tar.bz2
Merge "Copy opaque over shape in GradientDrawable copy constructor" into lmp-dev
Diffstat (limited to 'graphics/java')
-rw-r--r--graphics/java/android/graphics/drawable/GradientDrawable.java1
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 2c8611e..e1c88cb 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;