aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-03-01 08:16:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Refactor getIndexOfTask() to getTaskAttributesById()" into tm-qpr-dev am: 507c3edef6

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21168150

Change-Id: I7aff9fa285398454e61c8881e3727dd95a7ce01b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Jeremy Sim
2023-02-06 03:47:57 +00:00
committed by Automerger Merge Worker
parent 3e7a738202 507c3edef6
commit 2c86ec0d77
2 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
quickstep/src/com/android/launcher3/taskbar/TaskbarUIController.java
View File

@@ -204,12 +204,11 @@ public class TaskbarUIController {
if (foundTaskView != null) {
// There is already a running app of this type, use that as second app.
// Get index of task (0 or 1), in case it's a GroupedTaskView
int indexOfTask = foundTaskView.getIndexOfTask(foundTask.key.id);
TaskIdAttributeContainer taskAttributes =
foundTaskView.getTaskIdAttributeContainers()[indexOfTask];
foundTaskView.getTaskAttributesById(foundTask.key.id);
recents.confirmSplitSelect(
foundTaskView,
taskAttributes.getTask(),
foundTask,
taskAttributes.getIconView().getDrawable(),
taskAttributes.getThumbnailView(),
taskAttributes.getThumbnailView().getThumbnail(),

16
quickstep/src/com/android/quickstep/views/TaskView.java
View File

@@ -602,16 +602,18 @@ public class TaskView extends FrameLayout implements Reusable {
}
/**
* Finds the index of a given taskId within this TaskView, or -1 if the TaskView does not
* contain it. For grouped tasks (of two), this is 0 or 1; for solo tasks, it is 0.
* Returns the TaskIdAttributeContainer corresponding to a given taskId, or null if the TaskView
* does not contain a Task with that ID.
*/
public int getIndexOfTask(int taskId) {
for (int i = 0; i < mTaskIdContainer.length; i++) {
if (mTaskIdContainer[i] == taskId) {
return i;
@Nullable
public TaskIdAttributeContainer getTaskAttributesById(int taskId) {
for (TaskIdAttributeContainer attributes : mTaskIdAttributeContainer) {
if (attributes.getTask().key.id == taskId) {
return attributes;
}
}
return -1;
return null;
}
public TaskThumbnailView getThumbnail() {