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

Merge "Prevent top app thumbnail cropping by taskbar in split overview." into tm-qpr-dev

Browse Source
This commit is contained in:
Pat Manning
2022-12-13 18:29:26 +00:00
committed by Android (Google) Code Review
parent 8d6cb6583f ca60c81f91
commit 04cd657102
1 changed files with 7 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
packages/SystemUI/shared/src/com/android/systemui/shared/recents/utilities/PreviewPositionHelper.java
View File

@@ -39,7 +39,6 @@ public class PreviewPositionHelper {
private boolean mIsOrientationChanged; private boolean mIsOrientationChanged;
private SplitBounds mSplitBounds; private SplitBounds mSplitBounds;
private int mDesiredStagePosition; private int mDesiredStagePosition;
private boolean mTaskbarInApp;
public Matrix getMatrix() { public Matrix getMatrix() {
return mMatrix; return mMatrix;
@@ -58,10 +57,6 @@ public class PreviewPositionHelper {
mDesiredStagePosition = desiredStagePosition; mDesiredStagePosition = desiredStagePosition;
} }
public void setTaskbarInApp(boolean taskbarInApp) {
mTaskbarInApp = taskbarInApp;
}
/** /**
* Updates the matrix based on the provided parameters * Updates the matrix based on the provided parameters
*/ */
@@ -79,19 +74,7 @@ public class PreviewPositionHelper {
float scaledTaskbarSize; float scaledTaskbarSize;
float canvasScreenRatio; float canvasScreenRatio;
if (mSplitBounds != null) { if (mSplitBounds != null) {
float fullscreenTaskWidth;
float fullscreenTaskHeight;
float taskPercent;
if (mSplitBounds.appsStackedVertically) { if (mSplitBounds.appsStackedVertically) {
taskPercent = mDesiredStagePosition != STAGE_POSITION_TOP_OR_LEFT
? mSplitBounds.topTaskPercent
: (1 - (mSplitBounds.topTaskPercent + mSplitBounds.dividerHeightPercent));
// Scale portrait height to that of the actual screen
fullscreenTaskHeight = screenHeightPx * taskPercent;
if (mTaskbarInApp) {
canvasScreenRatio = canvasHeight / fullscreenTaskHeight;
} else {
if (mDesiredStagePosition == STAGE_POSITION_TOP_OR_LEFT) { if (mDesiredStagePosition == STAGE_POSITION_TOP_OR_LEFT) {
// Top app isn't cropped at all by taskbar // Top app isn't cropped at all by taskbar
canvasScreenRatio = 0; canvasScreenRatio = 0;
@@ -99,14 +82,13 @@ public class PreviewPositionHelper {
// Same as fullscreen ratio // Same as fullscreen ratio
canvasScreenRatio = (float) canvasWidth / screenWidthPx; canvasScreenRatio = (float) canvasWidth / screenWidthPx;
} }
}
} else { } else {
// For landscape, scale the width // For landscape, scale the width
taskPercent = mDesiredStagePosition == STAGE_POSITION_TOP_OR_LEFT float taskPercent = mDesiredStagePosition == STAGE_POSITION_TOP_OR_LEFT
? mSplitBounds.leftTaskPercent ? mSplitBounds.leftTaskPercent
: (1 - (mSplitBounds.leftTaskPercent + mSplitBounds.dividerWidthPercent)); : (1 - (mSplitBounds.leftTaskPercent + mSplitBounds.dividerWidthPercent));
// Scale landscape width to that of actual screen // Scale landscape width to that of actual screen
fullscreenTaskWidth = screenWidthPx * taskPercent; float fullscreenTaskWidth = screenWidthPx * taskPercent;
canvasScreenRatio = canvasWidth / fullscreenTaskWidth; canvasScreenRatio = canvasWidth / fullscreenTaskWidth;
} }
} else { } else {