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

Commit c44a5780 authored by Amin Shaikh's avatar Amin Shaikh Committed by android-build-merger
Browse files

Merge "Allow left-right swiping from edges in QS." into pi-dev 

am: 28493ade

Change-Id: I9aa7df4f0917816896eaddefdea76ee1208e4438
parents 660d1038 28493ade

packages/SystemUI/res/layout/qs_paged_page.xml

+2 −0
Original line number Diff line number Diff line
@@ -20,5 +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:clipChildren="false"

    android:clipToPadding="false" />

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

+4 −4
Original line number Diff line number Diff line
@@ -38,10 +38,10 @@ public class QSContainerImpl extends FrameLayout { 
    private final Point mSizePoint = new Point();



    private int mHeightOverride = -1;

    protected View mQSPanel;

    private QSPanel mQSPanel;

    private View mQSDetail;

    protected View mHeader;

    protected float mQsExpansion;

    private View mHeader;

    private float mQsExpansion;

    private QSCustomizer mQSCustomizer;

    private View mQSFooter;
@@ -188,7 +188,7 @@ public class QSContainerImpl extends FrameLayout { 
        setMargins(mQSDetail);

        setMargins(mBackground);

        setMargins(mQSFooter);

        setMargins(mQSPanel);

        mQSPanel.setMargins(mSideMargins);

        setMargins(mHeader);

    }

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

+11 −0
Original line number Diff line number Diff line
@@ -578,6 +578,17 @@ public class QSPanel extends LinearLayout implements Tunable, Callback, Brightne 
        mFooter.showDeviceMonitoringDialog();

    }



    public void setMargins(int sideMargins) {

        for (int i = 0; i < getChildCount(); i++) {

            View view = getChildAt(i);

            if (view != mTileLayout) {

                LayoutParams lp = (LayoutParams) view.getLayoutParams();

                lp.leftMargin = sideMargins;

                lp.rightMargin = sideMargins;

            }

        }

    }



    private class H extends Handler {

        private static final int SHOW_DETAIL = 1;

        private static final int SET_TILE_VISIBILITY = 2;

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

+2 −2
Original line number Diff line number Diff line
@@ -93,7 +93,7 @@ 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);

        final int width = MeasureSpec.getSize(widthMeasureSpec) - mPaddingLeft - mPaddingRight;

        final int numRows = (numTiles + mColumns - 1) / mColumns;

        mCellWidth = (width - mSidePadding * 2 - (mCellMarginHorizontal * mColumns)) / mColumns;
@@ -159,6 +159,6 @@ public class TileLayout extends ViewGroup implements QSTileLayout { 
    }



    private int getColumnStart(int column) {

        return column * (mCellWidth + mCellMarginHorizontal) + mCellMarginHorizontal;

        return column * (mCellWidth + mCellMarginHorizontal) + mCellMarginHorizontal + mPaddingLeft;

    }

}