Revert Cls stopping now-master running on googlefood

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

Bug: 15833449
Change-Id: I81a5316f5619a9cd3b6ab9fd03b2ba96657b7f68
This commit is contained in:
Kenny Guy committed 2014-06-24 11:43:19 +01:00
1 parent 01453e855f
commit 7bc272a11b
22 files changed
+399 -175

No files matched your search

-4
View File
@@ -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 {