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

Merge "Fix the regression of PiP position in fixed rotation" into tm-qpr-dev

Browse Source
This commit is contained in:
Mateusz Cicheński
2022-11-30 22:03:41 +00:00
committed by Android (Google) Code Review
parent 4bd41537f3 8d917f9e7e
commit d7f99f6c63
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -612,12 +612,21 @@ public class PipController implements PipTransitionController.PipTransitionCallb
new DisplayInsetsController.OnInsetsChangedListener() { new DisplayInsetsController.OnInsetsChangedListener() {
@Override @Override
public void insetsChanged(InsetsState insetsState) { public void insetsChanged(InsetsState insetsState) {
DisplayLayout pendingLayout =
mDisplayController.getDisplayLayout(mPipBoundsState.getDisplayId());
if (mIsInFixedRotation
|| pendingLayout.rotation()
!= mPipBoundsState.getDisplayLayout().rotation()) {
// bail out if there is a pending rotation or fixed rotation change
return;
}
int oldMaxMovementBound = mPipBoundsState.getMovementBounds().bottom; int oldMaxMovementBound = mPipBoundsState.getMovementBounds().bottom;
onDisplayChanged( onDisplayChanged(
mDisplayController.getDisplayLayout(mPipBoundsState.getDisplayId()), mDisplayController.getDisplayLayout(mPipBoundsState.getDisplayId()),
false /* saveRestoreSnapFraction */); false /* saveRestoreSnapFraction */);
int newMaxMovementBound = mPipBoundsState.getMovementBounds().bottom; int newMaxMovementBound = mPipBoundsState.getMovementBounds().bottom;
if (!mEnablePipKeepClearAlgorithm) { if (!mEnablePipKeepClearAlgorithm) {
// offset PiP to adjust for bottom inset change
int pipTop = mPipBoundsState.getBounds().top; int pipTop = mPipBoundsState.getBounds().top;
int diff = newMaxMovementBound - oldMaxMovementBound; int diff = newMaxMovementBound - oldMaxMovementBound;
if (diff < 0 && pipTop > newMaxMovementBound) { if (diff < 0 && pipTop > newMaxMovementBound) {