Merge "Rename LandscapeStatesTouchController -> OverviewToAllAppsTouchController" into ub-launcher3-master

This commit is contained in:
Tony Wickham
2018-04-12 18:03:31 +00:00
committed by Android (Google) Code Review
2 changed files with 8 additions and 5 deletions
@@ -28,11 +28,13 @@ import com.android.quickstep.TouchInteractionService;
import com.android.quickstep.views.RecentsView;
/**
* Touch controller from going from OVERVIEW to ALL_APPS
* Touch controller from going from OVERVIEW to ALL_APPS.
*
* This is used in landscape mode. It is also used in portrait mode for the fallback recents.
*/
public class LandscapeStatesTouchController extends PortraitStatesTouchController {
public class OverviewToAllAppsTouchController extends PortraitStatesTouchController {
public LandscapeStatesTouchController(Launcher l) {
public OverviewToAllAppsTouchController(Launcher l) {
super(l);
}
@@ -69,4 +71,5 @@ public class LandscapeStatesTouchController extends PortraitStatesTouchControlle
}
return fromState;
}
}
@@ -41,13 +41,13 @@ public class UiFactory {
if (!swipeUpEnabled) {
return new TouchController[] {
launcher.getDragController(),
new LandscapeStatesTouchController(launcher),
new OverviewToAllAppsTouchController(launcher),
new LauncherTaskViewcontroller(launcher)};
}
if (launcher.getDeviceProfile().isVerticalBarLayout()) {
return new TouchController[] {
launcher.getDragController(),
new LandscapeStatesTouchController(launcher),
new OverviewToAllAppsTouchController(launcher),
new LandscapeEdgeSwipeController(launcher),
new LauncherTaskViewcontroller(launcher)};
} else {