Revert Cls stopping now-master running on googlefood

This reverts commits 01453e855fa87ee19f61223b2b1a6965071ee95a.
and 242bbe1b72e4978dde8a662d164cd186305e14a7.
"Add content description to bagded icons."
"Remove reflection now we are building against L"

Bug: 15833449
Change-Id: I81a5316f5619a9cd3b6ab9fd03b2ba96657b7f68

1 files changed, 0 insertions, 4 deletions

diff --git a/src/com/android/launcher3/IconCache.java b/src/com/android/launcher3/IconCache.java
index 7d8628d9d..be02d3583 100644
--- a/src/com/android/launcher3/IconCache.java
+++ b/src/com/android/launcher3/IconCache.java
@@ -65,7 +65,6 @@ public class IconCache {
     private static class CacheEntry {
         public Bitmap icon;
         public String title;
-        public String contentDescription;
     }
 
     private static class CacheKey {
@@ -241,7 +240,6 @@ public class IconCache {
 
             application.title = entry.title;
             application.iconBitmap = entry.icon;
-            application.contentDescription = entry.contentDescription;
         }
     }
 
@@ -264,7 +262,6 @@ 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;
         }
@@ -313,7 +310,6 @@ public class IconCache {
                     }
                 }
 
-                entry.contentDescription = mUserManager.getBadgedLabelForUser(entry.title, user);
                 entry.icon = Utilities.createIconBitmap(
                         info.getBadgedIcon(mIconDpi), mContext);
             } else {