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 am: e55e4b7f73 am: 5dfed87e37

Browse Source 
am: 2c7e700aad

* commit '2c7e700aade0282dc3eeb333b195a4a48f7ef9dc':
  Update dock stack create mode after rotation if dock side changed

Change-Id: I08ed26fdb872591270a024336e6fec841e9b576c
This commit is contained in:
Chong Zhang
2016-05-25 23:13:19 +00:00
committed by android-build-merger
parent b7157c815f 2c7e700aad
commit 9fc0d01486
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;
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.HOME_STACK_ID;
import static android.app.ActivityManager.StackId.PINNED_STACK_ID;
@@ -403,6 +404,13 @@ public class TaskStack implements DimLayer.DimLayerUser,
snapDockedStackAfterRotation(mTmpRect2);
final int newDockSide = getDockSide(mTmpRect2);
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);
}
}

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

@@ -4965,11 +4965,15 @@ public class WindowManagerService extends IWindowManager.Stub
public void setDockedStackCreateState(int mode, Rect bounds) {
synchronized (mWindowMap) {
mDockedStackCreateMode = mode;
mDockedStackCreateBounds = bounds;
setDockedStackCreateStateLocked(mode, bounds);
}
}
void setDockedStackCreateStateLocked(int mode, Rect bounds) {
mDockedStackCreateMode = mode;
mDockedStackCreateBounds = bounds;
}
/**
* Create a new TaskStack and place it on a DisplayContent.
* @param stackId The unique identifier of the new stack.