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

Merge "PiP: Use vertical/horizontal padding base on PiP orientation." into sc-dev

Browse Source
This commit is contained in:
Ben Lin
2021-05-17 17:59:39 +00:00
committed by Android (Google) Code Review
parent 750ddcc618 b0748625e6
commit 54441572a9
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -472,17 +472,20 @@ public class PipTouchHandler {
float aspectRatio) { float aspectRatio) {
final int shorterLength = Math.min(mPipBoundsState.getDisplayBounds().width(), final int shorterLength = Math.min(mPipBoundsState.getDisplayBounds().width(),
mPipBoundsState.getDisplayBounds().height()); mPipBoundsState.getDisplayBounds().height());
final int totalPadding = insetBounds.left * 2; final int totalHorizontalPadding = insetBounds.left
+ (mPipBoundsState.getDisplayBounds().width() - insetBounds.right);
final int totalVerticalPadding = insetBounds.top
+ (mPipBoundsState.getDisplayBounds().height() - insetBounds.bottom);
final int minWidth, minHeight, maxWidth, maxHeight; final int minWidth, minHeight, maxWidth, maxHeight;
if (aspectRatio > 1f) { if (aspectRatio > 1f) {
minWidth = (int) Math.min(normalBounds.width(), shorterLength * MINIMUM_SIZE_PERCENT); minWidth = (int) Math.min(normalBounds.width(), shorterLength * MINIMUM_SIZE_PERCENT);
minHeight = (int) (minWidth / aspectRatio); minHeight = (int) (minWidth / aspectRatio);
maxWidth = (int) Math.max(normalBounds.width(), shorterLength - totalPadding); maxWidth = (int) Math.max(normalBounds.width(), shorterLength - totalHorizontalPadding);
maxHeight = (int) (maxWidth / aspectRatio); maxHeight = (int) (maxWidth / aspectRatio);
} else { } else {
minHeight = (int) Math.min(normalBounds.height(), shorterLength * MINIMUM_SIZE_PERCENT); minHeight = (int) Math.min(normalBounds.height(), shorterLength * MINIMUM_SIZE_PERCENT);
minWidth = (int) (minHeight * aspectRatio); minWidth = (int) (minHeight * aspectRatio);
maxHeight = (int) Math.max(normalBounds.height(), shorterLength - totalPadding); maxHeight = (int) Math.max(normalBounds.height(), shorterLength - totalVerticalPadding);
maxWidth = (int) (maxHeight * aspectRatio); maxWidth = (int) (maxHeight * aspectRatio);
} }