From ec383dfc63a3b2b83185245b3a4ac22eecf38cf6 Mon Sep 17 00:00:00 2001
From: Tony Wickham <twickham@google.com>
Date: Thu, 8 Sep 2016 13:58:35 -0700
Subject: Fix deferred shortcut container removal.

- Previously, the drag listener listener was removed from the
  container as soon as it started animating closed, which got
  rid of its opportunity to complete the deferred removal.
- The deferred removal now calls close(), which does further
  cleanup including updating the app icon's text visibility.

Bug: 31248681
Change-Id: I18e545e7e19e50b7d47e23a5beb8f254ba1a4ccf
---
 src/com/android/launcher3/shortcuts/DeepShortcutsContainer.java | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/com/android/launcher3/shortcuts/DeepShortcutsContainer.java b/src/com/android/launcher3/shortcuts/DeepShortcutsContainer.java
index 3c7ba327b..cfa6efd51 100644
--- a/src/com/android/launcher3/shortcuts/DeepShortcutsContainer.java
+++ b/src/com/android/launcher3/shortcuts/DeepShortcutsContainer.java
@@ -578,8 +578,7 @@ public class DeepShortcutsContainer extends LinearLayout implements View.OnLongC
             } else {
                 // Close animation is not running.
                 if (mDeferContainerRemoval) {
-                    mDeferContainerRemoval = false;
-                    mLauncher.getDragLayer().removeView(this);
+                    close();
                 }
             }
         }
@@ -600,7 +599,6 @@ public class DeepShortcutsContainer extends LinearLayout implements View.OnLongC
             mOpenCloseAnimator.cancel();
         }
         mIsOpen = false;
-        mLauncher.getDragController().removeDragListener(this);
 
         final AnimatorSet shortcutAnims = LauncherAnimUtils.createAnimatorSet();
         final int shortcutCount = getShortcutCount();
-- 
cgit v1.2.3