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

Commit 1467c143 authored by Evan Rosky's avatar Evan Rosky Committed by Android (Google) Code Review
Browse files

Merge "Support transient-launch recents with freeform" into main

parents 854d2240 78132186

services/core/java/com/android/server/wm/ActivityStartController.java

+2 −1
Original line number Diff line number Diff line
@@ -577,7 +577,8 @@ public class ActivityStartController { 
                .getRootTask(WINDOWING_MODE_UNDEFINED, activityType);

        if (rootTask == null) return false;

        final ActivityRecord r = rootTask.topRunningActivity();

        if (r == null || r.isVisibleRequested() || !r.attachedToProcess()

        if (r == null || (r.isVisibleRequested() && rootTask.isTopRootTaskInDisplayArea())

                || !r.attachedToProcess()

                || !r.mActivityComponent.equals(intent.getComponent())

                || !mService.isCallerRecents(r.getUid())

                // Recents keeps invisible while device is locked.

services/core/java/com/android/server/wm/Transition.java

+1 −2
Original line number Diff line number Diff line
@@ -372,8 +372,7 @@ class Transition implements BLASTSyncEngine.TransactionReadyListener { 
            parent.forAllTasks(t -> {

                // Skip transient-launch task

                if (t == transientRootTask) return false;

                if (t.isVisibleRequested() && !t.isAlwaysOnTop()

                        && !t.getWindowConfiguration().tasksAreFloating()) {

                if (t.isVisibleRequested() && !t.isAlwaysOnTop()) {

                    if (t.isRootTask()) {

                        mTransientHideTasks.add(t);

                    }