From 3c2ab1de456a4bb132a7129a9fc8f3b81ec58a42 Mon Sep 17 00:00:00 2001
From: randypfohl <randypfohl@google.com>
Date: Wed, 14 Jun 2023 14:54:33 -0700
Subject: [PATCH] Aligning the intialization process with groupedtaskview to
 set content description Test: built locally, tested against tablet with
 bluetooth keyboard.

Bug: 287287064
Change-Id: I2be667b2a4b0a08f73c3233a05bbaf7eec08c0e4
---
 .../com/android/quickstep/views/DigitalWellBeingToast.java  | 4 ----
 quickstep/src/com/android/quickstep/views/TaskView.java     | 6 ++++--
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/views/DigitalWellBeingToast.java b/quickstep/src/com/android/quickstep/views/DigitalWellBeingToast.java
index 3e79eaf8cc..7bbe36a0ed 100644
--- a/quickstep/src/com/android/quickstep/views/DigitalWellBeingToast.java
+++ b/quickstep/src/com/android/quickstep/views/DigitalWellBeingToast.java
@@ -280,10 +280,6 @@ public final class DigitalWellBeingToast {
         }
     }
 
-    public String getContentDescription() {
-            return getContentDescriptionForTask(mTask, mAppUsageLimitTimeMs, mAppRemainingTimeMs);
-    }
-
     private String getContentDescriptionForTask(
             Task task, long appUsageLimitTimeMs, long appRemainingTimeMs) {
         return appUsageLimitTimeMs >= 0 && appRemainingTimeMs >= 0 ?
diff --git a/quickstep/src/com/android/quickstep/views/TaskView.java b/quickstep/src/com/android/quickstep/views/TaskView.java
index f71d0c1dd5..17d83ec208 100644
--- a/quickstep/src/com/android/quickstep/views/TaskView.java
+++ b/quickstep/src/com/android/quickstep/views/TaskView.java
@@ -1020,7 +1020,10 @@ public class TaskView extends FrameLayout implements Reusable {
             }
             if (needsUpdate(changes, FLAG_UPDATE_ICON)) {
                 mIconLoadRequest = iconCache.updateIconInBackground(mTask,
-                        (task) -> setIcon(mIconView, task.icon));
+                        (task) -> {
+                            setIcon(mIconView, task.icon);
+                            mDigitalWellBeingToast.initialize(task);
+                        });
             }
         } else {
             if (needsUpdate(changes, FLAG_UPDATE_THUMBNAIL)) {
@@ -1342,7 +1345,6 @@ public class TaskView extends FrameLayout implements Reusable {
 
     protected void refreshTaskThumbnailSplash() {
         mSnapshotView.refreshSplashView();
-        setContentDescription(mDigitalWellBeingToast.getContentDescription());
     }
 
     private void setSplitSelectTranslationX(float x) {