| commit | 98783d03c1be49a47e31dde620dd60130ca02dac | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Fri Mar 27 03:49:49 2020 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Fri Mar 27 03:49:49 2020 +0000 |
| tree | befaf6fb4b53e32ed74798fb16b5124b137965f3 | |
| parent | c7189a6f2d55c977998dc920edb303d2a09a5a1d [diff] | |
| parent | c94a5bfbce6a03b16424afbbf9910d8864ca8857 [diff] |
Merge "Remove max displacement threshold in 2-zone model" into ub-launcher3-master
diff --git a/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/touchcontrollers/FlingAndHoldTouchController.java b/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/touchcontrollers/FlingAndHoldTouchController.java index 6fc03b1..8af2747 100644 --- a/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/touchcontrollers/FlingAndHoldTouchController.java +++ b/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/touchcontrollers/FlingAndHoldTouchController.java
@@ -73,7 +73,11 @@ super(l, false /* allowDragToOverview */); mMotionPauseDetector = new MotionPauseDetector(l); mMotionPauseMinDisplacement = ViewConfiguration.get(l).getScaledTouchSlop(); - mMotionPauseMaxDisplacement = getShiftRange() * MAX_DISPLACEMENT_PERCENT; + mMotionPauseMaxDisplacement = getMotionPauseMaxDisplacement(); + } + + protected float getMotionPauseMaxDisplacement() { + return getShiftRange() * MAX_DISPLACEMENT_PERCENT; } @Override
diff --git a/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonNavbarToOverviewTouchController.java b/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonNavbarToOverviewTouchController.java index 064133c..71aa2e8 100644 --- a/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonNavbarToOverviewTouchController.java +++ b/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonNavbarToOverviewTouchController.java
@@ -66,6 +66,13 @@ } @Override + protected float getMotionPauseMaxDisplacement() { + // No need to disallow pause when swiping up all the way up the screen (unlike + // FlingAndHoldTouchController where user is probably intending to go to all apps). + return Float.MAX_VALUE; + } + + @Override protected boolean canInterceptTouch(MotionEvent ev) { mDidTouchStartInNavBar = (ev.getEdgeFlags() & EDGE_NAV_BAR) != 0; return super.canInterceptTouch(ev);