summaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
authorRomain Guy <romainguy@google.com>2011-08-26 19:30:08 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-08-26 19:30:08 -0700
commit3957a76d7738ff6fd75bfeb41b04511eec79d488 (patch)
treee14ed605e03ae307317897c2d0ccc695cac50a4f /core
parentd96dbbe3356d6863c13134e545d281a56443f9b1 (diff)
parentaa1c88de0232e0ed9d741895ce2e67356c1b120f (diff)
Merge "ToggleButton could keep a reference to a previous drawable"
Diffstat (limited to 'core')
-rw-r--r--core/java/android/widget/ToggleButton.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/core/java/android/widget/ToggleButton.java b/core/java/android/widget/ToggleButton.java
index ba9de24a27db..a75426854e14 100644
--- a/core/java/android/widget/ToggleButton.java
+++ b/core/java/android/widget/ToggleButton.java
@@ -138,6 +138,8 @@ public class ToggleButton extends CompoundButton {
LayerDrawable layerDrawable = (LayerDrawable) backgroundDrawable;
mIndicatorDrawable =
layerDrawable.findDrawableByLayerId(com.android.internal.R.id.toggle);
+ } else {
+ mIndicatorDrawable = null;
}
}