diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2019-05-21 21:05:03 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-05-21 21:05:03 +0000 |
| commit | 4b41793155bc902befb6a3845d7325c248d983c4 (patch) | |
| tree | 652cb98769be2c6b360a42677f9f05166220e335 /src | |
| parent | 49e5d8227b3700e1577bcfc14a889013177251a1 (diff) | |
| parent | da6dad51014d867faf83191d83f1f4fc4207fdab (diff) | |
| download | android_packages_apps_Trebuchet-4b41793155bc902befb6a3845d7325c248d983c4.tar.gz android_packages_apps_Trebuchet-4b41793155bc902befb6a3845d7325c248d983c4.tar.bz2 android_packages_apps_Trebuchet-4b41793155bc902befb6a3845d7325c248d983c4.zip | |
Merge "Not allowing applying dot state to override "disabled" description" into ub-launcher3-qt-dev
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/launcher3/BubbleTextView.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/com/android/launcher3/BubbleTextView.java b/src/com/android/launcher3/BubbleTextView.java index bff7f4213..2f801e04b 100644 --- a/src/com/android/launcher3/BubbleTextView.java +++ b/src/com/android/launcher3/BubbleTextView.java @@ -51,7 +51,6 @@ import com.android.launcher3.graphics.PreloadIconDrawable; 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 @@ public class BubbleTextView extends TextView implements ItemInfoUpdateReceiver, } } 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)); |