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

Merge "Dismiss docked stack on user switch" into nyc-dev

Browse Source 
am: 25459e1

* commit '25459e135d17a15e295ae0a827a0b4d4a88ebd67':
  Dismiss docked stack on user switch

Change-Id: I2f546a824c4634e2209d92c08207c449c54cafcb
This commit is contained in:
Wale Ogunwale
2016-04-27 18:47:08 +00:00
committed by android-build-merger
parent 3533d971c5 25459e135d
commit 05500c9388
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
services/core/java/com/android/server/am/ActivityStackSupervisor.java
View File

@@ -2997,7 +2997,11 @@ public final class ActivityStackSupervisor implements DisplayListener {
}
boolean switchUserLocked(int userId, UserState uss) {
mUserStackInFront.put(mCurrentUser, mFocusedStack.getStackId());
final int focusStackId = mFocusedStack.getStackId();
// We dismiss the docked stack whenever we switch users.
moveTasksToFullscreenStackLocked(DOCKED_STACK_ID, focusStackId == DOCKED_STACK_ID);
mUserStackInFront.put(mCurrentUser, focusStackId);
final int restoreStackId = mUserStackInFront.get(userId, HOME_STACK_ID);
mCurrentUser = userId;
@@ -3510,7 +3514,7 @@ public final class ActivityStackSupervisor implements DisplayListener {
// Dismiss docked stack. If task appeared to be in docked stack but is not resizable -
// we need to move it to top of fullscreen stack, otherwise it will be covered.
mService.moveTasksToFullscreenStack(DOCKED_STACK_ID, actualStackId == DOCKED_STACK_ID);
moveTasksToFullscreenStackLocked(DOCKED_STACK_ID, actualStackId == DOCKED_STACK_ID);
} else if (task.mResizeMode == RESIZE_MODE_FORCE_RESIZEABLE) {
String packageName = task.getTopActivity() != null
? task.getTopActivity().appInfo.packageName : null;