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

am de91aa4b: Merge "Fix again bug #6887370 ListPreference shows misaligned radio drawables (in CheckedTextView?)" into jb-mr1-dev

Browse Source 
* commit 'de91aa4bec3ad7956895b230bd031f7982194b1b':
  Fix again bug #6887370 ListPreference shows misaligned radio drawables (in CheckedTextView?)
This commit is contained in:
Fabrice Di Meglio
2012-08-24 16:13:49 -07:00
committed by Android Git Automerger
parent 08453ecee2 de91aa4bec
commit b98a346020
1 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -175,11 +175,7 @@ public class CheckedTextView extends TextView implements Checkable {
@Override
protected void internalSetPadding(int left, int top, int right, int bottom) {
super.internalSetPadding(left, top, right, bottom);
if (isLayoutRtl()) {
mBasePadding = mUserPaddingLeft;
} else {
mBasePadding = mUserPaddingRight;
}
setBasePadding(isLayoutRtl());
}
@Override
@@ -201,13 +197,21 @@ public class CheckedTextView extends TextView implements Checkable {
@Override
public void setPadding(int left, int top, int right, int bottom) {
super.setPadding(left, top, right, bottom);
mBasePadding = getPaddingEnd();
setBasePadding(isLayoutRtl());
}
@Override
public void setPaddingRelative(int start, int top, int end, int bottom) {
super.setPaddingRelative(start, top, end, bottom);
mBasePadding = getPaddingEnd();
setBasePadding(isLayoutRtl());
}
private void setBasePadding(boolean isLayoutRtl) {
if (isLayoutRtl) {
mBasePadding = mPaddingLeft;
} else {
mBasePadding = mPaddingRight;
}
}
@Override
@@ -237,11 +241,11 @@ public class CheckedTextView extends TextView implements Checkable {
final int left;
final int right;
if (isLayoutRtl) {
right = getPaddingEnd();
left = right - mCheckMarkWidth;
} else {
left = width - getPaddingEnd();
left = mBasePadding;
right = left + mCheckMarkWidth;
} else {
right = width - mBasePadding;
left = right - mCheckMarkWidth;
}
checkMarkDrawable.setBounds( left, top, right, bottom);
checkMarkDrawable.draw(canvas);