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

Commit b9fbc92a authored by Winson Chung's avatar Winson Chung Committed by Automerger Merge Worker
Browse files

Merge "Update launcher call to fetch recent tasks" into rvc-dev am: 88fb2799 

Change-Id: Ia5ec5ef959539df490a07c31c6d347180162b9d9
parents 08d8ab17 88fb2799

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

+5 −13
Original line number Diff line number Diff line
@@ -442,7 +442,7 @@ public class TouchInteractionService extends Service implements PluginListener<O 
            GestureState newGestureState = new GestureState(mOverviewComponentObserver,

                    ActiveGestureLog.INSTANCE.generateAndSetLogId());

            newGestureState.updateRunningTask(TraceHelper.whitelistIpcs("getRunningTask.0",

                    () -> mAM.getRunningTask(0)));

                    () -> mAM.getRunningTask(true /* filterOnlyVisibleRecents */)));



            if (mDeviceState.isInSwipeUpTouchRegion(event)) {

                mConsumer.onConsumerAboutToBeSwitched();
@@ -577,18 +577,10 @@ public class TouchInteractionService extends Service implements PluginListener<O 
            return createDeviceLockedInputConsumer(gestureState);

        }



        boolean forceOverviewInputConsumer = false;

        if (AssistantUtilities.isExcludedAssistant(gestureState.getRunningTask())) {

            // In the case where we are in the excluded assistant state, ignore it and treat the

            // running activity as the task behind the assistant

            gestureState.updateRunningTask(TraceHelper.whitelistIpcs("getRunningTask.assistant",

                    () -> mAM.getRunningTask(ACTIVITY_TYPE_ASSISTANT /* ignoreActivityType */)));

        RunningTaskInfo runningTask = gestureState.getRunningTask();

        ComponentName homeComponent = mOverviewComponentObserver.getHomeIntent().getComponent();

            ComponentName runningComponent =

                    gestureState.getRunningTask().baseIntent.getComponent();

            forceOverviewInputConsumer =

                    runningComponent != null && runningComponent.equals(homeComponent);

        }

        boolean forceOverviewInputConsumer = runningTask != null

                && runningTask.baseIntent.getComponent().equals(homeComponent);



        if (previousGestureState.getFinishingRecentsAnimationTaskId() > 0) {

            // If the finish animation was interrupted, then continue using the other activity input