openkylin
/
platform_packages_apps_Launcher3
mirror of https://gitee.com/openkylin/platform_packages_apps_launcher3.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Snap for 8068644 from 2c97c4ab19 to sc-d2-release 

Change-Id: Ibd9d3d1732dad2e0012b7ee95d0aa7342f010946
This commit is contained in:
Android Build Coastguard Worker 2022-01-12 00:09:22 +00:00
parent a1abc9f864 2c97c4ab19
commit cbe7f4187a
1 changed files with 9 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
quickstep/src/com/android/quickstep/views/RecentsView.java
View File

@ -1144,17 +1144,6 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
// Reset the running task when leaving overview since it can still have a reference to // Reset the running task when leaving overview since it can still have a reference to
// its thumbnail // its thumbnail
mTmpRunningTasks = null; mTmpRunningTasks = null;
// Remove grouped tasks and recycle once we exit overview
int taskCount = getTaskViewCount();
for (int i = 0; i < taskCount; i++) {
View v = getTaskViewAt(i);
if (!(v instanceof GroupedTaskView)) {
return;
}
GroupedTaskView gtv = (GroupedTaskView) v;
gtv.onTaskListVisibilityChanged(false);
removeView(gtv);
}
mSplitBoundsConfig = null; mSplitBoundsConfig = null;
} }
updateLocusId(); updateLocusId();
@ -2185,17 +2174,14 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
*/ */
protected boolean shouldAddStubTaskView(RunningTaskInfo[] runningTaskInfos) { protected boolean shouldAddStubTaskView(RunningTaskInfo[] runningTaskInfos) {
if (runningTaskInfos.length > 1) { if (runningTaskInfos.length > 1) {
// * Always create new view for GroupedTaskView TaskView primaryTaskView = getTaskViewByTaskId(runningTaskInfos[0].taskId);
// * Remove existing associated taskViews for tasks currently in split TaskView secondaryTaskView = getTaskViewByTaskId(runningTaskInfos[1].taskId);
for (RunningTaskInfo rti : runningTaskInfos) { int leftTopTaskViewId =
TaskView taskView = getTaskViewByTaskId(rti.taskId); (primaryTaskView == null) ? -1 : primaryTaskView.getTaskViewId();
if (taskView == null) { int rightBottomTaskViewId =
continue; (secondaryTaskView == null) ? -1 : secondaryTaskView.getTaskViewId();
} // Add a new stub view if both taskIds don't match any taskViews
taskView.onTaskListVisibilityChanged(false); return leftTopTaskViewId != rightBottomTaskViewId || leftTopTaskViewId == -1;
removeView(taskView);
}
return true;
} }
RunningTaskInfo runningTaskInfo = runningTaskInfos[0]; RunningTaskInfo runningTaskInfo = runningTaskInfos[0];
return runningTaskInfo != null && getTaskViewByTaskId(runningTaskInfo.taskId) == null; return runningTaskInfo != null && getTaskViewByTaskId(runningTaskInfo.taskId) == null;
@ -2246,7 +2232,7 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
measure(makeMeasureSpec(getMeasuredWidth(), EXACTLY), measure(makeMeasureSpec(getMeasuredWidth(), EXACTLY),
makeMeasureSpec(getMeasuredHeight(), EXACTLY)); makeMeasureSpec(getMeasuredHeight(), EXACTLY));
layout(getLeft(), getTop(), getRight(), getBottom()); layout(getLeft(), getTop(), getRight(), getBottom());
} else if (!needGroupTaskView && getTaskViewByTaskId(taskInfo.taskId) != null) { } else if (getTaskViewByTaskId(taskInfo.taskId) != null) {
runningTaskViewId = getTaskViewByTaskId(taskInfo.taskId).getTaskViewId(); runningTaskViewId = getTaskViewByTaskId(taskInfo.taskId).getTaskViewId();
} }