aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-02-20 11:18:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Ensuring that we have a valid name for installed shortcuts. (Bug 11266005)

Browse Source 
Change-Id: Idf723ba165522cf259d9fe71533e1d5765512865
This commit is contained in:
Winson Chung
2013-10-17 11:03:24 -07:00
parent 51b9f6a570
commit 2c1afde5cd
1 changed files with 22 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/com/android/launcher3/InstallShortcutReceiver.java
View File

@@ -209,16 +209,8 @@ public class InstallShortcutReceiver extends BroadcastReceiver {
}
// This name is only used for comparisons and notifications, so fall back to activity name
// if not supplied
String name = data.getStringExtra(Intent.EXTRA_SHORTCUT_NAME);
if (name == null) {
try {
PackageManager pm = context.getPackageManager();
ActivityInfo info = pm.getActivityInfo(intent.getComponent(), 0);
name = info.loadLabel(pm).toString();
} catch (PackageManager.NameNotFoundException nnfe) {
return;
}
}
String name = ensureValidName(context, intent,
data.getStringExtra(Intent.EXTRA_SHORTCUT_NAME)).toString();
Bitmap icon = data.getParcelableExtra(Intent.EXTRA_SHORTCUT_ICON);
Intent.ShortcutIconResource iconResource =
data.getParcelableExtra(Intent.EXTRA_SHORTCUT_ICON_RESOURCE);
@@ -304,6 +296,25 @@ public class InstallShortcutReceiver extends BroadcastReceiver {
Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_RESET_TASK_IF_NEEDED);
}
LauncherAppState app = LauncherAppState.getInstance();
return app.getModel().infoFromShortcutIntent(context, data, null);
ShortcutInfo info = app.getModel().infoFromShortcutIntent(context, data, null);
info.title = ensureValidName(context, launchIntent, info.title);
return info;
}
/**
* Ensures that we have a valid, non-null name. If the provided name is null, we will return
* the application name instead.
*/
private static CharSequence ensureValidName(Context context, Intent intent, CharSequence name) {
if (name == null) {
try {
PackageManager pm = context.getPackageManager();
ActivityInfo info = pm.getActivityInfo(intent.getComponent(), 0);
name = info.loadLabel(pm).toString();
} catch (PackageManager.NameNotFoundException nnfe) {
return "";
}
}
return name;
}
}