From 57f88bd0ec9d9b077d57df1ae39f9e88085aa92f Mon Sep 17 00:00:00 2001 From: Kevin Han Date: Thu, 24 Jan 2019 20:36:04 +0000 Subject: [PATCH] Revert "Remove OverviewToAllAppsController for Go" This reverts commit 792fcc3aec4e085fc864541fb0396ef09bd23342. Reason for revert: This class actually manages more than just overview to all apps transitions, and Go needs some form of this for landscape transitions state transitions Change-Id: I073dcc94dda06ff8d87166d2674927df8f2418f5 --- .../uioverrides/RecentsUiFactory.java | 17 +------------- .../uioverrides/RecentsUiFactory.java | 22 +------------------ .../OverviewToAllAppsTouchController.java | 0 .../launcher3/uioverrides/UiFactory.java | 9 ++++---- 4 files changed, 7 insertions(+), 41 deletions(-) rename quickstep/{recents_ui_overrides => }/src/com/android/launcher3/uioverrides/OverviewToAllAppsTouchController.java (100%) diff --git a/go/quickstep/src/com/android/launcher3/uioverrides/RecentsUiFactory.java b/go/quickstep/src/com/android/launcher3/uioverrides/RecentsUiFactory.java index 73075dcab4..d0c255c855 100644 --- a/go/quickstep/src/com/android/launcher3/uioverrides/RecentsUiFactory.java +++ b/go/quickstep/src/com/android/launcher3/uioverrides/RecentsUiFactory.java @@ -22,8 +22,6 @@ import static com.android.launcher3.LauncherAnimUtils.SCALE_PROPERTY; import android.view.View; -import androidx.annotation.Nullable; - import com.android.launcher3.Launcher; import com.android.launcher3.LauncherStateManager.StateHandler; import com.android.launcher3.util.TouchController; @@ -44,24 +42,11 @@ public final class RecentsUiFactory { * @param launcher the launcher activity * @return the touch controller for recents tasks */ - public static @Nullable TouchController createTaskSwipeController(Launcher launcher) { + public static TouchController createTaskSwipeController(Launcher launcher) { // We leave all input handling to the view itself. return null; } - /** - * Creates and returns a touch controller for swiping from overview state to the all apps state - * if such an action is supported. - * - * @param launcher the launcher activity - * @return the touch controller for swiping from overview to all apps - */ - public static @Nullable TouchController createOverviewToAllAppsTouchController( - Launcher launcher) { - // Go does not support overview to all apps transition. - return null; - } - /** * Creates and returns the controller responsible for recents view state transitions. * 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 0b62beed10..f18f43c4c4 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 @@ -22,14 +22,11 @@ import static com.android.launcher3.LauncherAnimUtils.SCALE_PROPERTY; import static com.android.launcher3.LauncherState.NORMAL; import static com.android.launcher3.LauncherState.OVERVIEW; -import androidx.annotation.Nullable; - import com.android.launcher3.Launcher; import com.android.launcher3.LauncherState; import com.android.launcher3.LauncherStateManager.StateHandler; import com.android.launcher3.anim.AnimatorPlaybackController; import com.android.launcher3.util.TouchController; -import com.android.quickstep.OverviewInteractionState; import com.android.quickstep.views.RecentsView; /** @@ -48,27 +45,10 @@ public final class RecentsUiFactory { * @param launcher the launcher activity * @return the touch controller for recents tasks */ - public static @Nullable TouchController createTaskSwipeController(Launcher launcher) { + public static TouchController createTaskSwipeController(Launcher launcher) { return new LauncherTaskViewController(launcher); } - /** - * Creates and returns a touch controller for swiping from overview state to the all apps state - * if such an action is supported. - * - * @param launcher the launcher activity - * @return the touch controller for swiping from overview to all apps - */ - public static @Nullable TouchController createOverviewToAllAppsTouchController( - Launcher launcher) { - boolean swipeUpEnabled = OverviewInteractionState.INSTANCE.get(launcher) - .isSwipeUpGestureEnabled(); - if (!swipeUpEnabled || launcher.getDeviceProfile().isVerticalBarLayout()) { - return new OverviewToAllAppsTouchController(launcher); - } - return null; - } - /** * Creates and returns the controller responsible for recents view state transitions. * diff --git a/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/OverviewToAllAppsTouchController.java b/quickstep/src/com/android/launcher3/uioverrides/OverviewToAllAppsTouchController.java similarity index 100% rename from quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/OverviewToAllAppsTouchController.java rename to quickstep/src/com/android/launcher3/uioverrides/OverviewToAllAppsTouchController.java diff --git a/quickstep/src/com/android/launcher3/uioverrides/UiFactory.java b/quickstep/src/com/android/launcher3/uioverrides/UiFactory.java index bc9069a9ad..ff9d601efd 100644 --- a/quickstep/src/com/android/launcher3/uioverrides/UiFactory.java +++ b/quickstep/src/com/android/launcher3/uioverrides/UiFactory.java @@ -60,14 +60,15 @@ public class UiFactory { WindowManagerWrapper.getInstance().setShelfHeight(visible != 0, height); public static TouchController[] createTouchControllers(Launcher launcher) { + boolean swipeUpEnabled = OverviewInteractionState.INSTANCE.get(launcher) + .isSwipeUpGestureEnabled(); ArrayList list = new ArrayList<>(); list.add(launcher.getDragController()); - TouchController overviewToAllAppsController = - RecentsUiFactory.createOverviewToAllAppsTouchController(launcher); - if (overviewToAllAppsController != null) { - list.add(overviewToAllAppsController); + if (!swipeUpEnabled || launcher.getDeviceProfile().isVerticalBarLayout()) { + list.add(new OverviewToAllAppsTouchController(launcher)); } + if (launcher.getDeviceProfile().isVerticalBarLayout()) { list.add(new LandscapeEdgeSwipeController(launcher)); } else {