commit 4b41793155bc902befb6a3845d7325c248d983c4
author TreeHugger Robot <treehugger-gerrit@google.com> Tue May 21 21:05:03 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue May 21 21:05:03 2019 +0000
tree 652cb98769be2c6b360a42677f9f05166220e335
parent 49e5d8227b3700e1577bcfc14a889013177251a1
parent da6dad51014d867faf83191d83f1f4fc4207fdab

Merge "Not allowing applying dot state to override "disabled" description" into ub-launcher3-qt-dev

src/com/android/launcher3/BubbleTextView.java

diff --git a/src/com/android/launcher3/BubbleTextView.java b/src/com/android/launcher3/BubbleTextView.java
index bff7f42..2f801e0 100644
--- a/src/com/android/launcher3/BubbleTextView.java
+++ b/src/com/android/launcher3/BubbleTextView.java
@@ -51,7 +51,6 @@
 import com.android.launcher3.icons.DotRenderer;
 import com.android.launcher3.icons.IconCache.IconLoadRequest;
 import com.android.launcher3.icons.IconCache.ItemInfoUpdateReceiver;
-import com.android.launcher3.icons.LauncherIcons;
 import com.android.launcher3.model.PackageItemInfo;
 import com.android.launcher3.views.ActivityContext;
 
@@ -561,7 +560,10 @@
                 }
             }
             if (itemInfo.contentDescription != null) {
-                if (hasDot()) {
+                if (itemInfo.isDisabled()) {
+                    setContentDescription(getContext().getString(R.string.disabled_app_label,
+                            itemInfo.contentDescription));
+                } else if (hasDot()) {
                     int count = mDotInfo.getNotificationCount();
                     setContentDescription(getContext().getResources().getQuantityString(
                             R.plurals.dotted_app_label, count, itemInfo.contentDescription, count));