Merge "Do not allow duplicate shortcuts when ALL_APPS is disabled." into jb-ub-now-kermit (20e45a8e) · Commits · e / os / android_packages_apps_Trebuchet

src/com/android/launcher3/DeleteDropTarget.java

+2 −13

Original line number	Diff line number	Diff line
		@@ -266,19 +266,8 @@ public class DeleteDropTarget extends ButtonDropTarget {
		private boolean isUninstallFromWorkspace(DragObject d) {
		if (AppsCustomizePagedView.DISABLE_ALL_APPS && isWorkspaceOrFolderApplication(d)) {
		ShortcutInfo shortcut = (ShortcutInfo) d.dragInfo;
		if (shortcut.intent != null && shortcut.intent.getComponent() != null) {
		Set<String> categories = shortcut.intent.getCategories();
		boolean includesLauncherCategory = false;
		if (categories != null) {
		for (String category : categories) {
		if (category.equals(Intent.CATEGORY_LAUNCHER)) {
		includesLauncherCategory = true;
		break;
		}
		}
		}
		return includesLauncherCategory;
		}
		// Only allow manifest shortcuts to initiate an un-install.
		return !InstallShortcutReceiver.isValidShortcutLaunchIntent(shortcut.intent);
		}
		return false;
		}

src/com/android/launcher3/InstallShortcutReceiver.java

+32 −0

Original line number	Diff line number	Diff line
		@@ -24,6 +24,7 @@ import android.content.pm.ActivityInfo;
		import android.content.pm.PackageManager;
		import android.graphics.Bitmap;
		import android.graphics.BitmapFactory;
		import android.text.TextUtils;
		import android.util.Base64;
		import android.util.Log;
		import android.widget.Toast;
		@@ -223,6 +224,7 @@ public class InstallShortcutReceiver extends BroadcastReceiver {
		if (intent == null) {
		return;
		}

		// This name is only used for comparisons and notifications, so fall back to activity name
		// if not supplied
		String name = ensureValidName(context, intent,
		@@ -269,6 +271,12 @@ public class InstallShortcutReceiver extends BroadcastReceiver {
		//final Intent data = pendingInfo.data;
		final Intent intent = pendingInfo.launchIntent;
		final String name = pendingInfo.name;

		if (AppsCustomizePagedView.DISABLE_ALL_APPS && !isValidShortcutLaunchIntent(intent)) {
		if (DBG) Log.d(TAG, "Ignoring shortcut with launchIntent:" + intent);
		continue;
		}

		final boolean exists = LauncherModel.shortcutExists(context, name, intent);
		//final boolean allowDuplicate = data.getBooleanExtra(Launcher.EXTRA_SHORTCUT_DUPLICATE, true);

		@@ -301,6 +309,30 @@ public class InstallShortcutReceiver extends BroadcastReceiver {
		}
		}

		/**
		* Returns true if the intent is a valid launch intent for a shortcut.
		* This is used to identify shortcuts which are different from the ones exposed by the
		* applications' manifest file.
		*
		* When DISABLE_ALL_APPS is true, shortcuts exposed via the app's manifest should never be
		* duplicated or removed(unless the app is un-installed).
		*
		* @param launchIntent The intent that will be launched when the shortcut is clicked.
		*/
		static boolean isValidShortcutLaunchIntent(Intent launchIntent) {
		if (launchIntent != null
		&& Intent.ACTION_MAIN.equals(launchIntent.getAction())
		&& launchIntent.getComponent() != null
		&& launchIntent.getCategories() != null
		&& launchIntent.getCategories().size() == 1
		&& launchIntent.hasCategory(Intent.CATEGORY_LAUNCHER)
		&& launchIntent.getExtras() == null
		&& TextUtils.isEmpty(launchIntent.getDataString())) {
		return false;
		}
		return true;
		}

		private static ShortcutInfo getShortcutInfo(Context context, Intent data,
		Intent launchIntent) {
		if (launchIntent.getAction() == null) {