From 03acb7a6098fb19de8ab0e7b70119e38ee62cc78 Mon Sep 17 00:00:00 2001
From: Julia Reynolds <juliacr@google.com>
Date: Thu, 23 Apr 2020 11:12:09 -0400
Subject: [PATCH] Mark work profile apps as such for voice a11y services

Test: manual with a11y service
Fixes: 152728558
Change-Id: I1b8a3efd2d34b3dda2229b8bae49f48d4d31f4d2
---
 .../notification/history/NotificationHistoryActivity.java   | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/com/android/settings/notification/history/NotificationHistoryActivity.java b/src/com/android/settings/notification/history/NotificationHistoryActivity.java
index b888daab5fd..005b4bb795f 100644
--- a/src/com/android/settings/notification/history/NotificationHistoryActivity.java
+++ b/src/com/android/settings/notification/history/NotificationHistoryActivity.java
@@ -30,6 +30,8 @@ import android.content.pm.PackageManager;
 import android.os.Bundle;
 import android.os.RemoteException;
 import android.os.ServiceManager;
+import android.os.UserHandle;
+import android.os.UserManager;
 import android.provider.Settings;
 import android.service.notification.NotificationListenerService;
 import android.service.notification.StatusBarNotification;
@@ -71,6 +73,7 @@ public class NotificationHistoryActivity extends Activity {
 
     private HistoryLoader mHistoryLoader;
     private INotificationManager mNm;
+    private UserManager mUm;
     private PackageManager mPm;
     private CountDownLatch mCountdownLatch;
     private Future mCountdownFuture;
@@ -104,6 +107,8 @@ public class NotificationHistoryActivity extends Activity {
 
             TextView label = viewForPackage.findViewById(R.id.label);
             label.setText(nhp.label != null ? nhp.label : nhp.pkgName);
+            label.setContentDescription(mUm.getBadgedLabelForUser(label.getText(),
+                    UserHandle.getUserHandleForUid(nhp.uid)));
             ImageView icon = viewForPackage.findViewById(R.id.icon);
             icon.setImageDrawable(nhp.icon);
 
@@ -140,6 +145,7 @@ public class NotificationHistoryActivity extends Activity {
         super.onResume();
 
         mPm = getPackageManager();
+        mUm = getSystemService(UserManager.class);
         // wait for history loading and recent/snooze loading
         mCountdownLatch = new CountDownLatch(2);