Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 61a9d284 authored by Robert Carr's avatar Robert Carr Committed by android-build-merger
Browse files

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

am: 756ac8e0

* commit '756ac8e0':
  Do not enforce minimum size for pinned stack.
parents 5f606bb0 756ac8e0

services/core/java/com/android/server/am/TaskRecord.java

+7 −2
Original line number Diff line number Diff line
@@ -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)) {