openkylin
/
platform_packages_apps_Launcher3
mirror of https://gitee.com/openkylin/platform_packages_apps_launcher3.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "Cancelling long press on workspace if touch point moves a lot" into ub-launcher3-master

This commit is contained in:
TreeHugger Robot 2018-09-24 22:37:51 +00:00 committed by Android (Google) Code Review
parent 0dfa0ce22d 73a3d79d24
commit d65f5f7f1a
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/com/android/launcher3/touch/WorkspaceTouchListener.java
View File

@ -17,6 +17,7 @@ package com.android.launcher3.touch;
import static android.view.MotionEvent.ACTION_CANCEL;
import static android.view.MotionEvent.ACTION_DOWN;
import static android.view.MotionEvent.ACTION_MOVE;
import static android.view.MotionEvent.ACTION_POINTER_UP;
import static android.view.MotionEvent.ACTION_UP;
import static android.view.ViewConfiguration.getLongPressTimeout;
@ -29,6 +30,7 @@ import android.view.HapticFeedbackConstants;
import android.view.MotionEvent;
import android.view.View;
import android.view.View.OnTouchListener;
import android.view.ViewConfiguration;
import com.android.launcher3.AbstractFloatingView;
import com.android.launcher3.CellLayout;
@ -60,12 +62,16 @@ public class WorkspaceTouchListener implements OnTouchListener, Runnable {
private final Launcher mLauncher;
private final Workspace mWorkspace;
private final PointF mTouchDownPoint = new PointF();
private final float mTouchSlop;
private int mLongPressState = STATE_CANCELLED;
public WorkspaceTouchListener(Launcher launcher, Workspace workspace) {
mLauncher = launcher;
mWorkspace = workspace;
// Use twice the touch slop as we are looking for long press which is more
// likely to cause movement.
mTouchSlop = 2 * ViewConfiguration.get(launcher).getScaledTouchSlop();
}
@Override
@ -116,6 +122,9 @@ public class WorkspaceTouchListener implements OnTouchListener, Runnable {
mWorkspace.onTouchEvent(ev);
if (mWorkspace.isHandlingTouch()) {
cancelLongPress();
} else if (action == ACTION_MOVE && PointF.length(
mTouchDownPoint.x - ev.getX(), mTouchDownPoint.y - ev.getY()) > mTouchSlop) {
cancelLongPress();
}
result = true;