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

Merge "Enforce max size for resizing operations." into rvc-dev

Browse Source
This commit is contained in:
Ben Lin
2020-05-06 21:17:02 +00:00
committed by Android (Google) Code Review
parent e974c347fd d14589e051
commit c43997ba15
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/java/com/android/internal/policy/TaskResizingAlgorithm.java
View File

@@ -91,14 +91,14 @@ public class TaskResizingAlgorithm {
int width = right - left; int width = right - left;
int height = bottom - top; int height = bottom - top;
if ((ctrlType & CTRL_LEFT) != 0) { if ((ctrlType & CTRL_LEFT) != 0) {
width = Math.max(minVisibleWidth, width - deltaX); width = Math.max(minVisibleWidth, Math.min(width - deltaX, maxVisibleSize.x));
} else if ((ctrlType & CTRL_RIGHT) != 0) { } else if ((ctrlType & CTRL_RIGHT) != 0) {
width = Math.max(minVisibleWidth, width + deltaX); width = Math.max(minVisibleWidth, Math.min(width + deltaX, maxVisibleSize.x));
} }
if ((ctrlType & CTRL_TOP) != 0) { if ((ctrlType & CTRL_TOP) != 0) {
height = Math.max(minVisibleHeight, height - deltaY); height = Math.max(minVisibleHeight, Math.min(height - deltaY, maxVisibleSize.y));
} else if ((ctrlType & CTRL_BOTTOM) != 0) { } else if ((ctrlType & CTRL_BOTTOM) != 0) {
height = Math.max(minVisibleHeight, height + deltaY); height = Math.max(minVisibleHeight, Math.min(height + deltaY, maxVisibleSize.y));
} }
// If we have to preserve the orientation - check that we are doing so. // If we have to preserve the orientation - check that we are doing so.