diff options
| -rw-r--r-- | packages/SystemUI/res/layout/qs_paged_page.xml | 4 | ||||
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/qs/TileLayout.java | 18 |
2 files changed, 8 insertions, 14 deletions
diff --git a/packages/SystemUI/res/layout/qs_paged_page.xml b/packages/SystemUI/res/layout/qs_paged_page.xml index 25b1a2b79a1c..07f0c83e7b2e 100644 --- a/packages/SystemUI/res/layout/qs_paged_page.xml +++ b/packages/SystemUI/res/layout/qs_paged_page.xml @@ -20,7 +20,7 @@ android:id="@+id/tile_page" android:layout_width="match_parent" android:layout_height="wrap_content" - android:paddingLeft="@dimen/notification_side_paddings" - android:paddingRight="@dimen/notification_side_paddings" + android:paddingStart="@dimen/notification_side_paddings" + android:paddingEnd="@dimen/notification_side_paddings" android:clipChildren="false" android:clipToPadding="false" /> diff --git a/packages/SystemUI/src/com/android/systemui/qs/TileLayout.java b/packages/SystemUI/src/com/android/systemui/qs/TileLayout.java index 6d46e857c8b4..45d63e0c1359 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/TileLayout.java +++ b/packages/SystemUI/src/com/android/systemui/qs/TileLayout.java @@ -93,7 +93,8 @@ public class TileLayout extends ViewGroup implements QSTileLayout { @Override protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) { final int numTiles = mRecords.size(); - final int width = MeasureSpec.getSize(widthMeasureSpec) - mPaddingLeft - mPaddingRight; + final int width = MeasureSpec.getSize(widthMeasureSpec) + - getPaddingStart() - getPaddingEnd(); final int numRows = (numTiles + mColumns - 1) / mColumns; mCellWidth = (width - mSidePadding * 2 - (mCellMarginHorizontal * mColumns)) / mColumns; @@ -140,16 +141,8 @@ public class TileLayout extends ViewGroup implements QSTileLayout { final TileRecord record = mRecords.get(i); final int top = getRowTop(row); - final int right; - final int left; - if (isRtl) { - right = w - getColumnStart(column); - left = right - mCellWidth; - } else { - left = getColumnStart(column); - right = left + mCellWidth; - } - + final int left = getColumnStart(isRtl ? mColumns - column - 1 : column); + final int right = left + mCellWidth; record.tileView.layout(left, top, right, top + record.tileView.getMeasuredHeight()); } } @@ -159,6 +152,7 @@ public class TileLayout extends ViewGroup implements QSTileLayout { } private int getColumnStart(int column) { - return column * (mCellWidth + mCellMarginHorizontal) + mCellMarginHorizontal + mPaddingLeft; + return getPaddingStart() + mSidePadding + mCellMarginHorizontal / 2 + + column * (mCellWidth + mCellMarginHorizontal); } } |