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

Merge "Fix cts test failure of EnsureBarContrastTest" am: 528a63d7e9

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1930821

Change-Id: I3e4a9ff825d3c31001c9389896d3587a630832d5
This commit is contained in:
Shawn Lin
2021-12-22 05:04:59 +00:00
committed by Automerger Merge Worker
parent 734475d8de 528a63d7e9
commit 02896e98da
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
services/core/java/com/android/server/wm/DisplayPolicy.java
View File

@@ -1498,11 +1498,15 @@ public class DisplayPolicy {
statusBarBottom); statusBarBottom);
} }
sTmpRect.set(windowFrames.mFrame); final InsetsState state = displayFrames.mInsetsState;
sTmpRect.intersect(displayFrames.mDisplayCutoutSafe); sTmpRect.set(displayFrames.mDisplayCutoutSafe);
sTmpRect.top = windowFrames.mFrame.top; // Ignore top display cutout inset // The status bar content can extend into regular display cutout insets but not
sTmpRect.bottom = statusBarBottom; // Use collapsed status bar size // waterfall insets.
contentFrame.set(sTmpRect); sTmpRect.top = Math.max(state.getDisplayCutout().getWaterfallInsets().top, 0);
contentFrame.set(windowFrames.mFrame);
contentFrame.intersect(sTmpRect);
contentFrame.bottom = statusBarBottom; // Use collapsed status bar size
} }
private int layoutNavigationBar(DisplayFrames displayFrames, Rect contentFrame) { private int layoutNavigationBar(DisplayFrames displayFrames, Rect contentFrame) {