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

Commit 2fcbfd30 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: 947cbc94 am: 3ccf6745

Change-Id: I37b71a29f75829563a63162f0bf83c6a9e584b90
parents f2e80765 3ccf6745

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

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

        }

    };

    };

    private DarkReceiver mBattery;

    private DarkReceiver mBattery;

    private int mRotationOrientation;

    private int mRotationOrientation = -1;

    @Nullable

    @Nullable

    private View mCenterIconSpace;

    private View mCenterIconSpace;

    @Nullable

    @Nullable

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

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

        }





        // padding needed for corner cutout.

        // padding needed for corner cutout.

        int leftCornerCutoutPadding = 0;

        int leftCornerCutoutPadding = cutout.getSafeInsetLeft();

        int rightCornerCutoutPadding = 0;

        int rightCornerCutoutPadding = cutout.getSafeInsetRight();

        if (cornerCutoutPadding != null) {

        if (cornerCutoutPadding != null) {

            leftCornerCutoutPadding = cornerCutoutPadding.first;

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

            rightCornerCutoutPadding = cornerCutoutPadding.second;

            rightCornerCutoutPadding = Math.max(rightCornerCutoutPadding,

                    cornerCutoutPadding.second);

        }

        }





        return new Pair<>(

        return new Pair<>(