summaryrefslogtreecommitdiffstats
path: root/graphics
diff options
context:
space:
mode:
authorJohn Spurlock <jspurlock@google.com>2013-11-06 02:29:19 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-11-06 02:29:20 +0000
commit9d383ece52620b0358bcfae7f2102b64acd1d5cb (patch)
tree23a545e2b6bc53ec5829c37a3d227aa5ea3d0518 /graphics
parent6fbd4829a9614f0d6c668cd5ccba6cabdaeb81a0 (diff)
parentf68bb66c6ec239790ba18b8d078eb7ab4894fdc3 (diff)
downloadframeworks_base-9d383ece52620b0358bcfae7f2102b64acd1d5cb.zip
frameworks_base-9d383ece52620b0358bcfae7f2102b64acd1d5cb.tar.gz
frameworks_base-9d383ece52620b0358bcfae7f2102b64acd1d5cb.tar.bz2
Merge "Fix recent regression in DrawableContainer." into klp-dev
Diffstat (limited to 'graphics')
-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