openkylin
/
platform_packages_apps_Launcher3
mirror of https://gitee.com/openkylin/platform_packages_apps_launcher3.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Revert "Remove OverviewToAllAppsController for Go" 

This reverts commit 792fcc3aec.

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
This commit is contained in:
Kevin Han 2019-01-24 20:36:04 +00:00
parent 792fcc3aec
commit 57f88bd0ec
4 changed files with 7 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
go/quickstep/src/com/android/launcher3/uioverrides/RecentsUiFactory.java
View File

@ -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.
*

22
quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/RecentsUiFactory.java
View File

@ -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.
*

0
quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/OverviewToAllAppsTouchController.java → quickstep/src/com/android/launcher3/uioverrides/OverviewToAllAppsTouchController.java
View File

9
quickstep/src/com/android/launcher3/uioverrides/UiFactory.java
View File

@ -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<TouchController> 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 {