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

Merge "Fix RTL TileLayout." into pi-dev

Browse Source
This commit is contained in:
android-build-team Robot
2018-05-02 14:42:49 +00:00
committed by Android (Google) Code Review
parent 0585533a85 a64bb52fb8
commit 12a1c46a67
2 changed files with 8 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/SystemUI/res/layout/qs_paged_page.xml
View File

@@ -20,7 +20,7 @@
android:id="@+id/tile_page" android:id="@+id/tile_page"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingLeft="@dimen/notification_side_paddings" android:paddingStart="@dimen/notification_side_paddings"
android:paddingRight="@dimen/notification_side_paddings" android:paddingEnd="@dimen/notification_side_paddings"
android:clipChildren="false" android:clipChildren="false"
android:clipToPadding="false" /> android:clipToPadding="false" />

18
packages/SystemUI/src/com/android/systemui/qs/TileLayout.java
View File

@@ -93,7 +93,8 @@ public class TileLayout extends ViewGroup implements QSTileLayout {
@Override @Override
protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) { protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
final int numTiles = mRecords.size(); 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; final int numRows = (numTiles + mColumns - 1) / mColumns;
mCellWidth = (width - mSidePadding * 2 - (mCellMarginHorizontal * mColumns)) / 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 TileRecord record = mRecords.get(i);
final int top = getRowTop(row); final int top = getRowTop(row);
final int right; final int left = getColumnStart(isRtl ? mColumns - column - 1 : column);
final int left; final int right = left + mCellWidth;
if (isRtl) {
right = w - getColumnStart(column);
left = right - mCellWidth;
} else {
left = getColumnStart(column);
right = left + mCellWidth;
}
record.tileView.layout(left, top, right, top + record.tileView.getMeasuredHeight()); 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) { private int getColumnStart(int column) {
return column * (mCellWidth + mCellMarginHorizontal) + mCellMarginHorizontal + mPaddingLeft; return getPaddingStart() + mSidePadding + mCellMarginHorizontal / 2 +
column * (mCellWidth + mCellMarginHorizontal);
} }
} }