1 files changed, 12 insertions, 2 deletions
diff --git a/packages/SettingsLib/src/com/android/settingslib/cm/ShortcutPickHelper.java b/packages/SettingsLib/src/com/android/settingslib/cm/ShortcutPickHelper.java
index a18a7e9..8aa5671 100644
--- a/packages/SettingsLib/src/com/android/settingslib/cm/ShortcutPickHelper.java
+++ b/packages/SettingsLib/src/com/android/settingslib/cm/ShortcutPickHelper.java
@@ -83,6 +83,11 @@ public class ShortcutPickHelper {
     }
 
     public void pickShortcut(String[] names, ShortcutIconResource[] icons, int fragmentId) {
+        pickShortcut(names, icons, fragmentId, true);
+    }
+
+    public void pickShortcut(String[] names, ShortcutIconResource[] icons, int fragmentId,
+            boolean showActivityPicker) {
         Bundle bundle = new Bundle();
 
         ArrayList<String> shortcutNames = new ArrayList<String>();
@@ -92,7 +97,9 @@ public class ShortcutPickHelper {
             }
         }
         shortcutNames.add(mParent.getString(R.string.profile_applist_title));
-        shortcutNames.add(mParent.getString(R.string.picker_activities));
+        if (showActivityPicker) {
+            shortcutNames.add(mParent.getString(R.string.picker_activities));
+        }
         bundle.putStringArrayList(Intent.EXTRA_SHORTCUT_NAME, shortcutNames);
 
         ArrayList<ShortcutIconResource> shortcutIcons = new ArrayList<ShortcutIconResource>();
@@ -102,7 +109,10 @@ public class ShortcutPickHelper {
             }
         }
         shortcutIcons.add(ShortcutIconResource.fromContext(mParent, android.R.drawable.sym_def_app_icon));
-        shortcutIcons.add(ShortcutIconResource.fromContext(mParent, R.drawable.activities_icon));
+        if (showActivityPicker) {
+            shortcutIcons.add(
+                    ShortcutIconResource.fromContext(mParent, R.drawable.activities_icon));
+        }
         bundle.putParcelableArrayList(Intent.EXTRA_SHORTCUT_ICON_RESOURCE, shortcutIcons);
 
         Intent pickIntent = new Intent(Intent.ACTION_PICK_ACTIVITY);