diff options
author | Marcos Marado <mmarado@cyngn.com> | 2016-10-04 12:03:59 +0100 |
---|---|---|
committer | Marcos Marado <mmarado@cyngn.com> | 2016-10-04 04:12:44 -0700 |
commit | 8351291f6a5f9b1c9d0b2da6fbcba2b13518c3d4 (patch) | |
tree | 5fe4c0464f2c0601fc13b24e8791ea01ce7cea1f /src/com | |
parent | 3d5ea60150a0be09947e7ae76a489536c81e9d4f (diff) | |
download | android_packages_apps_Trebuchet-stable/cm-13.0-ZNH2K.tar.gz android_packages_apps_Trebuchet-stable/cm-13.0-ZNH2K.tar.bz2 android_packages_apps_Trebuchet-stable/cm-13.0-ZNH2K.zip |
IconCache: Simplify application of custom titles from STKstable/cm-13.0-ZNH2K
Instead of trying to deal with multiple icon-cache conditions,
just apply the custom title to the entry right before using it.
This deals with hot-swap, card exchange, and similar weird issues
that were hitting stale cache entries, and is less aggressive
than outright flushing the cache with every STK refresh.
Issue: FEIJAO-815
Change-Id: Iacd7da820f0404b4dc12394d9c9a571bdceadeb0
(cherry picked from commit abc57d4d5d7f408b26859de2eda60d39cc474c3d)
Diffstat (limited to 'src/com')
-rw-r--r-- | src/com/android/launcher3/IconCache.java | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/src/com/android/launcher3/IconCache.java b/src/com/android/launcher3/IconCache.java index 59239be90..b30ff2d6e 100644 --- a/src/com/android/launcher3/IconCache.java +++ b/src/com/android/launcher3/IconCache.java @@ -597,12 +597,7 @@ public class IconCache { if (DEBUG) Log.d(TAG, "using package default icon for " + componentName.toShortString()); entry.icon = packageEntry.icon; - if (isCustomTitle) { - entry.title = ((LauncherApplication) mContext) - .getStkAppName(); - } else { - entry.title = packageEntry.title; - } + entry.title = packageEntry.title; entry.contentDescription = packageEntry.contentDescription; } } @@ -615,15 +610,16 @@ public class IconCache { } if (TextUtils.isEmpty(entry.title) && info != null) { - if (isCustomTitle) { - entry.title = ((LauncherApplication) mContext) - .getStkAppName(); - } else { - entry.title = info.getLabel(); - } + entry.title = info.getLabel(); entry.contentDescription = mUserManager.getBadgedLabelForUser(entry.title, user); } } + + if (isCustomTitle) { + entry.title = ((LauncherApplication) mContext) + .getStkAppName(); + } + return entry; } |