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

am 1956789c: Merge "Fix RTL horizontal spacing in Gridview" into lmp-dev

Browse Source 
* commit '1956789c60270539ffa1e722f161c164a944235f':
  Fix RTL horizontal spacing in Gridview
This commit is contained in:
Yigit Boyar
2014-08-08 01:53:53 +00:00
committed by Android Git Automerger
parent 5d9d204491 414222c28a
commit 1ecdd790ea
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/java/android/widget/GridView.java
View File

@@ -351,6 +351,7 @@ public class GridView extends AbsListView {
final int selectedPosition = mSelectedPosition;
View child = null;
final int nextChildDir = isLayoutRtl ? -1 : +1;
for (int pos = startPos; pos < last; pos++) {
// is this the selected item?
boolean selected = pos == selectedPosition;
@@ -359,9 +360,9 @@ public class GridView extends AbsListView {
final int where = flow ? -1 : pos - startPos;
child = makeAndAddView(pos, y, flow, nextLeft, selected, where);
nextLeft += (isLayoutRtl ? -1 : +1) * columnWidth;
nextLeft += nextChildDir * columnWidth;
if (pos < last - 1) {
nextLeft += horizontalSpacing;
nextLeft += nextChildDir * horizontalSpacing;
}
if (selected && (hasFocus || inClick)) {