diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2016-09-09 00:02:39 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-09-09 00:02:39 +0000 |
| commit | 40851b637ea8e460953c7f2ea448357a86456cb4 (patch) | |
| tree | 5e7d15bb03e31c31b6387fc386049d0bfff44997 | |
| parent | eafe9291c50cdb1568ea7a3bfb1f9e774c30434a (diff) | |
| parent | ec383dfc63a3b2b83185245b3a4ac22eecf38cf6 (diff) | |
| download | android_packages_apps_Trebuchet-40851b637ea8e460953c7f2ea448357a86456cb4.tar.gz android_packages_apps_Trebuchet-40851b637ea8e460953c7f2ea448357a86456cb4.tar.bz2 android_packages_apps_Trebuchet-40851b637ea8e460953c7f2ea448357a86456cb4.zip | |
Merge "Fix deferred shortcut container removal." into ub-launcher3-calgary-polish
| -rw-r--r-- | src/com/android/launcher3/shortcuts/DeepShortcutsContainer.java | 4 |
1 files changed, 1 insertions, 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(); |