Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a64bb52f authored by Amin Shaikh's avatar Amin Shaikh
Browse files

Fix RTL TileLayout. 

Ensure QS tile columns are symmetrical for LTR and RTL layouts. Also
ensure that opening QS customizer does not shift tile positions.

Change-Id: I647e5af41ed505ed01420d8b735652bd80a1661e
Fixes: 79110384
Test: visual
parent 32491b6f

packages/SystemUI/res/layout/qs_paged_page.xml

+2 −2
Original line number Diff line number Diff line
@@ -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" />

packages/SystemUI/src/com/android/systemui/qs/TileLayout.java

+6 −12
Original line number Diff line number Diff line
@@ -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);

    }

}