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 "Ignore following touch actions if we didn't have window focus" into ub-launcher3-master

This commit is contained in:
TreeHugger Robot 2018-02-26 23:42:51 +00:00 committed by Android (Google) Code Review
parent 2006ecfe78 0639cd4097
commit 7eadfc4f15
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
quickstep/src/com/android/quickstep/TouchInteractionService.java
View File

@ -239,6 +239,7 @@ public class TouchInteractionService extends Service {
private boolean mTrackingStarted = false; private boolean mTrackingStarted = false;
private boolean mInvalidated = false; private boolean mInvalidated = false;
private boolean mHadWindowFocusOnDown;
LauncherTouchConsumer(Launcher launcher, View target) { LauncherTouchConsumer(Launcher launcher, View target) {
mLauncher = launcher; mLauncher = launcher;
@ -254,14 +255,12 @@ public class TouchInteractionService extends Service {
if (mInvalidated) { if (mInvalidated) {
return; return;
} }
if (!mTarget.hasWindowFocus()) {
return;
}
int action = ev.getActionMasked(); int action = ev.getActionMasked();
if (action == ACTION_DOWN) { if (action == ACTION_DOWN) {
mTrackingStarted = false; mTrackingStarted = false;
mDownPos.set(ev.getX(), ev.getY()); mDownPos.set(ev.getX(), ev.getY());
} else if (!mTrackingStarted) { mHadWindowFocusOnDown = mTarget.hasWindowFocus();
} else if (!mTrackingStarted && mHadWindowFocusOnDown) {
switch (action) { switch (action) {
case ACTION_POINTER_UP: case ACTION_POINTER_UP:
case ACTION_POINTER_DOWN: case ACTION_POINTER_DOWN: