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

Commit d5170205 authored by Riddle Hsu's avatar Riddle Hsu Committed by Automerger Merge Worker
Browse files

Merge "Remove some duplicated code of transient launch" into udc-dev am: eaca224c 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22530822



Change-Id: I13072516359d13e4591a39eae02203be758b2df2
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 71373f53 eaca224c

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

+1 −2
Original line number Diff line number Diff line
@@ -466,8 +466,7 @@ abstract class AbsAppSnapshotController<TYPE extends WindowContainer, 
    }



    boolean isAnimatingByRecents(@NonNull Task task) {

        return task.isAnimatingByRecents()

                || mService.mAtmService.getTransitionController().inRecentsTransition(task);

        return task.isAnimatingByRecents();

    }



    void dump(PrintWriter pw, String prefix) {

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

+1 −2
Original line number Diff line number Diff line
@@ -3544,8 +3544,7 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A 
                // the best capture timing (e.g. IME window capture),

                // No need additional task capture while task is controlled by RecentsAnimation.

                if (mAtmService.mWindowManager.mTaskSnapshotController != null

                        && !(task.isAnimatingByRecents()

                                || mTransitionController.inRecentsTransition(task))) {

                        && !task.isAnimatingByRecents()) {

                    final ArraySet<Task> tasks = Sets.newArraySet(task);

                    mAtmService.mWindowManager.mTaskSnapshotController.snapshotTasks(tasks);

                    mAtmService.mWindowManager.mTaskSnapshotController

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

+0 −1
Original line number Diff line number Diff line
@@ -577,7 +577,6 @@ public class ActivityStartController { 
            final Transition transition = controller.getCollectingTransition();

            if (transition != null) {

                transition.setRemoteAnimationApp(r.app.getThread());

                controller.collect(task);

                controller.setTransientLaunch(r, TaskDisplayArea.getRootTaskAbove(rootTask));

            }

            task.moveToFront("startExistingRecents");

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

+1 −0
Original line number Diff line number Diff line
@@ -2548,6 +2548,7 @@ class ActivityStarter { 
        mAvoidMoveToFront = false;

        mFrozeTaskList = false;

        mTransientLaunch = false;

        mPriorAboveTask = null;

        mDisplayLockAndOccluded = false;



        mVoiceSession = null;

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

+2 −1
Original line number Diff line number Diff line
@@ -3006,7 +3006,8 @@ class Task extends TaskFragment { 


    /** Checking if self or its child tasks are animated by recents animation. */

    boolean isAnimatingByRecents() {

        return isAnimating(CHILDREN, ANIMATION_TYPE_RECENTS);

        return isAnimating(CHILDREN, ANIMATION_TYPE_RECENTS)

                || mTransitionController.isTransientHide(this);

    }



    WindowState getTopVisibleAppMainWindow() {