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

Commit 6104544a authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "[Trackpad] Fix not being able to quick switch to the current task" into... 

Merge "[Trackpad] Fix not being able to quick switch to the current task" into udc-dev am: fda666fe

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22911485



Change-Id: Ia23fc9713d0d91bf068f256f62ed77c10bca1a70
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d7307b44 fda666fe

services/core/java/com/android/server/wm/RecentTasks.java

+3 −1
Original line number Original line Diff line number Diff line
@@ -33,6 +33,7 @@ import static android.content.Intent.FLAG_ACTIVITY_MULTIPLE_TASK; 
import static android.content.Intent.FLAG_ACTIVITY_NEW_DOCUMENT;

import static android.content.Intent.FLAG_ACTIVITY_NEW_DOCUMENT;

import static android.content.Intent.FLAG_ACTIVITY_NEW_TASK;

import static android.content.Intent.FLAG_ACTIVITY_NEW_TASK;

import static android.os.Process.SYSTEM_UID;

import static android.os.Process.SYSTEM_UID;

import static android.view.MotionEvent.CLASSIFICATION_MULTI_FINGER_SWIPE;

import static android.view.WindowManager.LayoutParams.FIRST_APPLICATION_WINDOW;

import static android.view.WindowManager.LayoutParams.FIRST_APPLICATION_WINDOW;

import static android.view.WindowManager.LayoutParams.LAST_APPLICATION_WINDOW;

import static android.view.WindowManager.LayoutParams.LAST_APPLICATION_WINDOW;
@@ -209,7 +210,8 @@ class RecentTasks { 
    private final PointerEventListener mListener = new PointerEventListener() {

    private final PointerEventListener mListener = new PointerEventListener() {

        @Override

        @Override

        public void onPointerEvent(MotionEvent ev) {

        public void onPointerEvent(MotionEvent ev) {

            if (!mFreezeTaskListReordering || ev.getAction() != MotionEvent.ACTION_DOWN) {

            if (!mFreezeTaskListReordering || ev.getAction() != MotionEvent.ACTION_DOWN

                    || ev.getClassification() == CLASSIFICATION_MULTI_FINGER_SWIPE) {

                // Skip if we aren't freezing or starting a gesture

                // Skip if we aren't freezing or starting a gesture

                return;

                return;

            }

            }