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

Commit d79f5dcf authored by Jason Chang's avatar Jason Chang Committed by Android (Google) Code Review
Browse files

Merge "Fix triggering One-handed mode introduces gesture conflict issues (1/n)"

parents 6eb44a97 2bff44d3

core/res/res/values/dimens.xml

+4 −0
Original line number Diff line number Diff line
@@ -66,6 +66,10 @@ 
    <!-- 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>



    <!-- The height of the navigation larger gesture area if the gesture is starting from

         the bottom. -->

    <dimen name="navigation_bar_gesture_larger_height">80dp</dimen>



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

    <dimen name="navigation_bar_height_car_mode">96dp</dimen>

    <!-- Height of the bottom navigation bar in portrait; often the same as

core/res/res/values/symbols.xml

+1 −0
Original line number Diff line number Diff line
@@ -1702,6 +1702,7 @@ 
  <java-symbol type="dimen" name="navigation_bar_frame_height" />

  <java-symbol type="dimen" name="navigation_bar_frame_height_landscape" />

  <java-symbol type="dimen" name="navigation_bar_gesture_height" />

  <java-symbol type="dimen" name="navigation_bar_gesture_larger_height" />

  <java-symbol type="dimen" name="navigation_bar_height_car_mode" />

  <java-symbol type="dimen" name="navigation_bar_height_landscape_car_mode" />

  <java-symbol type="dimen" name="navigation_bar_width_car_mode" />

libs/WindowManager/Shell/src/com/android/wm/shell/onehanded/OneHandedGestureHandler.java

+1 −1
Original line number Diff line number Diff line
@@ -88,7 +88,7 @@ public class OneHandedGestureHandler implements OneHandedTransitionCallback, 
        mDisplayController = displayController;

        displayController.addDisplayChangingController(this);

        mNavGestureHeight = context.getResources().getDimensionPixelSize(

                com.android.internal.R.dimen.navigation_bar_gesture_height);

                com.android.internal.R.dimen.navigation_bar_gesture_larger_height);

        mDragDistThreshold = context.getResources().getDimensionPixelSize(

                R.dimen.gestures_onehanded_drag_threshold);

        final float slop = ViewConfiguration.get(context).getScaledTouchSlop();

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

+1 −1
Original line number Diff line number Diff line
@@ -18,5 +18,5 @@ 
-->

<resources>

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

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

    <dimen name="navigation_bar_gesture_larger_height">80dp</dimen>

</resources>