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

Commit 0486d63b authored by Ikram Gabiyev's avatar Ikram Gabiyev Committed by Android (Google) Code Review
Browse files

Merge "Allow direct CHANGED_PIP_BOUNDS advancement" into main

parents 96884eb7 3e8cca45

libs/WindowManager/Shell/src/com/android/wm/shell/pip2/phone/PipTransitionState.java

+0 −2
Original line number Diff line number Diff line
@@ -483,8 +483,6 @@ public class PipTransitionState { 
                return isPipStateIdle() && !mPipDesktopState.isDragToDesktopInProgress();

            case CHANGING_PIP_BOUNDS:

                return mState == SCHEDULED_BOUNDS_CHANGE;

            case CHANGED_PIP_BOUNDS:

                return mState == CHANGING_PIP_BOUNDS;

            default:

                return true;

        }

libs/WindowManager/Shell/src/com/android/wm/shell/pip2/phone/transition/PipDisplayChangeObserver.java

+0 −1
Original line number Diff line number Diff line
@@ -98,7 +98,6 @@ public class PipDisplayChangeObserver implements Transitions.TransitionObserver 
        // transition can never start playing while another PiP transition is already playing.

        // This should help us block any interactions with PiP during this period.

        mPipTransitionState.setState(PipTransitionState.SCHEDULED_BOUNDS_CHANGE, extra);

        mPipTransitionState.setState(PipTransitionState.CHANGING_PIP_BOUNDS, extra);

    }



    private void onDisplayChangeFinished(@NonNull TransitionInfo info) {

libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/pip2/phone/transition/PipDisplayChangeObserverTest.java

+0 −1
Original line number Diff line number Diff line
@@ -117,7 +117,6 @@ public class PipDisplayChangeObserverTest { 
        verify(mMockPipTransitionState).setIsDisplayChangeScheduled(false);

        verify(mMockPipTransitionState).setState(

                eq(PipTransitionState.SCHEDULED_BOUNDS_CHANGE), any());

        verify(mMockPipTransitionState).setState(eq(PipTransitionState.CHANGING_PIP_BOUNDS), any());



        assertNotNull("Transition should remain cached during animation",

                mPipDisplayChangeObserver.getDisplayChangeTransitions().get(transition));