commit 04dcce83331ab6a094c32677f5cfc5fdaf208f48
author Pat Manning <patmanning@google.com> Wed Oct 18 11:48:49 2023 +0100
committer Pat Manning <patmanning@google.com> Wed Oct 18 17:13:28 2023 +0100
tree 50fd139016f1f9a3c69c85ac7bc9a92f0b03fde8
parent 879efc7b2a5348408476627b5d1188aac8282072

Add flag guarding around setText in TaskView.

Bug: 303266975
Test: Forrest runs & Crystalball performance metrics.
Flag: enableOverviewIconMenu
Change-Id: I79e325f9d3377bc078634232c53fd3587d05acc4

quickstep/src/com/android/quickstep/views/GroupedTaskView.java

diff --git a/quickstep/src/com/android/quickstep/views/GroupedTaskView.java b/quickstep/src/com/android/quickstep/views/GroupedTaskView.java
index 71758ad..c2c15b7 100644
--- a/quickstep/src/com/android/quickstep/views/GroupedTaskView.java
+++ b/quickstep/src/com/android/quickstep/views/GroupedTaskView.java
@@ -169,7 +169,9 @@
                 mIconLoadRequest2 = iconCache.updateIconInBackground(mSecondaryTask,
                         (task) -> {
                             setIcon(mIconView2, task.icon);
-                            setText(mIconView2, TaskUtils.getTitle(getContext(), task));
+                            if (enableOverviewIconMenu()) {
+                                setText(mIconView2, TaskUtils.getTitle(getContext(), task));
+                            }
                             mDigitalWellBeingToast2.initialize(mSecondaryTask);
                             mDigitalWellBeingToast2.setSplitConfiguration(mSplitBoundsConfig);
                             mDigitalWellBeingToast.setSplitConfiguration(mSplitBoundsConfig);
@@ -184,7 +186,9 @@
             }
             if (needsUpdate(changes, FLAG_UPDATE_ICON)) {
                 setIcon(mIconView2, null);
-                setText(mIconView2, null);
+                if (enableOverviewIconMenu()) {
+                    setText(mIconView2, null);
+                }
             }
         }
     }

quickstep/src/com/android/quickstep/views/TaskView.java

diff --git a/quickstep/src/com/android/quickstep/views/TaskView.java b/quickstep/src/com/android/quickstep/views/TaskView.java
index df907e7..152d834 100644
--- a/quickstep/src/com/android/quickstep/views/TaskView.java
+++ b/quickstep/src/com/android/quickstep/views/TaskView.java
@@ -1081,7 +1081,9 @@
                 mIconLoadRequest = iconCache.updateIconInBackground(mTask,
                         (task) -> {
                             setIcon(mIconView, task.icon);
-                            setText(mIconView, TaskUtils.getTitle(getContext(), task));
+                            if (enableOverviewIconMenu()) {
+                                setText(mIconView, TaskUtils.getTitle(getContext(), task));
+                            }
                             mDigitalWellBeingToast.initialize(task);
                         });
             }
@@ -1097,7 +1099,9 @@
             }
             if (needsUpdate(changes, FLAG_UPDATE_ICON)) {
                 setIcon(mIconView, null);
-                setText(mIconView, null);
+                if (enableOverviewIconMenu()) {
+                    setText(mIconView, null);
+                }
             }
         }
     }