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

Commit 832c1733 authored by Winson Chung's avatar Winson Chung Committed by Android (Google) Code Review
Browse files

Merge "When creating a stack for the recents animation, ensure it is not top most"

parents 7a9127a5 93442035

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

+2 −1
Original line number Diff line number Diff line
@@ -2506,8 +2506,9 @@ class ActivityStarter { 
            // full resolution.

            mLaunchParams.mPreferredDisplayId =

                    mPreferredDisplayId != DEFAULT_DISPLAY ? mPreferredDisplayId : INVALID_DISPLAY;

            final boolean onTop = aOptions == null || !aOptions.getAvoidMoveToFront();

            final ActivityStack stack =

                    mRootActivityContainer.getLaunchStack(r, aOptions, task, ON_TOP, mLaunchParams);

                    mRootActivityContainer.getLaunchStack(r, aOptions, task, onTop, mLaunchParams);

            mLaunchParams.mPreferredDisplayId = mPreferredDisplayId;

            return stack;

        }

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

+13 −4
Original line number Diff line number Diff line
@@ -107,7 +107,7 @@ class RecentsAnimation implements RecentsAnimationCallbacks, 
                && recentsComponent.equals(intent.getComponent())

                        ? ACTIVITY_TYPE_RECENTS

                        : ACTIVITY_TYPE_HOME;

        final ActivityStack targetStack = mDefaultDisplay.getStack(WINDOWING_MODE_UNDEFINED,

        ActivityStack targetStack = mDefaultDisplay.getStack(WINDOWING_MODE_UNDEFINED,

                mTargetActivityType);

        ActivityRecord targetActivity = getTargetActivity(targetStack, intent.getComponent());

        final boolean hasExistingActivity = targetActivity != null;
@@ -153,7 +153,7 @@ class RecentsAnimation implements RecentsAnimationCallbacks, 
                            "startRecentsActivity");

                }

            } else {

                // No recents activity

                // No recents activity, create the new recents activity bottom most

                ActivityOptions options = ActivityOptions.makeBasic();

                options.setLaunchActivityType(mTargetActivityType);

                options.setAvoidMoveToFront();
@@ -166,11 +166,20 @@ class RecentsAnimation implements RecentsAnimationCallbacks, 
                        .setActivityOptions(SafeActivityOptions.fromBundle(options.toBundle()))

                        .setMayWait(userId)

                        .execute();

                mWindowManager.prepareAppTransition(TRANSIT_NONE, false);

                mWindowManager.executeAppTransition();



                // Move the recents activity into place for the animation

                targetActivity = mDefaultDisplay.getStack(WINDOWING_MODE_UNDEFINED,

                        mTargetActivityType).getTopActivity();

                targetStack = targetActivity.getActivityStack();

                mDefaultDisplay.moveStackBehindBottomMostVisibleStack(targetStack);

                if (DEBUG) {

                    Slog.d(TAG, "Moved stack=" + targetStack + " behind stack="

                            + mDefaultDisplay.getStackAbove(targetStack));

                }



                mWindowManager.prepareAppTransition(TRANSIT_NONE, false);

                mWindowManager.executeAppTransition();





                // TODO: Maybe wait for app to draw in this particular case?