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

Commit 96f7256e authored by Jorge Gil's avatar Jorge Gil Committed by Automerger Merge Worker
Browse files

Merge "Change surface crop/visibilty on to-fullscreen animations" into udc-dev am: e6f3feea 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22776710



Change-Id: I393ffdfe00456bb2811ecbf67113db1b16358cb5
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 047631b8 e6f3feea

libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/EnterDesktopTaskTransitionHandler.java

+9 −6
Original line number Diff line number Diff line
@@ -193,8 +193,11 @@ public class EnterDesktopTaskTransitionHandler implements Transitions.Transition 
            // This Transition animates a task to fullscreen after being dragged from the status

            // bar and then released back into the status bar area

            final SurfaceControl sc = change.getLeash();

            startT.setWindowCrop(sc, null);

            startT.apply();

            // Hide the first (fullscreen) frame because the animation will start from the smaller

            // scale size.

            startT.hide(sc)

                    .setWindowCrop(sc, endBounds.width(), endBounds.height())

                    .apply();



            final ValueAnimator animator = new ValueAnimator();

            animator.setFloatValues(DRAG_FREEFORM_SCALE, 1f);
@@ -202,10 +205,10 @@ public class EnterDesktopTaskTransitionHandler implements Transitions.Transition 
            final SurfaceControl.Transaction t = mTransactionSupplier.get();

            animator.addUpdateListener(animation -> {

                final float scale = animation.getAnimatedFraction();

                t.setPosition(sc, mStartPosition.x * (1 - scale),

                        mStartPosition.y * (1 - scale));

                t.setScale(sc, scale, scale);

                t.apply();

                t.setPosition(sc, mStartPosition.x * (1 - scale), mStartPosition.y * (1 - scale))

                        .setScale(sc, scale, scale)

                        .show(sc)

                        .apply();

            });

            animator.addListener(new AnimatorListenerAdapter() {

                @Override

libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/ExitDesktopTaskTransitionHandler.java

+10 −5
Original line number Diff line number Diff line
@@ -129,8 +129,12 @@ public class ExitDesktopTaskTransitionHandler implements Transitions.TransitionH 
            final int screenWidth = metrics.widthPixels;

            final int screenHeight = metrics.heightPixels;

            final SurfaceControl sc = change.getLeash();

            startT.setCrop(sc, null);

            startT.apply();

            final Rect endBounds = change.getEndAbsBounds();

            // Hide the first (fullscreen) frame because the animation will start from the freeform

            // size.

            startT.hide(sc)

                    .setWindowCrop(sc, endBounds.width(), endBounds.height())

                    .apply();

            final ValueAnimator animator = new ValueAnimator();

            animator.setFloatValues(0f, 1f);

            animator.setDuration(FULLSCREEN_ANIMATION_DURATION);
@@ -144,9 +148,10 @@ public class ExitDesktopTaskTransitionHandler implements Transitions.TransitionH 
                float fraction = animation.getAnimatedFraction();

                float currentScaleX = scaleX + ((1 - scaleX) * fraction);

                float currentScaleY = scaleY + ((1 - scaleY) * fraction);

                t.setPosition(sc, startPos.x * (1 - fraction), startPos.y * (1 - fraction));

                t.setScale(sc, currentScaleX, currentScaleY);

                t.apply();

                t.setPosition(sc, startPos.x * (1 - fraction), startPos.y * (1 - fraction))

                        .setScale(sc, currentScaleX, currentScaleY)

                        .show(sc)

                        .apply();

            });

            animator.addListener(new AnimatorListenerAdapter() {

                @Override

libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/desktopmode/ExitDesktopTaskTransitionHandlerTest.java

+4 −8
Original line number Diff line number Diff line
@@ -71,12 +71,6 @@ public class ExitDesktopTaskTransitionHandlerTest extends ShellTestCase { 
    @Mock

    Resources mResources;

    @Mock

    SurfaceControl.Transaction mStartT;

    @Mock

    SurfaceControl.Transaction mFinishT;

    @Mock

    SurfaceControl.Transaction mAnimationT;

    @Mock

    Transitions.TransitionFinishCallback mTransitionFinishCallback;

    @Mock

    ShellExecutor mExecutor;
@@ -88,7 +82,7 @@ public class ExitDesktopTaskTransitionHandlerTest extends ShellTestCase { 
        MockitoAnnotations.initMocks(this);



        doReturn(mExecutor).when(mTransitions).getMainExecutor();

        doReturn(mAnimationT).when(mTransactionFactory).get();

        doReturn(new SurfaceControl.Transaction()).when(mTransactionFactory).get();

        doReturn(mResources).when(mContext).getResources();

        doReturn(mDisplayMetrics).when(mResources).getDisplayMetrics();

        when(mResources.getDisplayMetrics())
@@ -115,7 +109,9 @@ public class ExitDesktopTaskTransitionHandlerTest extends ShellTestCase { 
        runOnUiThread(() -> {

            try {

                assertTrue(mExitDesktopTaskTransitionHandler

                        .startAnimation(mToken, info, mStartT, mFinishT,

                        .startAnimation(mToken, info,

                                new SurfaceControl.Transaction(),

                                new SurfaceControl.Transaction(),

                                mTransitionFinishCallback));

            } catch (Exception e) {

                exceptions.add(e);