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

am 0590c1b6: Merge "Make CheckedTextView RTL aware - DO NOT MERGE" into jb-mr1-dev

Browse Source 
* commit '0590c1b64f8d73da3ccb582d5a865d4918b40733':
  Make CheckedTextView RTL aware - DO NOT MERGE
This commit is contained in:
Fabrice Di Meglio
2012-07-26 16:58:10 -07:00
committed by Android Git Automerger
parent 133f92f452 0590c1b64f
commit b113ca42a0
1 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -174,7 +174,11 @@ public class CheckedTextView extends TextView implements Checkable {
int newPadding = (mCheckMarkDrawable != null) ?
mCheckMarkWidth + mBasePadding : mBasePadding;
mNeedRequestlayout |= (mPaddingRight != newPadding);
mPaddingRight = newPadding;
if (isLayoutRtl()) {
mPaddingLeft = newPadding;
} else {
mPaddingRight = newPadding;
}
if (mNeedRequestlayout) {
requestLayout();
mNeedRequestlayout = false;
@@ -184,7 +188,7 @@ 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 = mPaddingRight;
mBasePadding = getPaddingEnd();
}
@Override
@@ -213,12 +217,13 @@ public class CheckedTextView extends TextView implements Checkable {
break;
}
int right = getWidth();
checkMarkDrawable.setBounds(
right - mPaddingRight,
y,
right - mPaddingRight + mCheckMarkWidth,
y + height);
final boolean isLayoutRtl = isLayoutRtl();
final int width = getWidth();
final int top = y;
final int bottom = top + height;
final int left = isLayoutRtl ? getPaddingEnd() : width - getPaddingEnd();
final int right = left + mCheckMarkWidth;
checkMarkDrawable.setBounds( left, top, right, bottom);
checkMarkDrawable.draw(canvas);
}
}