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

Commit 4b0cf98c authored by shawnlin's avatar shawnlin
Browse files

Fixed too much padding in QQS with top corner cutout 

Set padding only for system icon view.

Bug: 149766935
Test: atest SystemUITests
Test: manual set corner cutout and expand qs panel
Change-Id: I0f1d485aed50410ebe189112468f2ab5faaa15ce
parent b073a3eb

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

+9 −10
Original line number Diff line number Diff line
@@ -435,23 +435,22 @@ public class QuickStatusBarHeader extends RelativeLayout implements 


    @Override

    public WindowInsets onApplyWindowInsets(WindowInsets insets) {

        // Handle padding of SystemIconsView

        DisplayCutout cutout = insets.getDisplayCutout();



        // Handle padding of QuickStatusBarHeader

        Pair<Integer, Integer> cornerCutoutPadding = StatusBarWindowView.cornerCutoutMargins(

                cutout, getDisplay());

        Pair<Integer, Integer> padding =

                StatusBarWindowView.paddingNeededForCutoutAndRoundedCorner(

                        cutout, cornerCutoutPadding, mRoundedCornerPadding);

        setPadding(padding.first, 0, padding.second, getPaddingBottom());



        // Handle padding of SystemIconsView

        final int waterfallTopInset = cutout == null ? 0 : cutout.getWaterfallInsets().top;

        mSystemIconsView.setPaddingRelative(

                getResources().getDimensionPixelSize(R.dimen.status_bar_padding_start),

                waterfallTopInset,

                getResources().getDimensionPixelSize(R.dimen.status_bar_padding_end),

                0);

        int statusBarPaddingLeft = isLayoutRtl()

                ? getResources().getDimensionPixelSize(R.dimen.status_bar_padding_end)

                : getResources().getDimensionPixelSize(R.dimen.status_bar_padding_start);

        int statusBarPaddingRight = isLayoutRtl()

                ? getResources().getDimensionPixelSize(R.dimen.status_bar_padding_start)

                : getResources().getDimensionPixelSize(R.dimen.status_bar_padding_end);

        mSystemIconsView.setPadding(padding.first + statusBarPaddingLeft, waterfallTopInset,

                padding.second + statusBarPaddingRight, 0);



        return super.onApplyWindowInsets(insets);

    }