Merge "Allow keyguard transition handler to play going away animation..." into main (808bc390) · Commits · e / os / android_frameworks_base

libs/WindowManager/Shell/src/com/android/wm/shell/keyguard/KeyguardTransitionHandler.java

+4 −1

Original line number	Diff line number	Diff line
		@@ -170,7 +170,7 @@ public class KeyguardTransitionHandler
		@NonNull SurfaceControl.Transaction startTransaction,
		@NonNull SurfaceControl.Transaction finishTransaction,
		@NonNull TransitionFinishCallback finishCallback) {
		if (!handles(info) \|\| mIsLaunchingActivityOverLockscreen) {
		if (!handles(info)) {
		return false;
		}

		@@ -185,6 +185,9 @@ public class KeyguardTransitionHandler
		transition, info, startTransaction, finishTransaction, finishCallback);
		}

		if (mIsLaunchingActivityOverLockscreen) {
		return false;
		}

		// Occlude/unocclude animations are only played if the keyguard is locked.
		if ((info.getFlags() & TRANSIT_FLAG_KEYGUARD_LOCKED) != 0) {