Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Fabrice Di Meglio
2012-09-30 11:33:30 -07:00
committed by Android (Google) Code Review
parent 8ed6b6a96b 47fb191841
commit 10c84edcfa
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/java/android/view/View.java
View File

@@ -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
*/

6
core/java/android/widget/CheckedTextView.java
View File

@@ -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);