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

Browse Source
This commit is contained in:
TreeHugger Robot
2016-05-19 21:42:20 +00:00
committed by Android (Google) Code Review
parent 2486cb2c89 031384556e
commit 1669d42808
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.RESIZE_MODE_SYSTEM_SCREEN_ROTATION;
import static android.app.ActivityManager.StackId.DOCKED_STACK_ID; 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.FREEFORM_WORKSPACE_STACK_ID;
import static android.app.ActivityManager.StackId.HOME_STACK_ID; import static android.app.ActivityManager.StackId.HOME_STACK_ID;
import static android.content.pm.ActivityInfo.RESIZE_MODE_CROP_WINDOWS; 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 // 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. // windows since they aren't at the base layer and could be moved around anyway.
if (!win.computeDragResizing() && win.mAttrs.type == TYPE_BASE_APPLICATION && if (!win.computeDragResizing() && win.mAttrs.type == TYPE_BASE_APPLICATION &&
!mStack.getBoundsAnimating() && !win.isGoneForLayoutLw()) { !mStack.getBoundsAnimating() && !win.isGoneForLayoutLw() &&
!inPinnedWorkspace()) {
win.setResizedWhileNotDragResizing(true); win.setResizedWhileNotDragResizing(true);
} }
} }
@@ -710,6 +712,10 @@ class Task implements DimLayer.DimLayerUser {
return mStack != null && mStack.mStackId == DOCKED_STACK_ID; return mStack != null && mStack.mStackId == DOCKED_STACK_ID;
} }
boolean inPinnedWorkspace() {
return mStack != null && mStack.mStackId == PINNED_STACK_ID;
}
boolean isResizeableByDockedStack() { boolean isResizeableByDockedStack() {
final DisplayContent displayContent = getDisplayContent(); final DisplayContent displayContent = getDisplayContent();
return displayContent != null && displayContent.getDockedStackLocked() != null return displayContent != null && displayContent.getDockedStackLocked() != null