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

Commit ec383dfc authored by Tony Wickham's avatar Tony Wickham
Browse files

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
parent 285c76dd

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