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

Merge "Don't apply corner cutout insets if we're already inset enough" into pi-dev

Browse Source 
am: f0cbbff692

Change-Id: I8c0e23fcac114f7dc41bf45f60b75408ab53a5bf
This commit is contained in:
Evan Laird
2018-04-18 12:06:29 -07:00
committed by android-build-merger
parent 1613024161 f0cbbff692
commit d70e0b0413
1 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -332,6 +332,18 @@ public class PhoneStatusBarView extends PanelBar {
if (cornerCutoutMargins != null) {
lp.leftMargin = Math.max(lp.leftMargin, cornerCutoutMargins.first);
lp.rightMargin = Math.max(lp.rightMargin, cornerCutoutMargins.second);
// If we're already inset enough (e.g. on the status bar side), we can have 0 margin
WindowInsets insets = getRootWindowInsets();
int leftInset = insets.getSystemWindowInsetLeft();
int rightInset = insets.getSystemWindowInsetRight();
if (lp.leftMargin <= leftInset) {
lp.leftMargin = 0;
}
if (lp.rightMargin <= rightInset) {
lp.rightMargin = 0;
}
}
}