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

Commit 9c6cfb4e authored by Becky Qiu's avatar Becky Qiu Committed by android-build-merger
Browse files

Fill the log container as hotseat or workspace based on position. 

am: 84fa94e2

Change-Id: If9a5d88062addbd09909e04ef5c2c59e7e5488a7
parents 3ff3991f 84fa94e2

go/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/LandscapeStatesTouchController.java

+1 −1
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ public final class LandscapeStatesTouchController extends PortraitStatesTouchCon 
    }



    @Override

    protected int getLogContainerTypeForNormalState() {

    protected int getLogContainerTypeForNormalState(MotionEvent ev) {

        return LauncherLogProto.ContainerType.WORKSPACE;

    }

}

quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/touchcontrollers/OverviewToAllAppsTouchController.java

+1 −1
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ public class OverviewToAllAppsTouchController extends PortraitStatesTouchControl 
    }



    @Override

    protected int getLogContainerTypeForNormalState() {

    protected int getLogContainerTypeForNormalState(MotionEvent ev) {

        return LauncherLogProto.ContainerType.WORKSPACE;

    }

}

quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/touchcontrollers/QuickSwitchTouchController.java

+1 −1
Original line number Diff line number Diff line
@@ -154,7 +154,7 @@ public class QuickSwitchTouchController extends AbstractStateChangeTouchControll 
    }



    @Override

    protected int getLogContainerTypeForNormalState() {

    protected int getLogContainerTypeForNormalState(MotionEvent ev) {

        return LauncherLogProto.ContainerType.NAVBAR;

    }

quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/LandscapeEdgeSwipeController.java

+1 −1
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ public class LandscapeEdgeSwipeController extends AbstractStateChangeTouchContro 
    }



    @Override

    protected int getLogContainerTypeForNormalState() {

    protected int getLogContainerTypeForNormalState(MotionEvent ev) {

        return LauncherLogProto.ContainerType.NAVBAR;

    }

quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/PortraitStatesTouchController.java

+2 −2
Original line number Diff line number Diff line
@@ -147,8 +147,8 @@ public class PortraitStatesTouchController extends AbstractStateChangeTouchContr 
    }



    @Override

    protected int getLogContainerTypeForNormalState() {

        return ContainerType.HOTSEAT;

    protected int getLogContainerTypeForNormalState(MotionEvent ev) {

        return isTouchOverHotseat(mLauncher, ev) ? ContainerType.HOTSEAT : ContainerType.WORKSPACE;

    }



    private AnimatorSetBuilder getNormalToOverviewAnimation() {