diff options
| -rw-r--r-- | core/res/res/values/dimens.xml | 4 | ||||
| -rw-r--r-- | packages/overlays/NavigationBarModeGesturalOverlay/res/values/dimens.xml | 2 | ||||
| -rw-r--r-- | services/core/java/com/android/server/wm/DisplayPolicy.java | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/core/res/res/values/dimens.xml b/core/res/res/values/dimens.xml index e0ab6c871700..5363ef920886 100644 --- a/core/res/res/values/dimens.xml +++ b/core/res/res/values/dimens.xml @@ -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. --> diff --git a/packages/overlays/NavigationBarModeGesturalOverlay/res/values/dimens.xml b/packages/overlays/NavigationBarModeGesturalOverlay/res/values/dimens.xml index 987d20375e5e..1232201de862 100644 --- a/packages/overlays/NavigationBarModeGesturalOverlay/res/values/dimens.xml +++ b/packages/overlays/NavigationBarModeGesturalOverlay/res/values/dimens.xml @@ -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 diff --git a/services/core/java/com/android/server/wm/DisplayPolicy.java b/services/core/java/com/android/server/wm/DisplayPolicy.java index e1dd3522a808..21f01ff38a0e 100644 --- a/services/core/java/com/android/server/wm/DisplayPolicy.java +++ b/services/core/java/com/android/server/wm/DisplayPolicy.java @@ -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()); |