summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorTony Wickham <twickham@google.com>2018-04-06 22:51:06 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2018-04-06 22:51:06 +0000
commit3541ac10a10be4e6cd2d493d722ed2830b59a0c7 (patch)
treed9ab68c048df365e64816e2b5a2309df9ab53885 /src
parenta4984f3df8ce05a715e848331657fe446ad0ed75 (diff)
parent6270a0ea18d27952fec20da04d64ca4f7e223849 (diff)
downloadandroid_packages_apps_Trebuchet-3541ac10a10be4e6cd2d493d722ed2830b59a0c7.tar.gz
android_packages_apps_Trebuchet-3541ac10a10be4e6cd2d493d722ed2830b59a0c7.tar.bz2
android_packages_apps_Trebuchet-3541ac10a10be4e6cd2d493d722ed2830b59a0c7.zip
Merge "When dragging past first or last state, don't reinit target" into ub-launcher3-master
Diffstat (limited to 'src')
-rw-r--r--src/com/android/launcher3/touch/AbstractStateChangeTouchController.java4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/com/android/launcher3/touch/AbstractStateChangeTouchController.java b/src/com/android/launcher3/touch/AbstractStateChangeTouchController.java
index 9726704dd..3d85ac3c6 100644
--- a/src/com/android/launcher3/touch/AbstractStateChangeTouchController.java
+++ b/src/com/android/launcher3/touch/AbstractStateChangeTouchController.java
@@ -124,6 +124,10 @@ public abstract class AbstractStateChangeTouchController extends AnimatorListene
return mLauncher.getAllAppsController().getShiftRange();
}
+ /**
+ * Returns the state to go to from fromState given the drag direction. If there is no state in
+ * that direction, returns fromState.
+ */
protected abstract LauncherState getTargetState(LauncherState fromState,
boolean isDragTowardPositive);