diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2018-05-23 17:57:58 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-05-23 17:57:58 +0000 |
| commit | 39ac161095036be4bb3630b73ed44705b9e1024d (patch) | |
| tree | 8f27bcbe658441d4bdf957f16e144a86d4e2a686 | |
| parent | e26b03388e1e777f6860971cd157852b43ea6ecd (diff) | |
| parent | 788c0514938be2886f8aa8377e219fc7083a74e4 (diff) | |
| download | android_packages_apps_Trebuchet-39ac161095036be4bb3630b73ed44705b9e1024d.tar.gz android_packages_apps_Trebuchet-39ac161095036be4bb3630b73ed44705b9e1024d.tar.bz2 android_packages_apps_Trebuchet-39ac161095036be4bb3630b73ed44705b9e1024d.zip | |
Merge "Add mStartState to determine if user swipes up from Home." into ub-launcher3-edmonton
3 files changed, 6 insertions, 3 deletions
diff --git a/quickstep/src/com/android/launcher3/uioverrides/LandscapeEdgeSwipeController.java b/quickstep/src/com/android/launcher3/uioverrides/LandscapeEdgeSwipeController.java index 68773b418..6d1061990 100644 --- a/quickstep/src/com/android/launcher3/uioverrides/LandscapeEdgeSwipeController.java +++ b/quickstep/src/com/android/launcher3/uioverrides/LandscapeEdgeSwipeController.java @@ -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); } } diff --git a/quickstep/src/com/android/launcher3/uioverrides/PortraitStatesTouchController.java b/quickstep/src/com/android/launcher3/uioverrides/PortraitStatesTouchController.java index 987f952ba..3fb7cd480 100644 --- a/quickstep/src/com/android/launcher3/uioverrides/PortraitStatesTouchController.java +++ b/quickstep/src/com/android/launcher3/uioverrides/PortraitStatesTouchController.java @@ -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); } } diff --git a/src/com/android/launcher3/touch/AbstractStateChangeTouchController.java b/src/com/android/launcher3/touch/AbstractStateChangeTouchController.java index 61bd5c88a..a9006e314 100644 --- a/src/com/android/launcher3/touch/AbstractStateChangeTouchController.java +++ b/src/com/android/launcher3/touch/AbstractStateChangeTouchController.java @@ -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; |