am 10c84edc: Merge "Fix bug #7199562 UI mirroring for RTL locales (Arabic,... (3332a701) · Commits · e / os / android_frameworks_base

core/java/android/view/View.java

+8 −0

Original line number	Diff line number	Diff line
		@@ -14775,6 +14775,14 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
		return (mUserPaddingStart != UNDEFINED_PADDING \|\| mUserPaddingEnd != UNDEFINED_PADDING);
		}

		/**
		* @hide
		*/
		public void resetPaddingToInitialValues() {
		mPaddingLeft = mUserPaddingLeftInitial;
		mPaddingRight = mUserPaddingRightInitial;
		}

		/**
		* @hide
		*/

+1 −5

Original line number	Diff line number	Diff line
		@@ -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 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
		@@ -190,6 +185,7 @@ public class CheckedTextView extends TextView implements Checkable {
		}

		private void updatePadding() {
		resetPaddingToInitialValues();
		int newPadding = (mCheckMarkDrawable != null) ?
		mCheckMarkWidth + mBasePadding : mBasePadding;
		mNeedRequestlayout \|= (mPaddingRight != newPadding);