Merge "Adding quiet mode support for shortcuts" into ub-launcher3-calgary

2 files changed, 18 insertions, 4 deletions

diff --git a/src/com/android/launcher3/shortcuts/DeepShortcutManager.java b/src/com/android/launcher3/shortcuts/DeepShortcutManager.java
index 450c36df4..36bb2b5df 100644
--- a/src/com/android/launcher3/shortcuts/DeepShortcutManager.java
+++ b/src/com/android/launcher3/shortcuts/DeepShortcutManager.java
@@ -98,7 +98,7 @@ public class DeepShortcutManager {
     public void unpinShortcut(final ShortcutKey key) {
         if (Utilities.isNycMR1OrAbove()) {
             String packageName = key.componentName.getPackageName();
-            String id = key.id;
+            String id = key.getId();
             UserHandleCompat user = key.user;
             List<String> pinnedIds = extractIds(queryForPinnedShortcuts(packageName, user));
             pinnedIds.remove(id);
@@ -120,7 +120,7 @@ public class DeepShortcutManager {
     public void pinShortcut(final ShortcutKey key) {
         if (Utilities.isNycMR1OrAbove()) {
             String packageName = key.componentName.getPackageName();
-            String id = key.id;
+            String id = key.getId();
             UserHandleCompat user = key.user;
             List<String> pinnedIds = extractIds(queryForPinnedShortcuts(packageName, user));
             pinnedIds.add(id);
diff --git a/src/com/android/launcher3/shortcuts/ShortcutKey.java b/src/com/android/launcher3/shortcuts/ShortcutKey.java
index c15f91dd3..405303042 100644
--- a/src/com/android/launcher3/shortcuts/ShortcutKey.java
+++ b/src/com/android/launcher3/shortcuts/ShortcutKey.java
@@ -1,7 +1,9 @@
 package com.android.launcher3.shortcuts;
 
 import android.content.ComponentName;
+import android.content.Intent;
 
+import com.android.launcher3.ItemInfo;
 import com.android.launcher3.compat.UserHandleCompat;
 import com.android.launcher3.util.ComponentKey;
 
@@ -9,16 +11,28 @@ import com.android.launcher3.util.ComponentKey;
  * A key that uniquely identifies a shortcut using its package, id, and user handle.
  */
 public class ShortcutKey extends ComponentKey {
-    final String id;
 
     public ShortcutKey(String packageName, UserHandleCompat user, String id) {
         // Use the id as the class name.
         super(new ComponentName(packageName, id), user);
-        this.id = id;
+    }
+
+    public String getId() {
+        return componentName.getClassName();
     }
 
     public static ShortcutKey fromInfo(ShortcutInfoCompat shortcutInfo) {
         return new ShortcutKey(shortcutInfo.getPackage(), shortcutInfo.getUserHandle(),
                 shortcutInfo.getId());
     }
+
+    public static ShortcutKey fromIntent(Intent intent, UserHandleCompat user) {
+        String shortcutId = intent.getStringExtra(
+                ShortcutInfoCompat.EXTRA_SHORTCUT_ID);
+        return new ShortcutKey(intent.getPackage(), user, shortcutId);
+    }
+
+    public static ShortcutKey fromItemInfo(ItemInfo info) {
+        return fromIntent(info.getIntent(), info.user);
+    }
 }