Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 40851b63 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

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

parents eafe9291 ec383dfc

src/com/android/launcher3/shortcuts/DeepShortcutsContainer.java

+1 −3
Original line number Diff line number Diff line
@@ -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();