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

Merge "Update dock stack create mode after rotation if dock side changed" into nyc-dev

Browse Source
This commit is contained in:
Chong Zhang
2016-05-25 22:42:55 +00:00
committed by Android (Google) Code Review
parent 436da616c8 73d4b44ce3
commit e55e4b7f73
2 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -17,6 +17,7 @@
package com.android.server.wm; package com.android.server.wm;
import static android.app.ActivityManager.DOCKED_STACK_CREATE_MODE_TOP_OR_LEFT; import static android.app.ActivityManager.DOCKED_STACK_CREATE_MODE_TOP_OR_LEFT;
import static android.app.ActivityManager.DOCKED_STACK_CREATE_MODE_BOTTOM_OR_RIGHT;
import static android.app.ActivityManager.StackId.DOCKED_STACK_ID; import static android.app.ActivityManager.StackId.DOCKED_STACK_ID;
import static android.app.ActivityManager.StackId.HOME_STACK_ID; import static android.app.ActivityManager.StackId.HOME_STACK_ID;
import static android.app.ActivityManager.StackId.PINNED_STACK_ID; import static android.app.ActivityManager.StackId.PINNED_STACK_ID;
@@ -403,6 +404,13 @@ public class TaskStack implements DimLayer.DimLayerUser,
snapDockedStackAfterRotation(mTmpRect2); snapDockedStackAfterRotation(mTmpRect2);
final int newDockSide = getDockSide(mTmpRect2); final int newDockSide = getDockSide(mTmpRect2);
if (oldDockSide != newDockSide) { if (oldDockSide != newDockSide) {
// Update the dock create mode and clear the dock create bounds, these
// might change after a rotation and the original values will be invalid.
mService.setDockedStackCreateStateLocked(
(newDockSide == DOCKED_LEFT || newDockSide == DOCKED_TOP)
? DOCKED_STACK_CREATE_MODE_TOP_OR_LEFT
: DOCKED_STACK_CREATE_MODE_BOTTOM_OR_RIGHT,
null);
mDisplayContent.getDockedDividerController().notifyDockSideChanged(newDockSide); mDisplayContent.getDockedDividerController().notifyDockSideChanged(newDockSide);
} }
} }

6
services/core/java/com/android/server/wm/WindowManagerService.java
View File

@@ -4959,10 +4959,14 @@ public class WindowManagerService extends IWindowManager.Stub
public void setDockedStackCreateState(int mode, Rect bounds) { public void setDockedStackCreateState(int mode, Rect bounds) {
synchronized (mWindowMap) { synchronized (mWindowMap) {
setDockedStackCreateStateLocked(mode, bounds);
}
}
void setDockedStackCreateStateLocked(int mode, Rect bounds) {
mDockedStackCreateMode = mode; mDockedStackCreateMode = mode;
mDockedStackCreateBounds = bounds; mDockedStackCreateBounds = bounds;
} }
}
/** /**
* Create a new TaskStack and place it on a DisplayContent. * Create a new TaskStack and place it on a DisplayContent.