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 | 3c6a4c48d169f9bea29bbc786ff66840006f3dc9 (patch) | |
| tree | 44279db16048badd4c08323a5ab779ff8ab8fca3 | |
| parent | 44ac2a804cf6a2a4179a9cb79b9ba079244aef29 (diff) | |
| parent | e5c340a9955e1a43c4014aed22fe873d714c9483 (diff) | |
| download | android_packages_apps_Trebuchet-3c6a4c48d169f9bea29bbc786ff66840006f3dc9.tar.gz android_packages_apps_Trebuchet-3c6a4c48d169f9bea29bbc786ff66840006f3dc9.tar.bz2 android_packages_apps_Trebuchet-3c6a4c48d169f9bea29bbc786ff66840006f3dc9.zip | |
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: 788c051493
Add mStartState to determine if user swipes up from Home.
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; |