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

Commit d0eea50a authored by Vinit Nayak's avatar Vinit Nayak
Browse files

Show divider when GroupedTaskView expanded from recents 

* Also increased animation duration to allow
apps to get ready

Fixes: 202928293
Change-Id: I8814ec2415e7985e4f433695f6cc55f83f0c0ac2
parent b35b56af

quickstep/src/com/android/launcher3/QuickstepTransitionManager.java

+1 −0
Original line number Diff line number Diff line
@@ -175,6 +175,7 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener 
    public static final int RECENTS_LAUNCH_DURATION = 336;

    private static final int LAUNCHER_RESUME_START_DELAY = 100;

    private static final int CLOSING_TRANSITION_DURATION_MS = 250;

    public static final int SPLIT_LAUNCH_DURATION = 370;



    public static final int CONTENT_ALPHA_DURATION = 217;

    protected static final int CONTENT_SCALE_DURATION = 350;

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

+3 −1
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ import static com.android.launcher3.QuickstepTransitionManager.ANIMATION_NAV_FAD 
import static com.android.launcher3.QuickstepTransitionManager.NAV_FADE_IN_INTERPOLATOR;

import static com.android.launcher3.QuickstepTransitionManager.NAV_FADE_OUT_INTERPOLATOR;

import static com.android.launcher3.QuickstepTransitionManager.RECENTS_LAUNCH_DURATION;

import static com.android.launcher3.QuickstepTransitionManager.SPLIT_LAUNCH_DURATION;

import static com.android.launcher3.Utilities.getDescendantCoordRelativeToAncestor;

import static com.android.launcher3.anim.Interpolators.LINEAR;

import static com.android.launcher3.anim.Interpolators.TOUCH_RESPONSE_INTERPOLATOR;
@@ -459,6 +460,7 @@ public final class TaskViewUtils { 


        final SurfaceControl.Transaction t = new SurfaceControl.Transaction();

        ValueAnimator animator = ValueAnimator.ofFloat(0f, 1f);

        animator.setDuration(SPLIT_LAUNCH_DURATION);

        animator.addUpdateListener(valueAnimator -> {

            float progress = valueAnimator.getAnimatedFraction();

            for (SurfaceControl leash: openingTargets) {
@@ -559,7 +561,7 @@ public final class TaskViewUtils { 
        anim.addListener(windowAnimEndListener);

    }



    static void setSplitAuxiliarySurfacesShown(RemoteAnimationTargetCompat[] nonApps,

    public static void setSplitAuxiliarySurfacesShown(RemoteAnimationTargetCompat[] nonApps,

            boolean shown) {

        // TODO(b/182592057): make this part of the animations instead.

        if (nonApps != null && nonApps.length > 0) {

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

+4 −0
Original line number Diff line number Diff line
@@ -4241,6 +4241,10 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T 
        }

        mPendingAnimation.addEndListener(isSuccess -> {

            if (isSuccess) {

                if (tv.getTaskIds()[1] != -1) {

                    TaskViewUtils.setSplitAuxiliarySurfacesShown(mRemoteTargetHandles[0]

                            .getTransformParams().getTargetSet().nonApps, true);

                }

                if (ENABLE_QUICKSTEP_LIVE_TILE.get() && tv.isRunningTask()) {

                    finishRecentsAnimation(false /* toRecents */, null);

                    onTaskLaunchAnimationEnd(true /* success */);