Merge "Delay display DOZE on LS => AOD" (1003ce96) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/statusbar/phone/DozeParameters.java

+6 −1

Original line number	Diff line number	Diff line
		@@ -309,7 +309,12 @@ public class DozeParameters implements
		* delayed for a few seconds. This might be useful to play animations without reducing FPS.
		*/
		public boolean shouldDelayDisplayDozeTransition() {
		return mScreenOffAnimationController.shouldDelayDisplayDozeTransition();
		return willAnimateFromLockScreenToAod()
		\|\| mScreenOffAnimationController.shouldDelayDisplayDozeTransition();
		}

		private boolean willAnimateFromLockScreenToAod() {
		return getAlwaysOn() && mKeyguardShowing;
		}

		/**