Merge "Fix bug #7199562 UI mirroring for RTL locales (Arabic, Hebrew, Farsi): Play settings" into jb-mr1-dev

1 files changed, 16 insertions, 1 deletions

diff --git a/core/java/android/widget/CheckedTextView.java b/core/java/android/widget/CheckedTextView.java
index bc78adc..cea1fd5 100644
--- a/core/java/android/widget/CheckedTextView.java
+++ b/core/java/android/widget/CheckedTextView.java
@@ -46,6 +46,9 @@ public class CheckedTextView extends TextView implements Checkable {
     private int mCheckMarkWidth;
     private boolean mNeedRequestlayout;
 
+    private int initialPaddingLeft = -1;
+    private int initialPaddingRight = -1;
+
     private static final int[] CHECKED_STATE_SET = {
         R.attr.state_checked
     };
@@ -176,10 +179,22 @@ public class CheckedTextView extends TextView implements Checkable {
     protected void internalSetPadding(int left, int top, int right, int bottom) {
         super.internalSetPadding(left, top, right, bottom);
         setBasePadding(isLayoutRtl());
+        initialPaddingLeft = mPaddingLeft;
+        initialPaddingRight = mPaddingRight;
     }
 
     @Override
     public void onPaddingChanged(int layoutDirection) {
+        updatePadding();
+    }
+
+    @Override
+    public void onRtlPropertiesChanged() {
+        super.onRtlPropertiesChanged();
+        updatePadding();
+    }
+
+    private void updatePadding() {
         int newPadding = (mCheckMarkDrawable != null) ?
                 mCheckMarkWidth + mBasePadding : mBasePadding;
         mNeedRequestlayout |= (mPaddingRight != newPadding);
@@ -193,7 +208,7 @@ public class CheckedTextView extends TextView implements Checkable {
             mNeedRequestlayout = false;
         }
     }
-    
+
     @Override
     public void setPadding(int left, int top, int right, int bottom) {
         super.setPadding(left, top, right, bottom);