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 am: c43997ba15 am: 3f87a39a37 am: 68930175d4

Browse Source 
Change-Id: I0a2c023b044120629faa5765309eb1824b9a6a1d
This commit is contained in:
Ben Lin
2020-05-06 22:00:20 +00:00
committed by Automerger Merge Worker
parent deb5c075ea 68930175d4
commit e61267d844
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 height = bottom - top;
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) {
width = Math.max(minVisibleWidth, width + deltaX);
width = Math.max(minVisibleWidth, Math.min(width + deltaX, maxVisibleSize.x));
}
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) {
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.