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

Commit 23c6cb91 authored by yyalan's avatar yyalan Committed by Yalan Yiue
Browse files

Fix clipping of QS tiles in large screen portrait shade 

Changed the clipping bounds in large screen portrait to qs container padding + qs container margin. Also fixed qs_tiles_page_horizontal_margin so that it's the half of the clipping margin.

Fixes: 228970271
Test: Manual
Change-Id: Ia03e717d7fbc6665c56eef0c1d6cb3f681ad5790
parent e9ed7210

packages/SystemUI/res/values-sw600dp-port/dimens.xml

+5 −0
Original line number Diff line number Diff line
@@ -21,5 +21,10 @@ 
    <dimen name="keyguard_status_view_bottom_margin">40dp</dimen>

    <dimen name="bouncer_user_switcher_y_trans">20dp</dimen>



    <!-- qs_tiles_page_horizontal_margin should be margin / 2, otherwise full space between two

         pages is margin * 2, and that makes tiles page not appear immediately after user swipes to

         the side -->

    <dimen name="qs_tiles_page_horizontal_margin">32dp</dimen>



    <dimen name="qqs_layout_padding_bottom">16dp</dimen>

</resources>

packages/SystemUI/res/values-sw720dp-port/dimens.xml

+6 −0
Original line number Diff line number Diff line
@@ -29,5 +29,11 @@ 


    <dimen name="notification_panel_margin_horizontal">80dp</dimen>

    <dimen name="notification_side_paddings">40dp</dimen>



    <!-- qs_tiles_page_horizontal_margin should be margin / 2, otherwise full space between two

     pages is margin * 2, and that makes tiles page not appear immediately after user swipes to the

     side -->

    <dimen name="qs_tiles_page_horizontal_margin">60dp</dimen>



    <dimen name="notification_section_divider_height">16dp</dimen>

</resources>

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

+5 −4
Original line number Diff line number Diff line
@@ -622,10 +622,11 @@ public class QSFragment extends LifecycleFragment implements QS, CommandQueue.Ca 
        if (mLastQSExpansion == 1.0f) {

            // Fully expanded, let's set the layout bounds as clip bounds. This is necessary because

            // it's a scrollview and otherwise wouldn't be clipped. However, we set the horizontal

            // bounds so the pages go to the ends of QSContainerImpl

            ViewGroup.MarginLayoutParams lp =

                    (ViewGroup.MarginLayoutParams) mQSPanelScrollView.getLayoutParams();

            mQsBounds.set(-lp.leftMargin, 0, mQSPanelScrollView.getWidth() + lp.rightMargin,

            // bounds so the pages go to the ends of QSContainerImpl (most cases) or its parent

            // (large screen portrait)

            int sideMargin = getResources().getDimensionPixelSize(

                    R.dimen.qs_tiles_page_horizontal_margin) * 2;

            mQsBounds.set(-sideMargin, 0, mQSPanelScrollView.getWidth() + sideMargin,

                    mQSPanelScrollView.getHeight());

        }

        mQSPanelScrollView.setClipBounds(mQsBounds);