Merge "Don't play an animation for WAKE + KEYGUARD_OCCLUDE" into main (144dc689) · Commits · e / os / android_frameworks_base

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

+4 −0

Original line number	Original line	Diff line number	Diff line
	@@ -143,6 +143,10 @@ public class KeyguardTransitionHandler
	}		}

	public static boolean handles(TransitionInfo info) {		public static boolean handles(TransitionInfo info) {
			// There is no animation for screen-wake unless we are immediately unlocking.
			if (info.getType() == WindowManager.TRANSIT_WAKE && !info.isKeyguardGoingAway()) {
			return false;
			}
	return (info.getFlags() & KEYGUARD_VISIBILITY_TRANSIT_FLAGS) != 0;		return (info.getFlags() & KEYGUARD_VISIBILITY_TRANSIT_FLAGS) != 0;
	}		}