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

Merge "Only create valid insets sources of display cutout" into tm-qpr-dev

Browse Source
This commit is contained in:
Tiger Huang
2022-06-16 09:38:07 +00:00
committed by Android (Google) Code Review
parent 63148449ec 6f23fc2aba
commit 0aa1b8ed79
1 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
services/core/java/com/android/server/wm/DisplayFrames.java
View File

@@ -99,19 +99,28 @@ public class DisplayFrames {
state.setRoundedCorners(roundedCorners); state.setRoundedCorners(roundedCorners);
state.setPrivacyIndicatorBounds(indicatorBounds); state.setPrivacyIndicatorBounds(indicatorBounds);
state.getDisplayCutoutSafe(safe); state.getDisplayCutoutSafe(safe);
if (!cutout.isEmpty()) { if (safe.left > unrestricted.left) {
state.getSource(ITYPE_LEFT_DISPLAY_CUTOUT).setFrame( state.getSource(ITYPE_LEFT_DISPLAY_CUTOUT).setFrame(
unrestricted.left, unrestricted.top, safe.left, unrestricted.bottom); unrestricted.left, unrestricted.top, safe.left, unrestricted.bottom);
} else {
state.removeSource(ITYPE_LEFT_DISPLAY_CUTOUT);
}
if (safe.top > unrestricted.top) {
state.getSource(ITYPE_TOP_DISPLAY_CUTOUT).setFrame( state.getSource(ITYPE_TOP_DISPLAY_CUTOUT).setFrame(
unrestricted.left, unrestricted.top, unrestricted.right, safe.top); unrestricted.left, unrestricted.top, unrestricted.right, safe.top);
} else {
state.removeSource(ITYPE_TOP_DISPLAY_CUTOUT);
}
if (safe.right < unrestricted.right) {
state.getSource(ITYPE_RIGHT_DISPLAY_CUTOUT).setFrame( state.getSource(ITYPE_RIGHT_DISPLAY_CUTOUT).setFrame(
safe.right, unrestricted.top, unrestricted.right, unrestricted.bottom); safe.right, unrestricted.top, unrestricted.right, unrestricted.bottom);
} else {
state.removeSource(ITYPE_RIGHT_DISPLAY_CUTOUT);
}
if (safe.bottom < unrestricted.bottom) {
state.getSource(ITYPE_BOTTOM_DISPLAY_CUTOUT).setFrame( state.getSource(ITYPE_BOTTOM_DISPLAY_CUTOUT).setFrame(
unrestricted.left, safe.bottom, unrestricted.right, unrestricted.bottom); unrestricted.left, safe.bottom, unrestricted.right, unrestricted.bottom);
} else { } else {
state.removeSource(ITYPE_LEFT_DISPLAY_CUTOUT);
state.removeSource(ITYPE_TOP_DISPLAY_CUTOUT);
state.removeSource(ITYPE_RIGHT_DISPLAY_CUTOUT);
state.removeSource(ITYPE_BOTTOM_DISPLAY_CUTOUT); state.removeSource(ITYPE_BOTTOM_DISPLAY_CUTOUT);
} }
return true; return true;