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

This commit is contained in:
TreeHugger Robot authored and Android (Google) Code Review committed 2016-09-09 00:02:39 +00:00
commit 40851b637e
1 file changed
+1 -3
@@ -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();