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
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();