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

Commit 27068dda authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Set default rotation in StatusBarWindowView to -1" into rvc-dev am:... 

Merge "Set default rotation in StatusBarWindowView to -1" into rvc-dev am: 70588168 am: aa518752 am: 131abc51

Change-Id: I1d7297b0f7cb7ba7c2784d782c3a034cd57069f0
parents 96c8b3f8 131abc51

packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarView.java

+1 −1
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ public class PhoneStatusBarView extends PanelBar { 
        }

    };

    private DarkReceiver mBattery;

    private int mRotationOrientation;

    private int mRotationOrientation = -1;

    @Nullable

    private View mCenterIconSpace;

    @Nullable

packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarWindowView.java

+5 −4
Original line number Diff line number Diff line
@@ -99,11 +99,12 @@ public class StatusBarWindowView extends FrameLayout { 
        }



        // padding needed for corner cutout.

        int leftCornerCutoutPadding = 0;

        int rightCornerCutoutPadding = 0;

        int leftCornerCutoutPadding = cutout.getSafeInsetLeft();

        int rightCornerCutoutPadding = cutout.getSafeInsetRight();

        if (cornerCutoutPadding != null) {

            leftCornerCutoutPadding = cornerCutoutPadding.first;

            rightCornerCutoutPadding = cornerCutoutPadding.second;

            leftCornerCutoutPadding = Math.max(leftCornerCutoutPadding, cornerCutoutPadding.first);

            rightCornerCutoutPadding = Math.max(rightCornerCutoutPadding,

                    cornerCutoutPadding.second);

        }



        return new Pair<>(