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

Commit 80df9bce authored by Ikram Gabiyev's avatar Ikram Gabiyev Committed by Automerger Merge Worker
Browse files

Merge "Make sure saveReentryState works." into udc-dev am: ad43ac1e 

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



Change-Id: Ifebb3a13bf1505b0a8f57fbe03b9272bcfeb3585
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 44cb4a3e ad43ac1e

libs/WindowManager/Shell/src/com/android/wm/shell/pip/phone/PipController.java

+14 −5
Original line number Diff line number Diff line
@@ -1060,13 +1060,22 @@ public class PipController implements PipTransitionController.PipTransitionCallb 
    /** Save the state to restore to on re-entry. */

    public void saveReentryState(Rect pipBounds) {

        float snapFraction = mPipBoundsAlgorithm.getSnapFraction(pipBounds);

        if (mPipBoundsState.hasUserResizedPip()) {

            final Rect reentryBounds = mTouchHandler.getUserResizeBounds();

            final Size reentrySize = new Size(reentryBounds.width(), reentryBounds.height());

            mPipBoundsState.saveReentryState(reentrySize, snapFraction);

        } else {



        if (!mPipBoundsState.hasUserResizedPip()) {

            mPipBoundsState.saveReentryState(null /* bounds */, snapFraction);

            return;

        }



        Size reentrySize = new Size(pipBounds.width(), pipBounds.height());



        // TODO: b/279937014 Investigate why userResizeBounds are empty with shell transitions on

        // fallback to using the userResizeBounds if userResizeBounds are not empty

        if (!mTouchHandler.getUserResizeBounds().isEmpty()) {

            Rect userResizeBounds = mTouchHandler.getUserResizeBounds();

            reentrySize = new Size(userResizeBounds.width(), userResizeBounds.height());

        }



        mPipBoundsState.saveReentryState(reentrySize, snapFraction);

    }



    @Override

libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/pip/phone/PipControllerTest.java

+14 −1
Original line number Diff line number Diff line
@@ -268,7 +268,7 @@ public class PipControllerTest extends ShellTestCase { 
    }



    @Test

    public void saveReentryState_userHasResized_savesSize() {

    public void saveReentryState_nonEmptyUserResizeBounds_savesSize() {

        final Rect bounds = new Rect(0, 0, 10, 10);

        final Rect resizedBounds = new Rect(0, 0, 30, 30);

        when(mMockPipBoundsAlgorithm.getSnapFraction(bounds)).thenReturn(1.0f);
@@ -280,6 +280,19 @@ public class PipControllerTest extends ShellTestCase { 
        verify(mMockPipBoundsState).saveReentryState(new Size(30, 30), 1.0f);

    }



    @Test

    public void saveReentryState_emptyUserResizeBounds_savesSize() {

        final Rect bounds = new Rect(0, 0, 10, 10);

        final Rect resizedBounds = new Rect(0, 0, 0, 0);

        when(mMockPipBoundsAlgorithm.getSnapFraction(bounds)).thenReturn(1.0f);

        when(mMockPipTouchHandler.getUserResizeBounds()).thenReturn(resizedBounds);

        when(mMockPipBoundsState.hasUserResizedPip()).thenReturn(true);



        mPipController.saveReentryState(bounds);



        verify(mMockPipBoundsState).saveReentryState(new Size(10, 10), 1.0f);

    }



    @Test

    public void onDisplayConfigurationChanged_inPip_movePip() {

        final int displayId = 1;