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

Merge "Fixing incorrect mStable insets being set before user setup is complete" into rvc-dev am: f18b6b6490 am: 9f5c18592e

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

Change-Id: I4bc7944061aa1eb86dacbf609dfbffadcbe0825d
This commit is contained in:
TreeHugger Robot
2020-06-18 00:57:26 +00:00
committed by Automerger Merge Worker
parent b09cbc79ba 9f5c18592e
commit bc922e71f2
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1833,10 +1833,11 @@ public class DisplayPolicy {
if (navBarPosition == NAV_BAR_BOTTOM) { if (navBarPosition == NAV_BAR_BOTTOM) {
// It's a system nav bar or a portrait screen; nav bar goes on bottom. // It's a system nav bar or a portrait screen; nav bar goes on bottom.
final int top = cutoutSafeUnrestricted.bottom
- getNavigationBarHeight(rotation, uiMode);
final int topNavBar = cutoutSafeUnrestricted.bottom final int topNavBar = cutoutSafeUnrestricted.bottom
- getNavigationBarFrameHeight(rotation, uiMode); - getNavigationBarFrameHeight(rotation, uiMode);
final int top = mNavButtonForcedVisible
? topNavBar
: cutoutSafeUnrestricted.bottom - getNavigationBarHeight(rotation, uiMode);
navigationFrame.set(0, topNavBar, displayWidth, displayFrames.mUnrestricted.bottom); navigationFrame.set(0, topNavBar, displayWidth, displayFrames.mUnrestricted.bottom);
displayFrames.mStable.bottom = displayFrames.mStableFullscreen.bottom = top; displayFrames.mStable.bottom = displayFrames.mStableFullscreen.bottom = top;
if (transientNavBarShowing) { if (transientNavBarShowing) {