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

Commit aae6fe9f authored by Sunny Goyal's avatar Sunny Goyal Committed by android-build-merger
Browse files

Merge "Reducing the bottom gesture-insets for full gesture nav to 32dp height"... 

Merge "Reducing the bottom gesture-insets for full gesture nav to 32dp height" into qt-dev am: 66295e6f am: c9b08104
am: 81d64a45

Change-Id: Iceedb7a5514199c126ded7da937daac2496bc6dd
parents d06a20cc 81d64a45

core/res/res/values/dimens.xml

+1 −3
Original line number Diff line number Diff line
@@ -59,9 +59,7 @@ 
    <!-- Height of the bottom navigation bar frame in landscape -->

    <dimen name="navigation_bar_frame_height_landscape">@dimen/navigation_bar_frame_height</dimen>



    <!-- The height of the navigation gesture area; if the size is larger than the navigation bar

        frame width/height, then the difference is the spacing from the navigation bar window to

        the area that detects gestures. -->

    <!-- The height of the navigation gesture area if the gesture is starting from the bottom. -->

    <dimen name="navigation_bar_gesture_height">@dimen/navigation_bar_frame_height</dimen>



    <!-- Height of the bottom navigation / system bar in car mode. -->

packages/overlays/NavigationBarModeGesturalOverlay/res/values/dimens.xml

+2 −0
Original line number Diff line number Diff line
@@ -25,4 +25,6 @@ 
    <dimen name="navigation_bar_width">16dp</dimen>

    <!-- Height of the bottom navigation / system bar. -->

    <dimen name="navigation_bar_frame_height">48dp</dimen>

        <!-- The height of the bottom navigation gesture area. -->

    <dimen name="navigation_bar_gesture_height">32dp</dimen>

</resources>
 
 No newline at end of file

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

+2 −2
Original line number Diff line number Diff line
@@ -2720,9 +2720,9 @@ public class DisplayPolicy { 
                res.getBoolean(R.bool.config_navBarAlwaysShowOnSideEdgeGesture);



        // This should calculate how much above the frame we accept gestures.

        mBottomGestureAdditionalInset = Math.max(0,

        mBottomGestureAdditionalInset =

                res.getDimensionPixelSize(R.dimen.navigation_bar_gesture_height)

                        - getNavigationBarFrameHeight(portraitRotation, uiMode));

                        - getNavigationBarFrameHeight(portraitRotation, uiMode);



        updateConfigurationAndScreenSizeDependentBehaviors();

        mWindowOutsetBottom = ScreenShapeHelper.getWindowOutsetBottomPx(mContext.getResources());