Merge "Set default rotation in StatusBarWindowView to -1" into rvc-dev am: 7058816828 am: aa518752bf am: 947cbc94e6

Change-Id: I1e950f9bac49244ab4af3c4ff60b04499baa9f9d
This commit is contained in:
TreeHugger Robot
2020-03-24 22:36:41 +00:00
committed by Automerger Merge Worker
2 changed files with 6 additions and 5 deletions

View File

@@ -66,7 +66,7 @@ public class PhoneStatusBarView extends PanelBar {
}
};
private DarkReceiver mBattery;
private int mRotationOrientation;
private int mRotationOrientation = -1;
@Nullable
private View mCenterIconSpace;
@Nullable

View File

@@ -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<>(