diff options
| author | Tony Wickham <twickham@google.com> | 2018-02-26 15:25:11 -0800 |
|---|---|---|
| committer | Tony Wickham <twickham@google.com> | 2018-02-26 15:25:11 -0800 |
| commit | 0639cd40971260341359b25367a4c1d8449efa9d (patch) | |
| tree | 5505f7c9ebcbe316523d6cf3c911ae1bd83773bc /quickstep | |
| parent | 33d1c3c0eae31abbaffb8617827f986ecba88708 (diff) | |
| download | android_packages_apps_Trebuchet-0639cd40971260341359b25367a4c1d8449efa9d.tar.gz android_packages_apps_Trebuchet-0639cd40971260341359b25367a4c1d8449efa9d.tar.bz2 android_packages_apps_Trebuchet-0639cd40971260341359b25367a4c1d8449efa9d.zip | |
Ignore following touch actions if we didn't have window focus
Previously we would ignore the down action, but then get the up if
window focus had changed (such as when hitting back to get rid of the
keyboard in all apps, which would launch the app in that position).
Bug: 73887575
Change-Id: I5405223982ef52633180ecd960a697af0d0b76d9
Diffstat (limited to 'quickstep')
| -rw-r--r-- | quickstep/src/com/android/quickstep/TouchInteractionService.java | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/quickstep/src/com/android/quickstep/TouchInteractionService.java b/quickstep/src/com/android/quickstep/TouchInteractionService.java index 91ea29bfa..c16629279 100644 --- a/quickstep/src/com/android/quickstep/TouchInteractionService.java +++ b/quickstep/src/com/android/quickstep/TouchInteractionService.java @@ -239,6 +239,7 @@ public class TouchInteractionService extends Service { private boolean mTrackingStarted = false; private boolean mInvalidated = false; + private boolean mHadWindowFocusOnDown; LauncherTouchConsumer(Launcher launcher, View target) { mLauncher = launcher; @@ -254,14 +255,12 @@ public class TouchInteractionService extends Service { if (mInvalidated) { return; } - if (!mTarget.hasWindowFocus()) { - return; - } int action = ev.getActionMasked(); if (action == ACTION_DOWN) { mTrackingStarted = false; mDownPos.set(ev.getX(), ev.getY()); - } else if (!mTrackingStarted) { + mHadWindowFocusOnDown = mTarget.hasWindowFocus(); + } else if (!mTrackingStarted && mHadWindowFocusOnDown) { switch (action) { case ACTION_POINTER_UP: case ACTION_POINTER_DOWN: |