Merge "Keeps activity in visible state when LiveTiles task is animating" (5e093437) · Commits · e / os / android_frameworks_base

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

+6 −2

Original line number	Diff line number	Diff line
		@@ -179,6 +179,7 @@ import static com.android.server.wm.IdentifierProto.HASH_CODE;
		import static com.android.server.wm.IdentifierProto.TITLE;
		import static com.android.server.wm.IdentifierProto.USER_ID;
		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.SurfaceAnimator.ANIMATION_TYPE_WINDOW_ANIMATION;
		import static com.android.server.wm.Task.ActivityState.DESTROYED;
		import static com.android.server.wm.Task.ActivityState.DESTROYING;
		@@ -4217,7 +4218,9 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A
		// Note that we ignore display frozen since we want the opening / closing transition type
		// can be updated correctly even display frozen, and it's safe since in applyAnimation will
		// still check DC#okToAnimate again if the transition animation is fine to apply.
		if (okToAnimate(true /* ignoreFrozen */) && appTransition.isTransitionSet()) {
		final boolean recentsAnimating = isAnimating(PARENTS, ANIMATION_TYPE_RECENTS);
		if (okToAnimate(true /* ignoreFrozen */) && (appTransition.isTransitionSet()
		\|\| (recentsAnimating && !isActivityTypeHome()))) {
		if (visible) {
		displayContent.mOpeningApps.add(this);
		mEnteringAnimation = true;
		@@ -6086,7 +6089,8 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A

		@Override
		void prepareSurfaces() {
		final boolean show = isVisible() \|\| isAnimating(PARENTS, ANIMATION_TYPE_APP_TRANSITION);
		final boolean show = isVisible() \|\| isAnimating(PARENTS,
		ANIMATION_TYPE_APP_TRANSITION \| ANIMATION_TYPE_RECENTS);

		if (mSurfaceControl != null) {
		if (show && !mLastSurfaceShowing) {

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -3940,7 +3940,7 @@ class Task extends WindowContainer<WindowContainer> {
		if (control != null) {
		// We let the transition to be controlled by RecentsAnimation, and callback task's
		// RemoteAnimationTarget for remote runner to animate.
		if (enter) {
		if (enter && !isHomeOrRecentsStack()) {
		ProtoLog.d(WM_DEBUG_RECENTS_ANIMATIONS,
		"applyAnimationUnchecked, control: %s, task: %s, transit: %s",
		control, asTask(), AppTransition.appTransitionToString(transit));