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

Commit 3c6a4c48 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes from topic "am-8e640663-ae8d-4ba1-a70b-49ebe492d6ee" into ub-launcher3-master 

* changes:
  [automerger] Add mStartState to determine if user swipes up from Home. am: 788c0514
  Add mStartState to determine if user swipes up from Home.
parents 44ac2a80 e5c340a9

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

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

    protected void onSwipeInteractionCompleted(LauncherState targetState, int logAction) {

        super.onSwipeInteractionCompleted(targetState, logAction);

        if (mFromState == NORMAL && targetState == OVERVIEW) {

        if (mStartState == NORMAL && targetState == OVERVIEW) {

            RecentsModel.getInstance(mLauncher).onOverviewShown(true, TAG);

        }

    }

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

+1 −1
Original line number Diff line number Diff line
@@ -202,7 +202,7 @@ public class PortraitStatesTouchController extends AbstractStateChangeTouchContr 
    @Override

    protected void onSwipeInteractionCompleted(LauncherState targetState, int logAction) {

        super.onSwipeInteractionCompleted(targetState, logAction);

        if (mFromState == NORMAL && targetState == OVERVIEW) {

        if (mStartState == NORMAL && targetState == OVERVIEW) {

            RecentsModel.getInstance(mLauncher).onOverviewShown(true, TAG);

        }

    }

src/com/android/launcher3/touch/AbstractStateChangeTouchController.java

+4 −1
Original line number Diff line number Diff line
@@ -72,6 +72,7 @@ public abstract class AbstractStateChangeTouchController 
    private boolean mNoIntercept;

    protected int mStartContainerType;



    protected LauncherState mStartState;

    protected LauncherState mFromState;

    protected LauncherState mToState;

    protected AnimatorPlaybackController mCurrentAnimation;
@@ -235,8 +236,10 @@ public abstract class AbstractStateChangeTouchController 


    @Override

    public void onDragStart(boolean start) {

        mStartState = mLauncher.getStateManager().getState();

        if (mCurrentAnimation == null) {

            mFromState = mToState = null;

            mFromState = mStartState;

            mToState = null;

            mAtomicComponentsController = null;

            reinitCurrentAnimation(false, mDetector.wasInitialTouchPositive());

            mDisplacementShift = 0;