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

Merge "Show recents when task moves to docked stack" into nyc-dev

Browse Source
This commit is contained in:
Andrii Kulian
2016-04-22 16:15:07 +00:00
committed by Android (Google) Code Review
parent ca2ce9b74a bf71968f89
commit 82e5288ee6
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
services/core/java/com/android/server/am/ActivityManagerService.java
View File

@@ -341,6 +341,7 @@ import static com.android.server.am.ActivityManagerDebugConfig.POSTFIX_VISIBILIT
import static com.android.server.am.ActivityManagerDebugConfig.POSTFIX_VISIBLE_BEHIND;
import static com.android.server.am.ActivityManagerDebugConfig.TAG_AM;
import static com.android.server.am.ActivityManagerDebugConfig.TAG_WITH_CLASS_NAME;
import static com.android.server.am.ActivityRecord.RECENTS_ACTIVITY_TYPE;
import static com.android.server.am.ActivityStackSupervisor.ActivityContainer.FORCE_NEW_TASK_FLAGS;
import static com.android.server.am.ActivityStackSupervisor.DEFER_RESUME;
import static com.android.server.am.ActivityStackSupervisor.FORCE_FOCUS;
@@ -9612,8 +9613,13 @@ public final class ActivityManagerService extends ActivityManagerNative
mWindowManager.setDockedStackCreateState(DOCKED_STACK_CREATE_MODE_TOP_OR_LEFT,
null /* initialBounds */);
}
mStackSupervisor.moveTaskToStackLocked(taskId, stackId, toTop, !FORCE_FOCUS,
"moveTaskToStack", ANIMATE);
boolean result = mStackSupervisor.moveTaskToStackLocked(taskId, stackId, toTop,
!FORCE_FOCUS, "moveTaskToStack", ANIMATE);
if (result && stackId == DOCKED_STACK_ID) {
// If task moved to docked stack - show recents if needed.
mStackSupervisor.moveHomeStackTaskToTop(RECENTS_ACTIVITY_TYPE,
"moveTaskToDockedStack");
}
} finally {
Binder.restoreCallingIdentity(ident);
}