Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 63211c33 authored by Andrii Kulian's avatar Andrii Kulian Committed by android-build-merger
Browse files

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

am: 82e5288e

* commit '82e5288e':
  Show recents when task moves to docked stack

Change-Id: I9979ee936a279875482bdf79aaa315a5c59f3a01
parents f60281f3 82e5288e

services/core/java/com/android/server/am/ActivityManagerService.java

+8 −2
Original line number Diff line number Diff line
@@ -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);

            }