commit b067405bf453289a6b6bfd34b06700f08be58c24
author Alan Viverette <alanv@google.com> Fri Sep 26 16:12:16 2014 -0700
committer Alan Viverette <alanv@google.com> Fri Sep 26 16:12:16 2014 -0700
tree 0808109294ae56586c0d0d89b02b0d77033c3964
parent a0f63c6e9522b891898c665be58415d34a1dd6c1

Add callback to track and thumb drawables, propagate state in ASLD

BUG: 17665424
Change-Id: I22da4530f3e2869d856102e804f020461a46fe49

core/java/android/widget/Switch.java

diff --git a/core/java/android/widget/Switch.java b/core/java/android/widget/Switch.java
index 8b97329..a898084 100644
--- a/core/java/android/widget/Switch.java
+++ b/core/java/android/widget/Switch.java
@@ -208,7 +208,13 @@
         final TypedArray a = context.obtainStyledAttributes(
                 attrs, com.android.internal.R.styleable.Switch, defStyleAttr, defStyleRes);
         mThumbDrawable = a.getDrawable(com.android.internal.R.styleable.Switch_thumb);
+        if (mThumbDrawable != null) {
+            mThumbDrawable.setCallback(this);
+        }
         mTrackDrawable = a.getDrawable(com.android.internal.R.styleable.Switch_track);
+        if (mTrackDrawable != null) {
+            mTrackDrawable.setCallback(this);
+        }
         mTextOn = a.getText(com.android.internal.R.styleable.Switch_textOn);
         mTextOff = a.getText(com.android.internal.R.styleable.Switch_textOff);
         mShowText = a.getBoolean(com.android.internal.R.styleable.Switch_showText, true);
@@ -433,7 +439,13 @@
      * @attr ref android.R.styleable#Switch_track
      */
     public void setTrackDrawable(Drawable track) {
+        if (mTrackDrawable != null) {
+            mTrackDrawable.setCallback(null);
+        }
         mTrackDrawable = track;
+        if (track != null) {
+            track.setCallback(this);
+        }
         requestLayout();
     }
 
@@ -468,7 +480,13 @@
      * @attr ref android.R.styleable#Switch_thumb
      */
     public void setThumbDrawable(Drawable thumb) {
+        if (mThumbDrawable != null) {
+            mThumbDrawable.setCallback(null);
+        }
         mThumbDrawable = thumb;
+        if (thumb != null) {
+            thumb.setCallback(this);
+        }
         requestLayout();
     }