PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 0d166d87: am 1fa05179: Merge "Ensuring that we have a valid name for installed shortcuts. (Bug 11266005)" into jb-ub-now-jetsonic

Browse Source 
* commit '0d166d8771413866d48aaf7e3b9baf8da3315f0c':
  Ensuring that we have a valid name for installed shortcuts. (Bug 11266005)
This commit is contained in:
Winson Chung
2014-02-14 20:37:07 +00:00
committed by Android Git Automerger
parent 5cafbe930e 0d166d8771
commit c688ddbd94
1 changed files with 22 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/android/launcher3/InstallShortcutReceiver.java
+22 -11
View File
@@ -223,16 +223,8 @@ public class InstallShortcutReceiver extends BroadcastReceiver {
} }
// This name is only used for comparisons and notifications, so fall back to activity name // This name is only used for comparisons and notifications, so fall back to activity name
// if not supplied // if not supplied
String name = data.getStringExtra(Intent.EXTRA_SHORTCUT_NAME); String name = ensureValidName(context, intent,
if (name == null) { data.getStringExtra(Intent.EXTRA_SHORTCUT_NAME)).toString();
try {
PackageManager pm = context.getPackageManager();
ActivityInfo info = pm.getActivityInfo(intent.getComponent(), 0);
name = info.loadLabel(pm).toString();
} catch (PackageManager.NameNotFoundException nnfe) {
return;
}
}
Bitmap icon = data.getParcelableExtra(Intent.EXTRA_SHORTCUT_ICON); Bitmap icon = data.getParcelableExtra(Intent.EXTRA_SHORTCUT_ICON);
Intent.ShortcutIconResource iconResource = Intent.ShortcutIconResource iconResource =
data.getParcelableExtra(Intent.EXTRA_SHORTCUT_ICON_RESOURCE); data.getParcelableExtra(Intent.EXTRA_SHORTCUT_ICON_RESOURCE);
@@ -318,6 +310,25 @@ public class InstallShortcutReceiver extends BroadcastReceiver {
Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_RESET_TASK_IF_NEEDED); Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_RESET_TASK_IF_NEEDED);
} }
LauncherAppState app = LauncherAppState.getInstance(); 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;
} }
} }