diff options
author | belgin <belginstirbu@hotmail.com> | 2020-11-24 01:46:38 +0200 |
---|---|---|
committer | Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org> | 2020-11-25 20:22:47 +0100 |
commit | 3568cd47f811da2a94cb13315f9130a6a09d12fb (patch) | |
tree | cd649636255c1f9b809f43a0d8252df52264e88b | |
parent | d8f1ad0e05d55afc8b986347d08da4caa99eefd8 (diff) | |
download | packages_apps_Trebuchet-3568cd47f811da2a94cb13315f9130a6a09d12fb.tar.gz packages_apps_Trebuchet-3568cd47f811da2a94cb13315f9130a6a09d12fb.tar.bz2 packages_apps_Trebuchet-3568cd47f811da2a94cb13315f9130a6a09d12fb.zip |
Revert "IconCache: Simplify application of custom titles from STK"
This reverts commit abc57d4d5d7f408b26859de2eda60d39cc474c3d.
Signed-off-by: belgin <belginstirbu@hotmail.com>
Acked-by: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
-rw-r--r-- | src/com/android/launcher3/IconCache.java | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/src/com/android/launcher3/IconCache.java b/src/com/android/launcher3/IconCache.java index b30ff2d6e..59239be90 100644 --- a/src/com/android/launcher3/IconCache.java +++ b/src/com/android/launcher3/IconCache.java @@ -597,7 +597,12 @@ public class IconCache { if (DEBUG) Log.d(TAG, "using package default icon for " + componentName.toShortString()); entry.icon = packageEntry.icon; - entry.title = packageEntry.title; + if (isCustomTitle) { + entry.title = ((LauncherApplication) mContext) + .getStkAppName(); + } else { + entry.title = packageEntry.title; + } entry.contentDescription = packageEntry.contentDescription; } } @@ -610,16 +615,15 @@ public class IconCache { } if (TextUtils.isEmpty(entry.title) && info != null) { - entry.title = info.getLabel(); + if (isCustomTitle) { + entry.title = ((LauncherApplication) mContext) + .getStkAppName(); + } else { + entry.title = info.getLabel(); + } entry.contentDescription = mUserManager.getBadgedLabelForUser(entry.title, user); } } - - if (isCustomTitle) { - entry.title = ((LauncherApplication) mContext) - .getStkAppName(); - } - return entry; } |