diff options
author | John Spurlock <jspurlock@google.com> | 2013-11-05 18:59:18 -0800 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2013-11-05 18:59:18 -0800 |
commit | feafc99bdf03983fc252d19a1da8c57d4cfbf042 (patch) | |
tree | 3c17dc999204754f37b1c004a409107c644dde03 /graphics/java/android | |
parent | ab2525dd60c4ab5d8b45c660b7371a6f3e6a492f (diff) | |
parent | fc5ef04e4d1e3eca1d807d00f12a3f84f8028b8b (diff) | |
download | frameworks_base-feafc99bdf03983fc252d19a1da8c57d4cfbf042.zip frameworks_base-feafc99bdf03983fc252d19a1da8c57d4cfbf042.tar.gz frameworks_base-feafc99bdf03983fc252d19a1da8c57d4cfbf042.tar.bz2 |
am fc5ef04e: am e88d14a8: am 9d383ece: Merge "Fix recent regression in DrawableContainer." into klp-dev
* commit 'fc5ef04e4d1e3eca1d807d00f12a3f84f8028b8b':
Fix recent regression in DrawableContainer.
Diffstat (limited to 'graphics/java/android')
-rw-r--r-- | graphics/java/android/graphics/drawable/DrawableContainer.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/graphics/java/android/graphics/drawable/DrawableContainer.java b/graphics/java/android/graphics/drawable/DrawableContainer.java index 60e2376..af8441a 100644 --- a/graphics/java/android/graphics/drawable/DrawableContainer.java +++ b/graphics/java/android/graphics/drawable/DrawableContainer.java @@ -60,7 +60,7 @@ public class DrawableContainer extends Drawable implements Drawable.Callback { private long mExitAnimationEnd; private Drawable mLastDrawable; - private Insets mInsets; + private Insets mInsets = Insets.NONE; // overrides from Drawable |