drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix bug #8200928 ExpandableListView should be RTL-aware" into jb-mr2-dev

Browse Source
This commit is contained in:
Fabrice Di Meglio
2013-03-22 01:18:43 +00:00
committed by Android (Google) Code Review
parent 6848963d81 605c5af9c8
commit 36fb0166a3
3 changed files with 18 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
core/java/android/widget/ExpandableListView.java
View File

@ -288,6 +288,9 @@ public class ExpandableListView extends ListView {
// Get more expandable list-related info for this item
pos = mConnector.getUnflattenedPos(childFlPos);
final boolean isLayoutRtl = isLayoutRtl();
final int width = getWidth();
// If this item type and the previous item type are different, then we need to change
// the left & right bounds
if (pos.position.type != lastItemType) {
@ -300,9 +303,18 @@ public class ExpandableListView extends ListView {
indicatorRect.left = mIndicatorLeft;
indicatorRect.right = mIndicatorRight;
}
indicatorRect.left += mPaddingLeft;
indicatorRect.right += mPaddingLeft;
if (isLayoutRtl) {
final int temp = indicatorRect.left;
indicatorRect.left = width - indicatorRect.right;
indicatorRect.right = width - temp;
indicatorRect.left -= mPaddingRight;
indicatorRect.right -= mPaddingRight;
} else {
indicatorRect.left += mPaddingLeft;
indicatorRect.right += mPaddingLeft;
}
lastItemType = pos.position.type;
}