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

Commit 50d9bce2 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Clip tile pages on horizontal with media" into sc-dev am: 20213382 am: 47a38486 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14920128

Change-Id: Ia413706d5e95af40354d4185ea3c92ccfdc86415
parents c78c8d18 47a38486

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

+2 −2
Original line number Diff line number Diff line
@@ -97,7 +97,7 @@ public class QSPanel extends LinearLayout implements Tunable { 


    private BrightnessMirrorController mBrightnessMirrorController;

    private LinearLayout mHorizontalLinearLayout;

    private LinearLayout mHorizontalContentContainer;

    protected LinearLayout mHorizontalContentContainer;



    // Only used with media

    private QSTileLayout mHorizontalTileLayout;
@@ -132,7 +132,7 @@ public class QSPanel extends LinearLayout implements Tunable { 


            mHorizontalContentContainer = new RemeasuringLinearLayout(mContext);

            mHorizontalContentContainer.setOrientation(LinearLayout.VERTICAL);

            mHorizontalContentContainer.setClipChildren(false);

            mHorizontalContentContainer.setClipChildren(true);

            mHorizontalContentContainer.setClipToPadding(false);



            mHorizontalTileLayout = createHorizontalTileLayout();

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

+8 −0
Original line number Diff line number Diff line
@@ -52,6 +52,14 @@ public class QuickQSPanel extends QSPanel { 
        // Don't add brightness view

    }



    @Override

    void initialize() {

        super.initialize();

        if (mHorizontalContentContainer != null) {

            mHorizontalContentContainer.setClipChildren(false);

        }

    }



    @Override

    public TileLayout createRegularTileLayout() {

        return new QQSSideLabelTileLayout(mContext);