Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Hongwei Wang
2022-08-10 02:16:30 +00:00
committed by Android (Google) Code Review
parent 1de72890de 4f3138bea7
commit 1a51c35170
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -636,7 +636,8 @@ public class PipController implements PipTransitionController.PipTransitionCallb
mPipTaskOrganizer.scheduleAnimateResizePip( mPipTaskOrganizer.scheduleAnimateResizePip(
postChangeBounds, duration, null /* updateBoundsCallback */); postChangeBounds, duration, null /* updateBoundsCallback */);
} else { } else {
mTouchHandler.getMotionHelper().movePip(postChangeBounds); // Directly move PiP to its final destination bounds without animation.
mPipTaskOrganizer.scheduleFinishResizePip(postChangeBounds);
} }
} else { } else {
updateDisplayLayout.run(); updateDisplayLayout.run();

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

@@ -234,7 +234,7 @@ public class PipControllerTest extends ShellTestCase {
mPipController.mDisplaysChangedListener.onDisplayConfigurationChanged( mPipController.mDisplaysChangedListener.onDisplayConfigurationChanged(
displayId, new Configuration()); displayId, new Configuration());
verify(mMockPipMotionHelper).movePip(any(Rect.class)); verify(mMockPipTaskOrganizer).scheduleFinishResizePip(any(Rect.class));
} }
@Test @Test
@@ -250,7 +250,7 @@ public class PipControllerTest extends ShellTestCase {
mPipController.mDisplaysChangedListener.onDisplayConfigurationChanged( mPipController.mDisplaysChangedListener.onDisplayConfigurationChanged(
displayId, new Configuration()); displayId, new Configuration());
verify(mMockPipMotionHelper, never()).movePip(any(Rect.class)); verify(mMockPipTaskOrganizer, never()).scheduleFinishResizePip(any(Rect.class));
} }
@Test @Test