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

Commit e164995f authored by Schneider Victor-tulias's avatar Schneider Victor-tulias
Browse files

Fix taskbar unstash animation delay when launching a split task. 

Fixes: 232033354
Test: switched between split and unsplit tasks using 3 button nav and gesture nav
Change-Id: I9a4e2eb08e9970540093e3dc60b64a372be2052f
parent 3bc7b93e

quickstep/src/com/android/launcher3/taskbar/TaskbarLauncherStateController.java

+3 −4
Original line number Diff line number Diff line
@@ -169,10 +169,8 @@ import java.util.function.Supplier; 


        mTaskBarRecentsAnimationListener = new TaskBarRecentsAnimationListener(callbacks);

        callbacks.addListener(mTaskBarRecentsAnimationListener);

        RecentsView recentsView = mLauncher.getOverviewPanel();

        recentsView.setTaskLaunchListener(() -> {

            mTaskBarRecentsAnimationListener.endGestureStateOverride(true);

        });

        ((RecentsView) mLauncher.getOverviewPanel()).setTaskLaunchListener(() ->

                mTaskBarRecentsAnimationListener.endGestureStateOverride(true));

        return animatorSet;

    }
@@ -459,6 +457,7 @@ import java.util.function.Supplier; 
        private void endGestureStateOverride(boolean finishedToApp) {

            mCallbacks.removeListener(this);

            mTaskBarRecentsAnimationListener = null;

            ((RecentsView) mLauncher.getOverviewPanel()).setTaskLaunchListener(null);



            // Update the resumed state immediately to ensure a seamless handoff

            boolean launcherResumed = !finishedToApp;

quickstep/src/com/android/quickstep/TaskViewUtils.java

+6 −5
Original line number Diff line number Diff line
@@ -468,7 +468,6 @@ public final class TaskViewUtils { 
            animatorSet.addListener(new AnimatorListenerAdapter() {

                @Override

                public void onAnimationEnd(Animator animation) {

                    super.onAnimationEnd(animation);

                    finishCallback.run();

                }

            });
@@ -530,7 +529,6 @@ public final class TaskViewUtils { 
                for (SurfaceControl leash: closingTargets) {

                    t.hide(leash);

                }

                super.onAnimationEnd(animation);

                finishCallback.run();

            }

        });
@@ -599,8 +597,13 @@ public final class TaskViewUtils { 
            launcherAnim.setInterpolator(Interpolators.TOUCH_RESPONSE_INTERPOLATOR);

            launcherAnim.setDuration(RECENTS_LAUNCH_DURATION);



            // Make sure recents gets fixed up by resetting task alphas and scales, etc.

            windowAnimEndListener = new AnimatorListenerAdapter() {

                @Override

                public void onAnimationStart(Animator animation) {

                    recentsView.onTaskLaunchedInLiveTileMode();

                }



                // Make sure recents gets fixed up by resetting task alphas and scales, etc.

                @Override

                public void onAnimationEnd(Animator animation) {

                    recentsView.finishRecentsAnimation(false /* toRecents */, () -> {
@@ -677,7 +680,6 @@ public final class TaskViewUtils { 
        dockFadeAnimator.addListener(new AnimatorListenerAdapter() {

            @Override

            public void onAnimationStart(Animator animation) {

                super.onAnimationStart(animation);

                if (shown) {

                    for (SurfaceControl leash : auxiliarySurfaces) {

                        t.setAlpha(leash, 0);
@@ -689,7 +691,6 @@ public final class TaskViewUtils { 


            @Override

            public void onAnimationEnd(Animator animation) {

                super.onAnimationEnd(animation);

                if (!shown) {

                    for (SurfaceControl leash : auxiliarySurfaces) {

                        t.hide(leash);