Merge "Resolve CompoundButton's foreground drawable for layout direction change" into mnc-dev

2015-06-30 21:42:41 +00:00
parent 99aa13ec10 3380e69f55
commit e08f3b3ff5
1 changed files with 11 additions and 0 deletions
--- a/core/java/android/widget/CompoundButton.java
+++ b/core/java/android/widget/CompoundButton.java
@@ -244,6 +244,17 @@ public abstract class CompoundButton extends Button implements Checkable {
        }
    }

+    /**
+     * @hide
+     */
+    @Override
+    public void onResolveDrawables(@ResolvedLayoutDir int layoutDirection) {
+        super.onResolveDrawables(layoutDirection);
+        if (mButtonDrawable != null) {
+            mButtonDrawable.setLayoutDirection(layoutDirection);
+        }
+    }
+
    /**
     * @return the drawable used as the compound button image
     * @see #setButtonDrawable(Drawable)