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

Commit a649c24e authored by Jorim Jaggi's avatar Jorim Jaggi Committed by Android (Google) Code Review
Browse files

Merge "Fix nav inset for gesture nav"

parents dab6c771 dd3d5104

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

+13 −2
Original line number Diff line number Diff line
@@ -1014,8 +1014,19 @@ public class DisplayPolicy { 
                mNavigationBarController.setWindow(win);

                mNavigationBarController.setOnBarVisibilityChangedListener(

                        mNavBarVisibilityListener, true);

                mDisplayContent.setInsetProvider(ITYPE_NAVIGATION_BAR,

                        win, null /* frameProvider */);

                mDisplayContent.setInsetProvider(ITYPE_NAVIGATION_BAR, win,

                        (displayFrames, windowState, inOutFrame) -> {



                            // In Gesture Nav, navigation bar frame is larger than frame to

                            // calculate inset.

                            if (mNavigationBarPosition == NAV_BAR_BOTTOM) {

                                sTmpRect.set(displayFrames.mUnrestricted);

                                sTmpRect.intersectUnchecked(displayFrames.mDisplayCutoutSafe);

                                inOutFrame.top = sTmpRect.bottom

                                        - getNavigationBarHeight(displayFrames.mRotation,

                                                mDisplayContent.getConfiguration().uiMode);

                            }

                        });

                mDisplayContent.setInsetProvider(ITYPE_BOTTOM_GESTURES, win,

                        (displayFrames, windowState, inOutFrame) -> {

                            inOutFrame.top -= mBottomGestureAdditionalInset;