diff --git a/quickstep/src/com/android/quickstep/TaskIconCache.java b/quickstep/src/com/android/quickstep/TaskIconCache.java index f0f8aece78..20a751be7a 100644 --- a/quickstep/src/com/android/quickstep/TaskIconCache.java +++ b/quickstep/src/com/android/quickstep/TaskIconCache.java @@ -15,6 +15,7 @@ */ package com.android.quickstep; +import static com.android.launcher3.Flags.enableOverviewIconMenu; import static com.android.launcher3.util.DisplayController.CHANGE_DENSITY; import android.annotation.Nullable; @@ -120,6 +121,7 @@ public class TaskIconCache implements DisplayInfoChangeListener { public void handleResult(TaskCacheEntry result) { task.icon = result.icon; task.titleDescription = result.contentDescription; + task.title = result.title; callback.accept(task); dispatchIconUpdate(task.key.id); } @@ -190,6 +192,10 @@ public class TaskIconCache implements DisplayInfoChangeListener { if (activityInfo != null) { entry.contentDescription = getBadgedContentDescription( activityInfo, task.key.userId, task.taskDescription); + if (enableOverviewIconMenu()) { + entry.title = Utilities.trim( + activityInfo.applicationInfo.loadLabel(mContext.getPackageManager())); + } } mIconCache.put(task.key, entry); @@ -280,6 +286,7 @@ public class TaskIconCache implements DisplayInfoChangeListener { private static class TaskCacheEntry { public Drawable icon; public String contentDescription = ""; + public String title = ""; } void registerTaskVisualsChangeListener(TaskVisualsChangeListener newListener) { diff --git a/quickstep/src/com/android/quickstep/views/GroupedTaskView.java b/quickstep/src/com/android/quickstep/views/GroupedTaskView.java index a4a53d14da..5b1d614722 100644 --- a/quickstep/src/com/android/quickstep/views/GroupedTaskView.java +++ b/quickstep/src/com/android/quickstep/views/GroupedTaskView.java @@ -27,7 +27,6 @@ import com.android.launcher3.util.TransformingTouchDelegate; import com.android.quickstep.RecentsModel; import com.android.quickstep.TaskIconCache; import com.android.quickstep.TaskThumbnailCache; -import com.android.quickstep.TaskUtils; import com.android.quickstep.util.CancellableTask; import com.android.quickstep.util.RecentsOrientedState; import com.android.quickstep.util.SplitSelectStateController; @@ -170,7 +169,7 @@ public class GroupedTaskView extends TaskView { (task) -> { setIcon(mIconView2, task.icon); if (enableOverviewIconMenu()) { - setText(mIconView2, TaskUtils.getTitle(getContext(), task)); + setText(mIconView2, task.title); } mDigitalWellBeingToast2.initialize(mSecondaryTask); mDigitalWellBeingToast2.setSplitConfiguration(mSplitBoundsConfig); diff --git a/quickstep/src/com/android/quickstep/views/TaskView.java b/quickstep/src/com/android/quickstep/views/TaskView.java index 5093f22742..94183c407f 100644 --- a/quickstep/src/com/android/quickstep/views/TaskView.java +++ b/quickstep/src/com/android/quickstep/views/TaskView.java @@ -1096,7 +1096,7 @@ public class TaskView extends FrameLayout implements Reusable { (task) -> { setIcon(mIconView, task.icon); if (enableOverviewIconMenu()) { - setText(mIconView, TaskUtils.getTitle(getContext(), task)); + setText(mIconView, task.title); } mDigitalWellBeingToast.initialize(task); });