summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Spurlock <jspurlock@google.com>2013-11-05 18:56:58 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2013-11-05 18:56:58 -0800
commitfc5ef04e4d1e3eca1d807d00f12a3f84f8028b8b (patch)
tree8e115c1cee78dc66dd784cbb0a36bf4b704ed27c
parent8c08fc27bba86f92773a5bcb0a14e8e4e03e5de1 (diff)
parente88d14a8b8101248ce0a3b3b00993fd1393f6be2 (diff)
downloadframeworks_base-fc5ef04e4d1e3eca1d807d00f12a3f84f8028b8b.zip
frameworks_base-fc5ef04e4d1e3eca1d807d00f12a3f84f8028b8b.tar.gz
frameworks_base-fc5ef04e4d1e3eca1d807d00f12a3f84f8028b8b.tar.bz2
am e88d14a8: am 9d383ece: Merge "Fix recent regression in DrawableContainer." into klp-dev
* commit 'e88d14a8b8101248ce0a3b3b00993fd1393f6be2': Fix recent regression in DrawableContainer.
-rw-r--r--graphics/java/android/graphics/drawable/DrawableContainer.java2
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