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

Commit 84fa94e2 authored by Becky Qiu's avatar Becky Qiu
Browse files

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

Test: manual
Bug: 137953006

Swipe from workspace:
07-30 15:15:44.031  9779  9779 D UserEvent: action:FLING direction=UP direction=UP
07-30 15:15:44.031  9779  9779 D UserEvent:  Source child:WORKSPACE id=0 span(951,1313)	parent:WORKSPACE id=0
07-30 15:15:44.031  9779  9779 D UserEvent:  Destination child:ALLAPPS
07-30 15:15:44.031  9779  9779 D UserEvent:  Elapsed container 826 ms, session 9361 ms, action 0 ms

Swipe from hotseat:
07-30 15:15:46.010  9779  9779 D UserEvent: action:FLING direction=UP direction=UP
07-30 15:15:46.010  9779  9779 D UserEvent:  Source child:HOTSEAT id=0 span(786,1908)	parent:WORKSPACE id=0
07-30 15:15:46.010  9779  9779 D UserEvent:  Destination child:ALLAPPS
07-30 15:15:46.010  9779  9779 D UserEvent:  Elapsed container 1139 ms, session 11339 ms, action 0 ms

Change-Id: I959528889fda778efc569bb59e7f44d3bd5b81bc
parent 783717c0

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() {