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 
am: 42a6dc9bd6

* commit '42a6dc9bd6cd5028ab65f456fe7cc4d8a7fd77c8':
  Fix squished UI elements

Change-Id: I6a86c75799f8352bad08ed8170e65d7b5f7eedbe
This commit is contained in:
Jorim Jaggi
2016-04-22 03:21:46 +00:00
committed by android-build-merger
parent f76f85501a 42a6dc9bd6
commit 1a9fafce2e
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;
final TaskStack dockedStack = mService.mStackIdToStack.get(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 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();
displayContent.getLogicalDisplayRect(mTmpRect);
mTmpRect2.setEmpty();