Remove all external usages of GroupTask.task1/2 from Launcher3
See go/refactor-group-task for details. This CL removes all the usages of `task1` and `task2` from `GroupTask` in Launcher3. Follow-up CLs will remove it from NexusLauncher and remove the fields altogether. Bug: 388593902 Test: m Flag: EXEMPT pure refactor with no behavior change. Change-Id: I902c8135b3a0aae95acf25267b3bcbf286bd4e7d
This commit is contained in:
1 parent
51a340a3c4
commit
b6ecf5889e
16 files changed
+191
-144
No files matched your search
@@ -51,6 +51,9 @@ import com.android.launcher3.anim.AnimatedFloat;
|
||||
import com.android.launcher3.testing.TestLogging;
|
||||
import com.android.launcher3.testing.shared.TestProtocol;
|
||||
import com.android.quickstep.util.GroupTask;
|
||||
import com.android.quickstep.util.SingleTask;
|
||||
import com.android.quickstep.util.SplitTask;
|
||||
import com.android.systemui.shared.recents.model.Task;
|
||||
import com.android.systemui.shared.system.InteractionJankMonitorWrapper;
|
||||
|
||||
import java.util.HashMap;
|
||||
@@ -255,14 +258,21 @@ public class KeyboardQuickSwitchView extends ConstraintLayout {
|
||||
layoutInflater,
|
||||
previousTaskView);
|
||||
|
||||
final boolean firstTaskIsLeftTopTask =
|
||||
groupTask.mSplitBounds == null
|
||||
|| groupTask.mSplitBounds.leftTopTaskId == groupTask.task1.key.id
|
||||
|| groupTask.task2 == null;
|
||||
Task task1;
|
||||
Task task2;
|
||||
if (groupTask instanceof SplitTask splitTask) {
|
||||
task1 = splitTask.getTopLeftTask();
|
||||
task2 = splitTask.getBottomRightTask();
|
||||
} else if (groupTask instanceof SingleTask singleTask) {
|
||||
task1 = singleTask.getTask();
|
||||
task2 = null;
|
||||
} else {
|
||||
continue;
|
||||
}
|
||||
|
||||
currentTaskView.setThumbnailsForSplitTasks(
|
||||
firstTaskIsLeftTopTask ? groupTask.task1 : groupTask.task2,
|
||||
firstTaskIsLeftTopTask ? groupTask.task2 : groupTask.task1,
|
||||
task1,
|
||||
task2,
|
||||
updateTasks ? mViewCallbacks::updateThumbnailInBackground : null,
|
||||
updateTasks ? mViewCallbacks::updateIconInBackground : null,
|
||||
groupTask.mSplitBounds);
|
||||
|
||||
Reference in new issue
Block a user