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

2016-09-09 00:02:39 +00:00
parent eafe9291c5 ec383dfc63
commit 40851b637e
1 changed files with 1 additions and 3 deletions
@@ -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();