Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7eadfc4f authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Ignore following touch actions if we didn't have window focus" into ub-launcher3-master

parents 2006ecfe 0639cd40
Loading
Loading
Loading
Loading
+3 −4
Original line number Diff line number Diff line
@@ -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: