commit 01486a1e657b526bc115e1d8f4c9e77700b3e558
author Tony Wickham <twickham@google.com> Fri Sep 09 00:07:47 2016 +0000
committer android-build-merger <android-build-merger@google.com> Fri Sep 09 00:07:47 2016 +0000
tree 09d88555233f6f825bed6c8e2f5883782eae81ce
parent 931f305a77203c0f94208f978ff7d671047c06ff
parent ec383dfc63a3b2b83185245b3a4ac22eecf38cf6

Fix deferred shortcut container removal.
am: ec383dfc63

Change-Id: I3a2d582f3834f9034e46eebd67815fa890b520b0

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