diff options
author | Kenny Guy <kennyguy@google.com> | 2014-06-30 12:30:31 +0100 |
---|---|---|
committer | Kenny Guy <kennyguy@google.com> | 2014-06-30 12:30:31 +0100 |
commit | c2bd8101b8e26b9ebb2c079ae6867229dad3f196 (patch) | |
tree | a959a1cb19ea9b5b1f2b606a0b4a70cff9f8ed8f /src/com/android/launcher3/IconCache.java | |
parent | 40c5ed303909c4df71037be3429aa1423e59585f (diff) | |
download | android_packages_apps_Trebuchet-c2bd8101b8e26b9ebb2c079ae6867229dad3f196.tar.gz android_packages_apps_Trebuchet-c2bd8101b8e26b9ebb2c079ae6867229dad3f196.tar.bz2 android_packages_apps_Trebuchet-c2bd8101b8e26b9ebb2c079ae6867229dad3f196.zip |
Revert "Revert Cls stopping now-master running on googlefood"
This reverts commit 7bc272a11b701a32d2ed91277341c382cbd84aeb.
Conflicts:
src/com/android/launcher3/BubbleTextView.java
Change-Id: Id1fb2e1249e72658ce5477165c9bcacba9de2b04
Diffstat (limited to 'src/com/android/launcher3/IconCache.java')
-rw-r--r-- | src/com/android/launcher3/IconCache.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/com/android/launcher3/IconCache.java b/src/com/android/launcher3/IconCache.java index be02d3583..7d8628d9d 100644 --- a/src/com/android/launcher3/IconCache.java +++ b/src/com/android/launcher3/IconCache.java @@ -65,6 +65,7 @@ public class IconCache { private static class CacheEntry { public Bitmap icon; public String title; + public String contentDescription; } private static class CacheKey { @@ -240,6 +241,7 @@ public class IconCache { application.title = entry.title; application.iconBitmap = entry.icon; + application.contentDescription = entry.contentDescription; } } @@ -262,6 +264,7 @@ public class IconCache { CacheEntry entry = cacheLocked(component, launcherActInfo, null, user); if (title != null) { entry.title = title; + entry.contentDescription = mUserManager.getBadgedLabelForUser(title, user); } return entry.icon; } @@ -310,6 +313,7 @@ public class IconCache { } } + entry.contentDescription = mUserManager.getBadgedLabelForUser(entry.title, user); entry.icon = Utilities.createIconBitmap( info.getBadgedIcon(mIconDpi), mContext); } else { |