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

Commit b9e2f299 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix TaskView is invisible during quick switch" into rvc-dev am: b2014a0a 

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

Change-Id: Ib3a8ab256844f8e5b4c52a26e21bf530d551e671
parents e5b97090 b2014a0a

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

+2 −1
Original line number Diff line number Diff line
@@ -73,6 +73,7 @@ import static com.android.server.wm.RootWindowContainer.MATCH_TASK_IN_STACKS_OR_ 
import static com.android.server.wm.RootWindowContainer.MATCH_TASK_IN_STACKS_OR_RECENT_TASKS_AND_RESTORE;

import static com.android.server.wm.RootWindowContainer.TAG_STATES;

import static com.android.server.wm.SurfaceAnimator.ANIMATION_TYPE_APP_TRANSITION;

import static com.android.server.wm.SurfaceAnimator.ANIMATION_TYPE_RECENTS;

import static com.android.server.wm.Task.FLAG_FORCE_HIDDEN_FOR_PINNED_TASK;

import static com.android.server.wm.Task.LOCK_TASK_AUTH_LAUNCHABLE;

import static com.android.server.wm.Task.LOCK_TASK_AUTH_LAUNCHABLE_PRIV;
@@ -1809,7 +1810,7 @@ public class ActivityStackSupervisor implements RecentTasks.Callbacks { 
        for (int i = mStoppingActivities.size() - 1; i >= 0; --i) {

            final ActivityRecord s = mStoppingActivities.get(i);

            final boolean animating = s.isAnimating(TRANSITION | PARENTS,

                    ANIMATION_TYPE_APP_TRANSITION);

                    ANIMATION_TYPE_APP_TRANSITION | ANIMATION_TYPE_RECENTS);

            if (DEBUG_STATES) Slog.v(TAG, "Stopping " + s + ": nowVisible=" + s.nowVisible

                    + " animating=" + animating + " finishing=" + s.finishing);

            if (!animating || mService.mShuttingDown) {