diff options
| author | Alan Viverette <alanv@google.com> | 2015-02-25 19:15:35 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-02-25 19:15:40 +0000 |
| commit | a6d44842189bdccfc7717edc22ff9361d3cc6c0c (patch) | |
| tree | 6c682943656e35c3d11681b653b487142c5f5800 /graphics | |
| parent | 924a18baa254a5f73e8e38b5730b1acd1e7faf19 (diff) | |
| parent | f74869698abff333daed28aa2f472a1e3183c2ed (diff) | |
| download | frameworks_base-a6d44842189bdccfc7717edc22ff9361d3cc6c0c.zip frameworks_base-a6d44842189bdccfc7717edc22ff9361d3cc6c0c.tar.gz frameworks_base-a6d44842189bdccfc7717edc22ff9361d3cc6c0c.tar.bz2 | |
Merge "Create blank state in no-arg RotateDrawable constructor"
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/java/android/graphics/drawable/InsetDrawable.java | 8 | ||||
| -rw-r--r-- | graphics/java/android/graphics/drawable/RotateDrawable.java | 2 |
2 files changed, 3 insertions, 7 deletions
diff --git a/graphics/java/android/graphics/drawable/InsetDrawable.java b/graphics/java/android/graphics/drawable/InsetDrawable.java index b0cd386..97f7105 100644 --- a/graphics/java/android/graphics/drawable/InsetDrawable.java +++ b/graphics/java/android/graphics/drawable/InsetDrawable.java @@ -58,7 +58,7 @@ public class InsetDrawable extends DrawableWrapper { * No-arg constructor used by drawable inflation. */ InsetDrawable() { - this(new InsetState(), null); + this(new InsetState(null), null); } /** @@ -82,7 +82,7 @@ public class InsetDrawable extends DrawableWrapper { */ public InsetDrawable(Drawable drawable, int insetLeft, int insetTop,int insetRight, int insetBottom) { - this(new InsetState(), null); + this(new InsetState(null), null); mState.mInsetLeft = insetLeft; mState.mInsetTop = insetTop; @@ -267,10 +267,6 @@ public class InsetDrawable extends DrawableWrapper { int mInsetRight = 0; int mInsetBottom = 0; - InsetState() { - this(null); - } - InsetState(InsetState orig) { super(orig); diff --git a/graphics/java/android/graphics/drawable/RotateDrawable.java b/graphics/java/android/graphics/drawable/RotateDrawable.java index 595061c..aeef659 100644 --- a/graphics/java/android/graphics/drawable/RotateDrawable.java +++ b/graphics/java/android/graphics/drawable/RotateDrawable.java @@ -61,7 +61,7 @@ public class RotateDrawable extends DrawableWrapper { * Create a new rotating drawable with an empty state. */ public RotateDrawable() { - this(null, null); + this(new RotateState(null), null); } @Override |