commit 40851b637ea8e460953c7f2ea448357a86456cb4
author TreeHugger Robot <treehugger-gerrit@google.com> Fri Sep 09 00:02:39 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Sep 09 00:02:39 2016 +0000
tree 5e7d15bb03e31c31b6387fc386049d0bfff44997
parent eafe9291c50cdb1568ea7a3bfb1f9e774c30434a
parent ec383dfc63a3b2b83185245b3a4ac22eecf38cf6

Merge "Fix deferred shortcut container removal." into ub-launcher3-calgary-polish

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 3c7ba32..cfa6efd 100644
--- a/src/com/android/launcher3/shortcuts/DeepShortcutsContainer.java
+++ b/src/com/android/launcher3/shortcuts/DeepShortcutsContainer.java
@@ -578,8 +578,7 @@
             } else {
                 // Close animation is not running.
                 if (mDeferContainerRemoval) {
-                    mDeferContainerRemoval = false;
-                    mLauncher.getDragLayer().removeView(this);
+                    close();
                 }
             }
         }
@@ -600,7 +599,6 @@
             mOpenCloseAnimator.cancel();
         }
         mIsOpen = false;
-        mLauncher.getDragController().removeDragListener(this);
 
         final AnimatorSet shortcutAnims = LauncherAnimUtils.createAnimatorSet();
         final int shortcutCount = getShortcutCount();