commit d5f5433f55553b8a8c8ec491e83f1b9565144f85
author Tony Wickham <twickham@google.com> Fri Jul 29 01:33:48 2016 +0000
committer android-build-merger <android-build-merger@google.com> Fri Jul 29 01:33:48 2016 +0000
tree 27b8f191f973771c2a30f855f6c168bc1ec0b0ec
parent f8e1af6b0add2ba122c5185a1228b7c197b855e0
parent 8141d63ed1447afe500c1dffa4f38eba2acb3e6a

Prevent opening shortcuts container if one is already open.
am: 8141d63ed1

Change-Id: I0263738c17b069edc7295f67f1f5b00e1bfeae0d

src/com/android/launcher3/shortcuts/DeepShortcutsContainer.java

diff --git a/src/com/android/launcher3/shortcuts/DeepShortcutsContainer.java b/src/com/android/launcher3/shortcuts/DeepShortcutsContainer.java
index ba48f26..7aa2123 100644
--- a/src/com/android/launcher3/shortcuts/DeepShortcutsContainer.java
+++ b/src/com/android/launcher3/shortcuts/DeepShortcutsContainer.java
@@ -735,6 +735,11 @@
      */
     public static DeepShortcutsContainer showForIcon(BubbleTextView icon) {
         Launcher launcher = Launcher.getLauncher(icon.getContext());
+        if (launcher.getOpenShortcutsContainer() != null) {
+            // There is already a shortcuts container open, so don't open this one.
+            icon.clearFocus();
+            return null;
+        }
         List<String> ids = launcher.getShortcutIdsForItem((ItemInfo) icon.getTag());
         if (!ids.isEmpty()) {
             // There are shortcuts associated with the app, so defer its drag.