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

Commit 7b3ff2c8 authored by Nick Chameyev's avatar Nick Chameyev Committed by Automerger Merge Worker
Browse files

Merge "Finish unfold Shell transition on fold" into 24D1-dev am: 47ad7f75 

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



Change-Id: Iae75f86891012d5a230ba8104e910fa93606783e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 21f8ea37 47ad7f75

libs/WindowManager/Shell/src/com/android/wm/shell/unfold/UnfoldTransitionHandler.java

+6 −0
Original line number Diff line number Diff line
@@ -293,7 +293,13 @@ public class UnfoldTransitionHandler implements TransitionHandler, UnfoldListene 
    @Override

    public void onFoldStateChanged(boolean isFolded) {

        if (isFolded) {

            // Reset unfold animation finished flag on folding, so it could be used next time

            // when we unfold the device as an indication that animation hasn't finished yet

            mAnimationFinished = false;



            // If we are currently animating unfold animation we should finish it because

            // the animation might not start and finish as the device was folded

            finishTransitionIfNeeded();

        }

    }

libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/unfold/UnfoldTransitionHandlerTest.java

+26 −0
Original line number Diff line number Diff line
@@ -297,6 +297,32 @@ public class UnfoldTransitionHandlerTest { 
        verify(finishCallback).onTransitionFinished(any());

    }



    @Test

    public void fold_animationInProgress_finishesTransition() {

        TransitionRequestInfo requestInfo = createUnfoldTransitionRequestInfo();

        TransitionFinishCallback finishCallback = mock(TransitionFinishCallback.class);



        // Unfold

        mShellUnfoldProgressProvider.onFoldStateChanged(/* isFolded= */ false);

        mUnfoldTransitionHandler.handleRequest(mTransition, requestInfo);

        mUnfoldTransitionHandler.startAnimation(

                mTransition,

                mock(TransitionInfo.class),

                mock(SurfaceControl.Transaction.class),

                mock(SurfaceControl.Transaction.class),

                finishCallback

        );



        // Start animation but don't finish it

        mShellUnfoldProgressProvider.onStateChangeStarted();

        mShellUnfoldProgressProvider.onStateChangeProgress(0.5f);



        // Fold

        mShellUnfoldProgressProvider.onFoldStateChanged(/* isFolded= */ true);



        verify(finishCallback).onTransitionFinished(any());

    }



    @Test

    public void mergeAnimation_eatsDisplayOnlyTransitions() {

        TransitionRequestInfo requestInfo = createUnfoldTransitionRequestInfo();