diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2016-12-12 22:02:55 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-12-12 22:02:55 +0000 |
commit | 2a2b1ad8fd59f2ee9af3403ac79402bd68cc16a1 (patch) | |
tree | 90d9ea8a6124023c1e654e73171761f6edca068c /src/com | |
parent | cf160d392af743482e6b87342d80dfddc1d69c3d (diff) | |
parent | 251ab6e8476aafe3627b0d9025cd5a7c70128f10 (diff) | |
download | android_packages_apps_Trebuchet-2a2b1ad8fd59f2ee9af3403ac79402bd68cc16a1.tar.gz android_packages_apps_Trebuchet-2a2b1ad8fd59f2ee9af3403ac79402bd68cc16a1.tar.bz2 android_packages_apps_Trebuchet-2a2b1ad8fd59f2ee9af3403ac79402bd68cc16a1.zip |
Merge "Lower the transition threshold for dropping on Workspace." into ub-launcher3-master
Diffstat (limited to 'src/com')
-rw-r--r-- | src/com/android/launcher3/Workspace.java | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java index 00e458f6a..abd2c6c29 100644 --- a/src/com/android/launcher3/Workspace.java +++ b/src/com/android/launcher3/Workspace.java @@ -100,6 +100,14 @@ public class Workspace extends PagedView Insettable, DropTargetSource { private static final String TAG = "Launcher.Workspace"; + /** The value that {@link #mTransitionProgress} must be greater than for + * {@link #transitionStateShouldAllowDrop()} to return true. */ + private static final float ALLOW_DROP_TRANSITION_PROGRESS = 0.25f; + + /** The value that {@link #mTransitionProgress} must be greater than for + * {@link #isFinishedSwitchingState()} ()} to return true. */ + private static final float FINISHED_SWITCHING_STATE_TRANSITION_PROGRESS = 0.5f; + private static boolean ENFORCE_DRAG_EVENT_ORDER = false; private static final int SNAP_OFF_EMPTY_SCREEN_DURATION = 400; @@ -1171,7 +1179,8 @@ public class Workspace extends PagedView /** This differs from isSwitchingState in that we take into account how far the transition * has completed. */ public boolean isFinishedSwitchingState() { - return !mIsSwitchingState || (mTransitionProgress > 0.5f); + return !mIsSwitchingState + || (mTransitionProgress > FINISHED_SWITCHING_STATE_TRANSITION_PROGRESS); } protected void onWindowVisibilityChanged (int visibility) { @@ -2278,8 +2287,8 @@ public class Workspace extends PagedView return dv; } - public boolean transitionStateShouldAllowDrop() { - return ((!isSwitchingState() || mTransitionProgress > 0.5f) && + private boolean transitionStateShouldAllowDrop() { + return ((!isSwitchingState() || mTransitionProgress > ALLOW_DROP_TRANSITION_PROGRESS) && (mState == State.NORMAL || mState == State.SPRING_LOADED)); } |