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

Commit 7b5f5c31 authored by Robert Carr's avatar Robert Carr Committed by android-build-merger
Browse files

Merge "Never set resized while not drag resizing for pinned stack." into nyc-dev 

am: 1669d428

* commit '1669d428':
  Never set resized while not drag resizing for pinned stack.

Change-Id: Ifa2e3879a01f7ba906185b00d4b27ed3843dd315
parents e9b32c77 1669d428

services/core/java/com/android/server/wm/Task.java

+7 −1
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ package com.android.server.wm; 


import static android.app.ActivityManager.RESIZE_MODE_SYSTEM_SCREEN_ROTATION;

import static android.app.ActivityManager.StackId.DOCKED_STACK_ID;

import static android.app.ActivityManager.StackId.PINNED_STACK_ID;

import static android.app.ActivityManager.StackId.FREEFORM_WORKSPACE_STACK_ID;

import static android.app.ActivityManager.StackId.HOME_STACK_ID;

import static android.content.pm.ActivityInfo.RESIZE_MODE_CROP_WINDOWS;
@@ -630,7 +631,8 @@ class Task implements DimLayer.DimLayerUser { 
                    // Anyway we don't need to synchronize position and content updates for these

                    // windows since they aren't at the base layer and could be moved around anyway.

                    if (!win.computeDragResizing() && win.mAttrs.type == TYPE_BASE_APPLICATION &&

                            !mStack.getBoundsAnimating() && !win.isGoneForLayoutLw()) {

                            !mStack.getBoundsAnimating() && !win.isGoneForLayoutLw() &&

                            !inPinnedWorkspace()) {

                        win.setResizedWhileNotDragResizing(true);

                    }

                }
@@ -710,6 +712,10 @@ class Task implements DimLayer.DimLayerUser { 
        return mStack != null && mStack.mStackId == DOCKED_STACK_ID;

    }



    boolean inPinnedWorkspace() {

        return mStack != null && mStack.mStackId == PINNED_STACK_ID;

    }



    boolean isResizeableByDockedStack() {

        final DisplayContent displayContent = getDisplayContent();

        return displayContent != null && displayContent.getDockedStackLocked() != null