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

Commit 89976eca authored by Vinit Nayak's avatar Vinit Nayak Committed by Android (Google) Code Review
Browse files

Merge "Remove split instructions view on split launch success" into udc-qpr-dev

parents 2de68329 a1d0d826

quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java

+2 −0
Original line number Diff line number Diff line
@@ -664,6 +664,8 @@ public class QuickstepLauncher extends Launcher { 
            @Override

            public void onAnimationCancel(Animator animation) {

                getDragLayer().removeView(floatingTaskView);

                mSplitSelectStateController.getSplitAnimationController()

                        .removeSplitInstructionsView(QuickstepLauncher.this);

                mSplitSelectStateController.resetState();

            }

        });

quickstep/src/com/android/quickstep/util/SplitAnimationController.kt

+5 −0
Original line number Diff line number Diff line
@@ -265,6 +265,11 @@ class SplitAnimationController(val splitSelectStateController: SplitSelectStateC 
        return anim

    }



    /** Removes the split instructions view from [launcher] drag layer. */

    fun removeSplitInstructionsView(launcher: StatefulActivity<*>) {

        safeRemoveViewFromDragLayer(launcher, splitInstructionsView)

    }



    private fun safeRemoveViewFromDragLayer(launcher: StatefulActivity<*>, view: View?) {

        if (view != null) {

            launcher.dragLayer.removeView(view)

quickstep/src/com/android/quickstep/util/SplitToWorkspaceController.java

+1 −0
Original line number Diff line number Diff line
@@ -169,6 +169,7 @@ public class SplitToWorkspaceController { 
            private void cleanUp() {

                mLauncher.getDragLayer().removeView(firstFloatingTaskView);

                mLauncher.getDragLayer().removeView(secondFloatingTaskView);

                mController.getSplitAnimationController().removeSplitInstructionsView(mLauncher);

                mController.resetState();

            }

        });

quickstep/src/com/android/quickstep/views/RecentsView.java

+2 −0
Original line number Diff line number Diff line
@@ -4823,6 +4823,8 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T 
            mSecondFloatingTaskView = null;

            mSplitInstructionsView = null;

            mSplitSelectSource = null;

            mSplitSelectStateController.getSplitAnimationController()

                    .removeSplitInstructionsView(mActivity);

        }



        if (mSecondSplitHiddenView != null) {