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

Commit 68423156 authored by Tracy Zhou's avatar Tracy Zhou
Browse files

Clear command queue of OverviewCommandHelper on home tap 

Fixes: 194934483
Test: manual
Change-Id: Id83b341245793c38c305e6ada5581ac4e49527a7
Merged-In: Id83b341245793c38c305e6ada5581ac4e49527a7
parent 024749a1

quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java

+13 −0
Original line number Diff line number Diff line
@@ -58,6 +58,7 @@ import com.android.launcher3.uioverrides.RecentsViewStateController; 
import com.android.launcher3.util.ActivityOptionsWrapper;

import com.android.launcher3.util.ObjectWrapper;

import com.android.launcher3.util.UiThreadHelper;

import com.android.quickstep.OverviewCommandHelper;

import com.android.quickstep.RecentsModel;

import com.android.quickstep.SysUINavigationMode;

import com.android.quickstep.SysUINavigationMode.Mode;
@@ -98,12 +99,15 @@ public abstract class BaseQuickstepLauncher extends Launcher 
    private OverviewActionsView mActionsView;



    private @Nullable TaskbarManager mTaskbarManager;

    private @Nullable OverviewCommandHelper mOverviewCommandHelper;

    private @Nullable LauncherTaskbarUIController mTaskbarUIController;

    private final ServiceConnection mTisBinderConnection = new ServiceConnection() {

        @Override

        public void onServiceConnected(ComponentName componentName, IBinder iBinder) {

            mTaskbarManager = ((TISBinder) iBinder).getTaskbarManager();

            mTaskbarManager.setLauncher(BaseQuickstepLauncher.this);



            mOverviewCommandHelper = ((TISBinder) iBinder).getOverviewCommandHelper();

        }



        @Override
@@ -136,6 +140,15 @@ public abstract class BaseQuickstepLauncher extends Launcher 
        super.onDestroy();

    }



    @Override

    protected void onNewIntent(Intent intent) {

        super.onNewIntent(intent);



        if (mOverviewCommandHelper != null) {

            mOverviewCommandHelper.clearPendingCommands();

        }

    }



    public QuickstepTransitionManager getAppTransitionManager() {

        return mAppTransitionManager;

    }

quickstep/src/com/android/quickstep/OverviewCommandHelper.java

+5 −0
Original line number Diff line number Diff line
@@ -109,6 +109,11 @@ public class OverviewCommandHelper { 
        MAIN_EXECUTOR.execute(() -> addCommand(cmd));

    }



    @UiThread

    public void clearPendingCommands() {

        mPendingCommands.clear();

    }



    private TaskView getNextTask(RecentsView view) {

        final TaskView runningTaskView = view.getRunningTaskView();

quickstep/src/com/android/quickstep/TouchInteractionService.java

+4 −0
Original line number Diff line number Diff line
@@ -277,6 +277,10 @@ public class TouchInteractionService extends Service implements PluginListener<O 
        public TaskbarManager getTaskbarManager() {

            return mTaskbarManager;

        }



        public OverviewCommandHelper getOverviewCommandHelper() {

            return mOverviewCommandHelper;

        }

    }



    private static boolean sConnected = false;