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

Remove some usages of GroupTask.task2

Browse Source 
This CL marks `GroupTask.task1` and `GroupTask.task2` as deprecated, and
removes some of the usages of the `task2`. Follow-up CLs will continue
replacing all the usages.

Bug: 388593902
Test: m
Flag: EXEMPT pure refactor with no behavior change.
Change-Id: I530bbba00bd41cf33a952b083de7670d9a490e81
This commit is contained in:
Ahmed Fakhry
2025-01-14 17:29:20 +00:00
parent 5ca0a51c60
commit 28869b86e9
8 changed files with 43 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
quickstep/src/com/android/launcher3/taskbar/KeyboardQuickSwitchController.java
+7 -13
View File
@@ -349,15 +349,12 @@ public final class KeyboardQuickSwitchController implements
pw.println(prefix + "\tmWasDesktopTaskFilteredOut=" + mWasDesktopTaskFilteredOut);
pw.println(prefix + "\tmTasks=[");
for (GroupTask task : mTasks) {
Task task1 = task.task1;
Task task2 = task.task2;
ComponentName cn1 = task1.getTopComponent();
ComponentName cn2 = task2 != null ? task2.getTopComponent() : null;
pw.println(prefix + "\t\tt1: (id=" + task1.key.id
+ "; package=" + (cn1 != null ? cn1.getPackageName() + ")" : "no package)")
+ " t2: (id=" + (task2 != null ? task2.key.id : "-1")
+ "; package=" + (cn2 != null ? cn2.getPackageName() + ")"
: "no package)"));
int count = 0;
for (Task t : task.getTasks()) {
ComponentName cn = t.getTopComponent();
pw.println(prefix + "\t\tt" + (++count) + ": (id=" + t.key.id
+ "; package=" + (cn != null ? cn.getPackageName() + ")" : "no package)"));
}
}
pw.println(prefix + "\t]");
@@ -411,10 +408,7 @@ public final class KeyboardQuickSwitchController implements
return false;
}
int runningTaskId = ActivityManagerWrapper.getInstance().getRunningTask().taskId;
Task task2 = task.task2;
return runningTaskId == task.task1.key.id
|| (task2 != null && runningTaskId == task2.key.id);
return task.containsTask(runningTaskId);
}
boolean isFirstTaskRunning() {