Fixing issue with content description not being updated.
Bug: 30064868
Change-Id: I09a0576c3618c253c25a5e755081833816887698
diff --git a/src/com/android/launcher3/IconCache.java b/src/com/android/launcher3/IconCache.java
index 1fea6b4..9ce941b 100644
--- a/src/com/android/launcher3/IconCache.java
+++ b/src/com/android/launcher3/IconCache.java
@@ -445,8 +445,8 @@
CacheEntry entry = cacheLocked(application.componentName, info, user,
false, useLowResIcon);
application.title = Utilities.trim(entry.title);
- application.iconBitmap = getNonNullIcon(entry, user);
application.contentDescription = entry.contentDescription;
+ application.iconBitmap = getNonNullIcon(entry, user);
application.usingLowResIcon = entry.isLowResIcon;
}
@@ -458,8 +458,8 @@
false, application.usingLowResIcon);
if (entry.icon != null && !isDefaultIcon(entry.icon, application.user)) {
application.title = Utilities.trim(entry.title);
- application.iconBitmap = entry.icon;
application.contentDescription = entry.contentDescription;
+ application.iconBitmap = entry.icon;
application.usingLowResIcon = entry.isLowResIcon;
}
}
@@ -492,6 +492,7 @@
if (component == null) {
shortcutInfo.setIcon(getDefaultIcon(user));
shortcutInfo.title = "";
+ shortcutInfo.contentDescription = "";
shortcutInfo.usingFallbackIcon = true;
shortcutInfo.usingLowResIcon = false;
} else {
@@ -509,6 +510,7 @@
CacheEntry entry = cacheLocked(component, info, user, usePkgIcon, useLowResIcon);
shortcutInfo.setIcon(getNonNullIcon(entry, user));
shortcutInfo.title = Utilities.trim(entry.title);
+ shortcutInfo.contentDescription = entry.contentDescription;
shortcutInfo.usingFallbackIcon = isDefaultIcon(entry.icon, user);
shortcutInfo.usingLowResIcon = entry.isLowResIcon;
}
@@ -520,10 +522,10 @@
PackageItemInfo infoInOut, boolean useLowResIcon) {
CacheEntry entry = getEntryForPackageLocked(
infoInOut.packageName, infoInOut.user, useLowResIcon);
- infoInOut.iconBitmap = getNonNullIcon(entry, infoInOut.user);
infoInOut.title = Utilities.trim(entry.title);
- infoInOut.usingLowResIcon = entry.isLowResIcon;
infoInOut.contentDescription = entry.contentDescription;
+ infoInOut.iconBitmap = getNonNullIcon(entry, infoInOut.user);
+ infoInOut.usingLowResIcon = entry.isLowResIcon;
}
public synchronized Bitmap getDefaultIcon(UserHandleCompat user) {
diff --git a/src/com/android/launcher3/ShortcutInfo.java b/src/com/android/launcher3/ShortcutInfo.java
index 3756ba1..b8f0ec9 100644
--- a/src/com/android/launcher3/ShortcutInfo.java
+++ b/src/com/android/launcher3/ShortcutInfo.java
@@ -299,7 +299,7 @@
if (TextUtils.isEmpty(label)) {
label = shortcutInfo.getShortLabel();
}
- this.contentDescription = UserManagerCompat.getInstance(context)
+ contentDescription = UserManagerCompat.getInstance(context)
.getBadgedLabelForUser(label, user);
LauncherAppState launcherAppState = LauncherAppState.getInstance();