summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2018-05-23 17:57:58 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2018-05-23 17:57:58 +0000
commit39ac161095036be4bb3630b73ed44705b9e1024d (patch)
tree8f27bcbe658441d4bdf957f16e144a86d4e2a686 /src
parente26b03388e1e777f6860971cd157852b43ea6ecd (diff)
parent788c0514938be2886f8aa8377e219fc7083a74e4 (diff)
downloadandroid_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
Diffstat (limited to 'src')
-rw-r--r--src/com/android/launcher3/touch/AbstractStateChangeTouchController.java5
1 files changed, 4 insertions, 1 deletions
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;