Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 430bc2cd authored by Tony Wickham's avatar Tony Wickham Committed by Android (Google) Code Review
Browse files

Merge "Rename LandscapeStatesTouchController ->... 

Merge "Rename LandscapeStatesTouchController -> OverviewToAllAppsTouchController" into ub-launcher3-master
parents 2998e432 23972338

quickstep/src/com/android/launcher3/uioverrides/LandscapeStatesTouchController.java→quickstep/src/com/android/launcher3/uioverrides/OverviewToAllAppsTouchController.java

+6 −3
Original line number Diff line number Diff line
@@ -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;

    }



}

quickstep/src/com/android/launcher3/uioverrides/UiFactory.java

+2 −2
Original line number Diff line number Diff line
@@ -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 {