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

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

Browse Source 
am: 1b3e08b4d1

* commit '1b3e08b4d125c8f609f1ae31f988f7618c53bdbe':
  Never set resized while not drag resizing for pinned stack.

Change-Id: Ied5c9a00c9ccf9422ecba2447209d52435694cb7
This commit is contained in:
Robert Carr
2016-05-19 21:51:01 +00:00
committed by android-build-merger
parent 03be7972ee 1b3e08b4d1
commit 0aee56c25a
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
services/core/java/com/android/server/wm/Task.java
View File

@@ -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