diff options
| author | nebkat <nebkat@teamhacksung.org> | 2012-12-23 11:57:11 +0000 |
|---|---|---|
| committer | nebkat <nebkat@teamhacksung.org> | 2012-12-23 12:16:02 +0000 |
| commit | 10a908a32cab20d5fc0ee944a3b34b98a9648f68 (patch) | |
| tree | e0780a7b9dc7ed2dc36719ff538955fb1c0c4b48 /src/com/cyanogenmod/trebuchet/LauncherModel.java | |
| parent | a8d6d217e05240f4108227c0f19f3a9bfd1fc73a (diff) | |
| download | android_packages_apps_Trebuchet-10a908a32cab20d5fc0ee944a3b34b98a9648f68.tar.gz android_packages_apps_Trebuchet-10a908a32cab20d5fc0ee944a3b34b98a9648f68.tar.bz2 android_packages_apps_Trebuchet-10a908a32cab20d5fc0ee944a3b34b98a9648f68.zip | |
Workspace: Shortcut renaming
Change-Id: I67e7441b3d6ba4eba70936c2fbdc9d854b706948
Diffstat (limited to 'src/com/cyanogenmod/trebuchet/LauncherModel.java')
| -rw-r--r-- | src/com/cyanogenmod/trebuchet/LauncherModel.java | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/com/cyanogenmod/trebuchet/LauncherModel.java b/src/com/cyanogenmod/trebuchet/LauncherModel.java index 39281d5e7..8fd446c9e 100644 --- a/src/com/cyanogenmod/trebuchet/LauncherModel.java +++ b/src/com/cyanogenmod/trebuchet/LauncherModel.java @@ -2153,8 +2153,14 @@ public class LauncherModel extends BroadcastReceiver { } info.setIcon(icon); + // from the db + if (info.title == null) { + if (c != null) { + info.title = c.getString(titleIndex); + } + } // from the resource - if (resolveInfo != null) { + if (info.title == null && resolveInfo != null) { ComponentName key = LauncherModel.getComponentNameFromResolveInfo(resolveInfo); if (labelCache != null && labelCache.containsKey(key)) { info.title = labelCache.get(key); @@ -2165,12 +2171,6 @@ public class LauncherModel extends BroadcastReceiver { } } } - // from the db - if (info.title == null) { - if (c != null) { - info.title = c.getString(titleIndex); - } - } // fall back to the class name of the activity if (info.title == null) { info.title = componentName.getClassName(); |