summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDoris Liu <tianliu@google.com>2015-06-30 21:42:41 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-06-30 21:42:43 +0000
commite08f3b3ff5ec89bc8c94b5d3d6518afde8e3b8a4 (patch)
tree84357e8f16f5dd6969811dadba05182bf02cb055
parent99aa13ec108e9cbb62984d79191548990809f95a (diff)
parent3380e69f5529972ff03b545353d5f1c5e2abc1b1 (diff)
downloadframeworks_base-e08f3b3ff5ec89bc8c94b5d3d6518afde8e3b8a4.zip
frameworks_base-e08f3b3ff5ec89bc8c94b5d3d6518afde8e3b8a4.tar.gz
frameworks_base-e08f3b3ff5ec89bc8c94b5d3d6518afde8e3b8a4.tar.bz2
Merge "Resolve CompoundButton's foreground drawable for layout direction change" into mnc-dev
-rw-r--r--core/java/android/widget/CompoundButton.java11
1 files changed, 11 insertions, 0 deletions
diff --git a/core/java/android/widget/CompoundButton.java b/core/java/android/widget/CompoundButton.java
index 770077d..602e1ab 100644
--- a/core/java/android/widget/CompoundButton.java
+++ b/core/java/android/widget/CompoundButton.java
@@ -245,6 +245,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)
* @see #setButtonDrawable(int)