PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Update launcher call to fetch recent tasks" into rvc-dev am: 88fb279975 am: da126057e1 am: a925158dd2 am: 0c8f85001f

Browse Source 
Change-Id: Ib6e1370bc8fc56e2c2d1d7c803c3adcb1643a647
This commit is contained in:
Winson Chung
2020-03-27 03:37:45 +00:00
committed by Automerger Merge Worker
parent 88b8b0a902 0c8f85001f
commit d8ea72c097
1 changed files with 5 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
quickstep/recents_ui_overrides/src/com/android/quickstep/TouchInteractionService.java
+5 -13
View File
@@ -442,7 +442,7 @@ public class TouchInteractionService extends Service implements PluginListener<O
GestureState newGestureState = new GestureState(mOverviewComponentObserver, GestureState newGestureState = new GestureState(mOverviewComponentObserver,
ActiveGestureLog.INSTANCE.generateAndSetLogId()); ActiveGestureLog.INSTANCE.generateAndSetLogId());
newGestureState.updateRunningTask(TraceHelper.whitelistIpcs("getRunningTask.0", newGestureState.updateRunningTask(TraceHelper.whitelistIpcs("getRunningTask.0",
() -> mAM.getRunningTask(0))); () -> mAM.getRunningTask(true /* filterOnlyVisibleRecents */)));
if (mDeviceState.isInSwipeUpTouchRegion(event)) { if (mDeviceState.isInSwipeUpTouchRegion(event)) {
mConsumer.onConsumerAboutToBeSwitched(); mConsumer.onConsumerAboutToBeSwitched();
@@ -577,18 +577,10 @@ public class TouchInteractionService extends Service implements PluginListener<O
return createDeviceLockedInputConsumer(gestureState); return createDeviceLockedInputConsumer(gestureState);
} }
boolean forceOverviewInputConsumer = false; RunningTaskInfo runningTask = gestureState.getRunningTask();
if (AssistantUtilities.isExcludedAssistant(gestureState.getRunningTask())) { ComponentName homeComponent = mOverviewComponentObserver.getHomeIntent().getComponent();
// In the case where we are in the excluded assistant state, ignore it and treat the boolean forceOverviewInputConsumer = runningTask != null
// running activity as the task behind the assistant && runningTask.baseIntent.getComponent().equals(homeComponent);
gestureState.updateRunningTask(TraceHelper.whitelistIpcs("getRunningTask.assistant",
() -> mAM.getRunningTask(ACTIVITY_TYPE_ASSISTANT /* ignoreActivityType */)));
ComponentName homeComponent = mOverviewComponentObserver.getHomeIntent().getComponent();
ComponentName runningComponent =
gestureState.getRunningTask().baseIntent.getComponent();
forceOverviewInputConsumer =
runningComponent != null && runningComponent.equals(homeComponent);
}
if (previousGestureState.getFinishingRecentsAnimationTaskId() > 0) { if (previousGestureState.getFinishingRecentsAnimationTaskId() > 0) {
// If the finish animation was interrupted, then continue using the other activity input // If the finish animation was interrupted, then continue using the other activity input