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

Merge "desktop-exploded-view: Implement the close button and its behavior" into main

Browse Source
This commit is contained in:
Xiaoqian (Daisy) Dai
2025-02-21 16:53:28 -08:00
committed by Android (Google) Code Review
parent 96da8fc3ec 6aca9bedd5
commit 9ca73dfa09
11 changed files with 164 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
quickstep/src/com/android/quickstep/views/RecentsView.java
+16 -6
View File
@@ -676,11 +676,11 @@ public abstract class RecentsView<
MAIN_EXECUTOR,
apkRemoved -> {
if (apkRemoved) {
dismissTask(taskId);
dismissTask(taskId, /*animate=*/true, /*removeTask=*/false);
} else {
mModel.isTaskRemoved(taskKey.id, taskRemoved -> {
if (taskRemoved) {
dismissTask(taskId);
dismissTask(taskId, /*animate=*/true, /*removeTask=*/false);
}
}, RecentsFilterState.getFilter(mFilterState.getPackageNameToFilter()));
}
@@ -4627,17 +4627,27 @@ public abstract class RecentsView<
}
@UiThread
private void dismissTask(int taskId) {
public void dismissTask(int taskId, boolean animate, boolean removeTask) {
TaskView taskView = getTaskViewByTaskId(taskId);
if (taskView == null) {
Log.d(TAG, "dismissTask: " + taskId + ", no associated TaskView");
return;
}
Log.d(TAG, "dismissTask: " + taskId);
dismissTask(taskView, true /* animate */, false /* removeTask */);
if (enableDesktopExplodedView() && taskView instanceof DesktopTaskView desktopTaskView) {
desktopTaskView.removeTaskFromExplodedView(taskId, animate);
if (removeTask) {
ActivityManagerWrapper.getInstance().removeTask(taskId);
}
} else {
dismissTaskView(taskView, animate, removeTask);
}
}
public void dismissTask(TaskView taskView, boolean animateTaskView, boolean removeTask) {
/** Dismisses the entire [taskView]. */
public void dismissTaskView(TaskView taskView, boolean animateTaskView, boolean removeTask) {
PendingAnimation pa = new PendingAnimation(DISMISS_TASK_DURATION);
createTaskDismissAnimation(pa, taskView, animateTaskView, removeTask, DISMISS_TASK_DURATION,
false /* dismissingForSplitSelection*/);
@@ -4653,7 +4663,7 @@ public abstract class RecentsView<
private void dismissCurrentTask() {
TaskView taskView = getNextPageTaskView();
if (taskView != null) {
dismissTask(taskView, true /*animateTaskView*/, true /*removeTask*/);
dismissTaskView(taskView, true /*animateTaskView*/, true /*removeTask*/);
}
}