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

Author: Fabrice Di Meglio

core/java/android/view/View.java

@@ -14775,6 +14775,14 @@ public boolean isPaddingRelative() {
         return (mUserPaddingStart != UNDEFINED_PADDING || mUserPaddingEnd != UNDEFINED_PADDING);
     }
 
+    /**
+     * @hide
+     */
+    public void resetPaddingToInitialValues() {
+        mPaddingLeft = mUserPaddingLeftInitial;
+        mPaddingRight = mUserPaddingRightInitial;
+    }
+
     /**
      * @hide
      */

core/java/android/widget/CheckedTextView.java

@@ -46,9 +46,6 @@ 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
     };
@@ -179,8 +176,6 @@ public Drawable getCheckMarkDrawable() {
     protected void internalSetPadding(int left, int top, int right, int bottom) {
         super.internalSetPadding(left, top, right, bottom);
         setBasePadding(isLayoutRtl());
-        initialPaddingLeft = mPaddingLeft;
-        initialPaddingRight = mPaddingRight;
     }
 
     @Override
@@ -190,6 +185,7 @@ public void onRtlPropertiesChanged(int layoutDirection) {
     }
 
     private void updatePadding() {
+        resetPaddingToInitialValues();
         int newPadding = (mCheckMarkDrawable != null) ?
                 mCheckMarkWidth + mBasePadding : mBasePadding;
         mNeedRequestlayout |= (mPaddingRight != newPadding);