Merge "ToggleButton could keep a reference to a previous drawable"

2011-08-26 19:30:08 -07:00
parent d96dbbe335 aa1c88de02
commit 3957a76d77
1 changed files with 2 additions and 0 deletions
--- 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;
        }
    }