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

Merge "Do not enforce minimum size for pinned stack." into nyc-dev

Browse Source
This commit is contained in:
Rob Carr
2016-03-11 02:03:48 +00:00
committed by Android (Google) Code Review
parent 684aff1fce 9c5867d8cd
commit 756ac8e073
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
services/core/java/com/android/server/am/TaskRecord.java
View File

@@ -1334,8 +1334,13 @@ final class TaskRecord {
if (bounds == null) {
return;
}
final int minimalSize = mMinimalSize == -1
? mService.mStackSupervisor.mDefaultMinimalSizeOfResizeableTask : mMinimalSize;
int minimalSize = mMinimalSize;
// If the task has no requested minimal size, we'd like to enforce a minimal size
// so that the user can not render the task too small to manipulate. We don't need
// to do this for the pinned stack as the bounds are controlled by the system.
if (minimalSize == -1 && stack.mStackId != PINNED_STACK_ID) {
minimalSize = mService.mStackSupervisor.mDefaultMinimalSizeOfResizeableTask;
}
final boolean adjustWidth = minimalSize > bounds.width();
final boolean adjustHeight = minimalSize > bounds.height();
if (!(adjustWidth || adjustHeight)) {