Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "DO NOT MERGE use left/right insets instead of cutout" into qt-qpr1-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2020-03-26 12:56:31 +00:00
committed by Android (Google) Code Review
parent e6b4c38f90 60023559ea
commit 820aa463ac
1 changed files with 5 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -385,7 +385,6 @@ public class PhoneStatusBarView extends PanelBar {
* Returns a Pair of integers where
* - Pair.first is the left margin inset
* - Pair.second is the right margin inset
* This method always assumes the cutout is on the top when the device is in portrait mode.
*/
public static Pair<Integer, Integer> cornerCutoutMargins(DisplayCutout cutout,
Display display) {
@@ -400,22 +399,13 @@ public class PhoneStatusBarView extends PanelBar {
Point size = new Point();
display.getRealSize(size);
Rect bounds = new Rect();
switch (rotationOrientation) {
case RotationUtils.ROTATION_LANDSCAPE:
boundsFromDirection(cutout, Gravity.LEFT, bounds);
break;
case RotationUtils.ROTATION_SEASCAPE:
boundsFromDirection(cutout, Gravity.RIGHT, bounds);
break;
case RotationUtils.ROTATION_NONE:
boundsFromDirection(cutout, Gravity.TOP, bounds);
break;
case RotationUtils.ROTATION_UPSIDE_DOWN:
// we assume the cutout is always on top in portrait mode
return null;
if (rotationOrientation != RotationUtils.ROTATION_NONE) {
return new Pair<>(cutout.getSafeInsetLeft(), cutout.getSafeInsetRight());
}
Rect bounds = new Rect();
boundsFromDirection(cutout, Gravity.TOP, bounds);
if (statusBarHeight >= 0 && bounds.top > statusBarHeight) {
return null;
}