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

Commit 20daf798 authored by Hongwei Wang's avatar Hongwei Wang Committed by Automerger Merge Worker
Browse files

Merge "Ensure PiP window visible after fold/unfold device" into tm-qpr-dev am:... 

Merge "Ensure PiP window visible after fold/unfold device" into tm-qpr-dev am: 1a51c351 am: 43dfd5a9

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



Change-Id: I95bb32ebc5ba4319a00e08eaccf598c2b15ef50a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 75d1f85b 43dfd5a9

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

+2 −1
Original line number Diff line number Diff line
@@ -636,7 +636,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
@@ -234,7 +234,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
@@ -250,7 +250,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