From f74869698abff333daed28aa2f472a1e3183c2ed Mon Sep 17 00:00:00 2001 From: Alan Viverette Date: Wed, 25 Feb 2015 11:12:55 -0800 Subject: Create blank state in no-arg RotateDrawable constructor Also removes unnecessary constructor in InsetState so that it matches the other DrawableWrapper classes. Bug: 19489698 Change-Id: Ib2e510c6ae90858774970d928e541a9b08cb714a --- graphics/java/android/graphics/drawable/InsetDrawable.java | 8 ++------ graphics/java/android/graphics/drawable/RotateDrawable.java | 2 +- 2 files changed, 3 insertions(+), 7 deletions(-) (limited to 'graphics') 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 -- cgit v1.1