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

Commit c8eaefe2 authored by Shawn Lin's avatar Shawn Lin Committed by Automerger Merge Worker
Browse files

Merge "Fixed wrong QS padding" into rvc-dev am: 841f253c am: 4a99b9d2 

Change-Id: I7db70224bc75986845a8cc5fcf1b5fe52c895c7c
parents 6207e92f 4a99b9d2

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

+9 −2
Original line number Diff line number Diff line
@@ -436,6 +436,10 @@ public class QuickStatusBarHeader extends RelativeLayout implements 


    @Override

    public WindowInsets onApplyWindowInsets(WindowInsets insets) {

        // Handle padding of QuickStatusBarHeader

        setPadding(mRoundedCornerPadding, getPaddingTop(), mRoundedCornerPadding,

                getPaddingBottom());



        // Handle padding of SystemIconsView

        DisplayCutout cutout = insets.getDisplayCutout();

        Pair<Integer, Integer> cornerCutoutPadding = StatusBarWindowView.cornerCutoutMargins(
@@ -450,8 +454,11 @@ public class QuickStatusBarHeader extends RelativeLayout implements 
        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);

        mSystemIconsView.setPadding(

                Math.max(padding.first + statusBarPaddingLeft - mRoundedCornerPadding, 0),

                waterfallTopInset,

                Math.max(padding.second + statusBarPaddingRight - mRoundedCornerPadding, 0),

                0);



        return super.onApplyWindowInsets(insets);

    }