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

Commit 4f3138be authored by Hongwei Wang's avatar Hongwei Wang
Browse files

Ensure PiP window visible after fold/unfold device 

We used to do only PipTaskOrganizer#scheduleResizePip without commiting
PipTaskOrganizer#scheduleFinishResizePip upon display change.

Bug: 241961056
Test: Enter PiP in unfolded state then fold the device
Test: atest WMShellUnitTests:PipControllerTest
Change-Id: I1c72c5e6016cd19017b43a8df583e730f15619a1
parent 6bd105d5

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

+2 −1
Original line number Diff line number Diff line
@@ -628,7 +628,8 @@ public class PipController implements PipTransitionController.PipTransitionCallb 
                mPipTaskOrganizer.scheduleAnimateResizePip(

                        postChangeBounds, duration, null /* updateBoundsCallback */);

            } else {

                mTouchHandler.getMotionHelper().movePip(postChangeBounds);

                // Directly move PiP to its final destination bounds without animation.

                mPipTaskOrganizer.scheduleFinishResizePip(postChangeBounds);

            }

        } else {

            updateDisplayLayout.run();

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

+2 −2
Original line number Diff line number Diff line
@@ -217,7 +217,7 @@ public class PipControllerTest extends ShellTestCase { 
        mPipController.mDisplaysChangedListener.onDisplayConfigurationChanged(

                displayId, new Configuration());



        verify(mMockPipMotionHelper).movePip(any(Rect.class));

        verify(mMockPipTaskOrganizer).scheduleFinishResizePip(any(Rect.class));

    }



    @Test
@@ -233,7 +233,7 @@ public class PipControllerTest extends ShellTestCase { 
        mPipController.mDisplaysChangedListener.onDisplayConfigurationChanged(

                displayId, new Configuration());



        verify(mMockPipMotionHelper, never()).movePip(any(Rect.class));

        verify(mMockPipTaskOrganizer, never()).scheduleFinishResizePip(any(Rect.class));

    }



    @Test