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

Merge "PiP: Re-attach PiP menu when display changes." into tm-dev

Browse Source
This commit is contained in:
Ben Lin
2022-04-21 18:05:03 +00:00
committed by Android (Google) Code Review
parent 04b94c550d 7c64525d1c
commit ec56afe31b
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libs/WindowManager/Shell/src/com/android/wm/shell/pip/phone/PhonePipMenuController.java
View File

@@ -172,7 +172,7 @@ public class PhonePipMenuController implements PipMenuController {
detachPipMenuView(); detachPipMenuView();
} }
private void attachPipMenuView() { void attachPipMenuView() {
// In case detach was not called (e.g. PIP unexpectedly closed) // In case detach was not called (e.g. PIP unexpectedly closed)
if (mPipMenuView != null) { if (mPipMenuView != null) {
detachPipMenuView(); detachPipMenuView();

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

@@ -521,6 +521,7 @@ public class PipController implements PipTransitionController.PipTransitionCallb
}; };
if (mPipTaskOrganizer.isInPip() && saveRestoreSnapFraction) { if (mPipTaskOrganizer.isInPip() && saveRestoreSnapFraction) {
mMenuController.attachPipMenuView();
// Calculate the snap fraction of the current stack along the old movement bounds // Calculate the snap fraction of the current stack along the old movement bounds
final PipSnapAlgorithm pipSnapAlgorithm = mPipBoundsAlgorithm.getSnapAlgorithm(); final PipSnapAlgorithm pipSnapAlgorithm = mPipBoundsAlgorithm.getSnapAlgorithm();
final Rect postChangeStackBounds = new Rect(mPipBoundsState.getBounds()); final Rect postChangeStackBounds = new Rect(mPipBoundsState.getBounds());