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

Commit 0671eba3 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: 1c538e3e 

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

Change-Id: I585c7be31b5d3ad41866594aa05fd192d40dc175
parents e195ddfe 1c538e3e

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);