Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f18b6b64 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fixing incorrect mStable insets being set before user setup is complete" into rvc-dev

parents 77f5e88a 6f17adc4

services/core/java/com/android/server/wm/DisplayPolicy.java

+3 −2
Original line number Diff line number Diff line
@@ -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) {