summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Alan Viverette <alanv@google.com> 2015-04-10 17:50:19 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2015-04-10 17:50:21 +0000
commitd18c59b3e6d855e6a7ec12fd324791cd621a9b53 (patch)
tree2031de47da76a9f61e9b29de6bd2e531c0965e80
parentbb0acea215794f5386e08aca91ae918c8febb000 (diff)
parent9eaa604116ea5ee2eca81095d4d587fe680857a7 (diff)
Merge "Don't change state when inflating LayerDrawable"
-rw-r--r--graphics/java/android/graphics/drawable/LayerDrawable.java2
1 files changed, 0 insertions, 2 deletions
diff --git a/graphics/java/android/graphics/drawable/LayerDrawable.java b/graphics/java/android/graphics/drawable/LayerDrawable.java
index 78eee37528c1..05a81de8fb32 100644
--- a/graphics/java/android/graphics/drawable/LayerDrawable.java
+++ b/graphics/java/android/graphics/drawable/LayerDrawable.java
@@ -163,7 +163,6 @@ public class LayerDrawable extends Drawable implements Drawable.Callback {
inflateLayers(r, parser, attrs, theme);
ensurePadding();
- onStateChange(getState());
}
/**
@@ -307,7 +306,6 @@ public class LayerDrawable extends Drawable implements Drawable.Callback {
}
ensurePadding();
- onStateChange(getState());
}
@Override