commit | eb6cb3b943eae00ae1714cade2797018286ea82c | [log] [tgz] |
---|---|---|
author | Tony Wickham <twickham@google.com> | Tue Mar 05 21:59:14 2019 +0000 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Mar 05 21:59:14 2019 +0000 |
tree | 8d9b55ef64eaa2ab2714e080ceadef08c7d4a76e | |
parent | 55f6416748f65a79b7bea1744a854d7cf63d2f00 [diff] | |
parent | 421d04193c2fef1f14f2a7aa754e8be3346cd4e2 [diff] |
Merge "Don't allow swipe up for all apps above shelf" into ub-launcher3-master
diff --git a/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/RecentsUiFactory.java b/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/RecentsUiFactory.java index 50cc4da..81ff0c7 100644 --- a/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/RecentsUiFactory.java +++ b/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/RecentsUiFactory.java
@@ -62,7 +62,6 @@ if (swipeUpToHome) { list.add(new FlingAndHoldTouchController(launcher)); - list.add(new OverviewToAllAppsTouchController(launcher)); } else { if (launcher.getDeviceProfile().isVerticalBarLayout()) { list.add(new OverviewToAllAppsTouchController(launcher));