diff options
| author | 2020-06-17 13:36:56 -0700 | |
|---|---|---|
| committer | 2020-06-17 13:54:41 -0700 | |
| commit | 6f17adc48b9eea02bae918a8b16119194e51a5ce (patch) | |
| tree | c8cb8a9a90c490732014ff428a8c105f95543fae | |
| parent | 02f853ebe69071e6172d1688b9844b3982d37b85 (diff) | |
Fixing incorrect mStable insets being set before user setup is complete
Bug: 155349373
Test: Verified on device
Change-Id: I8363ca4d24827c90c0a22d3e8e71187ab09c83ac
| -rw-r--r-- | services/core/java/com/android/server/wm/DisplayPolicy.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/services/core/java/com/android/server/wm/DisplayPolicy.java b/services/core/java/com/android/server/wm/DisplayPolicy.java index 3c4a9ad08199..8cfe1cd5e98f 100644 --- a/services/core/java/com/android/server/wm/DisplayPolicy.java +++ b/services/core/java/com/android/server/wm/DisplayPolicy.java @@ -1833,10 +1833,11 @@ public class DisplayPolicy { if (navBarPosition == NAV_BAR_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 - getNavigationBarFrameHeight(rotation, uiMode); + final int top = mNavButtonForcedVisible + ? topNavBar + : cutoutSafeUnrestricted.bottom - getNavigationBarHeight(rotation, uiMode); navigationFrame.set(0, topNavBar, displayWidth, displayFrames.mUnrestricted.bottom); displayFrames.mStable.bottom = displayFrames.mStableFullscreen.bottom = top; if (transientNavBarShowing) { |