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

Merge "Default to true for new pip size spec flag" into tm-qpr-dev am: 54e56426bb

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

Change-Id: I4ce5edac4a57862972ed4290e46ae3d1f296e311
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Ikram Gabiyev
2023-03-22 17:44:59 +00:00
committed by Automerger Merge Worker
parent fc4b1e9d9e 54e56426bb
commit 0c3c1c5e9b
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
libs/WindowManager/Shell/src/com/android/wm/shell/pip/phone/PipSizeSpecHandler.java
View File

@@ -212,24 +212,25 @@ public class PipSizeSpecHandler {
*/ */
@Override @Override
public Size getSizeForAspectRatio(Size size, float aspectRatio) { public Size getSizeForAspectRatio(Size size, float aspectRatio) {
// getting the percentage of the max size that current size takes
float currAspectRatio = (float) size.getWidth() / size.getHeight(); float currAspectRatio = (float) size.getWidth() / size.getHeight();
// getting the percentage of the max size that current size takes
Size currentMaxSize = getMaxSize(currAspectRatio); Size currentMaxSize = getMaxSize(currAspectRatio);
float currentPercent = (float) size.getWidth() / currentMaxSize.getWidth(); float currentPercent = (float) size.getWidth() / currentMaxSize.getWidth();
// getting the max size for the target aspect ratio // getting the max size for the target aspect ratio
Size updatedMaxSize = getMaxSize(aspectRatio); Size updatedMaxSize = getMaxSize(aspectRatio);
int width = (int) (updatedMaxSize.getWidth() * currentPercent); int width = Math.round(updatedMaxSize.getWidth() * currentPercent);
int height = (int) (updatedMaxSize.getHeight() * currentPercent); int height = Math.round(updatedMaxSize.getHeight() * currentPercent);
// adjust the dimensions if below allowed min edge size // adjust the dimensions if below allowed min edge size
if (width < getMinEdgeSize() && aspectRatio <= 1) { if (width < getMinEdgeSize() && aspectRatio <= 1) {
width = getMinEdgeSize(); width = getMinEdgeSize();
height = (int) (width / aspectRatio); height = Math.round(width / aspectRatio);
} else if (height < getMinEdgeSize() && aspectRatio > 1) { } else if (height < getMinEdgeSize() && aspectRatio > 1) {
height = getMinEdgeSize(); height = getMinEdgeSize();
width = (int) (height * aspectRatio); width = Math.round(height * aspectRatio);
} }
// reduce the dimensions of the updated size to the calculated percentage // reduce the dimensions of the updated size to the calculated percentage
@@ -365,7 +366,7 @@ public class PipSizeSpecHandler {
mContext = context; mContext = context;
boolean enablePipSizeLargeScreen = SystemProperties boolean enablePipSizeLargeScreen = SystemProperties
.getBoolean("persist.wm.debug.enable_pip_size_large_screen", false); .getBoolean("persist.wm.debug.enable_pip_size_large_screen", true);
// choose between two implementations of size spec logic // choose between two implementations of size spec logic
if (enablePipSizeLargeScreen) { if (enablePipSizeLargeScreen) {