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

Merge "Fix squished UI elements" into nyc-dev

Browse Source
This commit is contained in:
Jorim Jaggi
2016-04-22 03:09:58 +00:00
committed by Android (Google) Code Review
parent a482c6e5e6 65002e1d17
commit 42a6dc9bd6
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
services/core/java/com/android/server/wm/TaskStack.java
View File

@@ -644,9 +644,12 @@ public class TaskStack implements DimLayer.DimLayerUser,
Rect bounds = null; Rect bounds = null;
final TaskStack dockedStack = mService.mStackIdToStack.get(DOCKED_STACK_ID); final TaskStack dockedStack = mService.mStackIdToStack.get(DOCKED_STACK_ID);
if (mStackId == DOCKED_STACK_ID if (mStackId == DOCKED_STACK_ID
|| (dockedStack != null && StackId.isResizeableByDockedStack(mStackId))) { || (dockedStack != null && StackId.isResizeableByDockedStack(mStackId)
&& !dockedStack.isFullscreen())) {
// The existence of a docked stack affects the size of other static stack created since // The existence of a docked stack affects the size of other static stack created since
// the docked stack occupies a dedicated region on screen. // the docked stack occupies a dedicated region on screen, but only if the dock stack is
// not fullscreen. If it's fullscreen, it means that we are in the transition of
// dismissing it, so we must not resize this stack.
bounds = new Rect(); bounds = new Rect();
displayContent.getLogicalDisplayRect(mTmpRect); displayContent.getLogicalDisplayRect(mTmpRect);
mTmpRect2.setEmpty(); mTmpRect2.setEmpty();