diff options
| author | Tony Wickham <twickham@google.com> | 2019-04-09 19:51:48 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-04-09 19:51:48 +0000 |
| commit | 9edc8eb756835c507226947c040845c356357283 (patch) | |
| tree | f9f6f839bac158f0a21ddf2077873989e370e796 /quickstep | |
| parent | 563178b173c281f7dc382c4c3337f3721c576815 (diff) | |
| parent | e2e953304f12452d29c4e506fe6997e419d85753 (diff) | |
| download | android_packages_apps_Trebuchet-9edc8eb756835c507226947c040845c356357283.tar.gz android_packages_apps_Trebuchet-9edc8eb756835c507226947c040845c356357283.tar.bz2 android_packages_apps_Trebuchet-9edc8eb756835c507226947c040845c356357283.zip | |
Merge "Allow swipe up to all apps anywhere on workspace" into ub-launcher3-qt-dev
Diffstat (limited to 'quickstep')
| -rw-r--r-- | quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/PortraitStatesTouchController.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/PortraitStatesTouchController.java b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/PortraitStatesTouchController.java index ce50b680f..0c29fcf5a 100644 --- a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/PortraitStatesTouchController.java +++ b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/PortraitStatesTouchController.java @@ -44,7 +44,6 @@ import com.android.launcher3.anim.Interpolators; import com.android.launcher3.touch.AbstractStateChangeTouchController; import com.android.launcher3.touch.SwipeDetector; import com.android.launcher3.uioverrides.states.OverviewState; -import com.android.launcher3.uioverrides.touchcontrollers.PortraitOverviewStateTouchHelper; import com.android.launcher3.userevent.nano.LauncherLogProto.Action.Touch; import com.android.launcher3.userevent.nano.LauncherLogProto.ContainerType; import com.android.quickstep.RecentsModel; @@ -114,8 +113,10 @@ public class PortraitStatesTouchController extends AbstractStateChangeTouchContr return false; } } else { + // If we are swiping to all apps instead of overview, allow it from anywhere. + boolean interceptAnywhere = mLauncher.isInState(NORMAL) && !mAllowDragToOverview; // For all other states, only listen if the event originated below the hotseat height - if (!isTouchOverHotseat(mLauncher, ev)) { + if (!interceptAnywhere && !isTouchOverHotseat(mLauncher, ev)) { return false; } } |