Merge "[Fold to AOD animation] part 3: do not collapse notification shade and... (720035dc) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/doze/DozeScreenState.java

+17 −5

Original line number	Diff line number	Diff line
		@@ -163,16 +163,12 @@ public class DozeScreenState implements DozeMachine.Part {

		// Delay screen state transitions even longer while animations are running.
		boolean shouldDelayTransitionEnteringDoze = newState == DOZE_AOD
		&& mParameters.shouldControlScreenOff() && !turningOn;
		&& mParameters.shouldDelayDisplayDozeTransition() && !turningOn;

		// Delay screen state transition longer if UDFPS is actively authenticating a fp
		boolean shouldDelayTransitionForUDFPS = newState == DOZE_AOD
		&& mUdfpsController != null && mUdfpsController.isFingerDown();

		if (shouldDelayTransitionEnteringDoze \|\| shouldDelayTransitionForUDFPS) {
		mWakeLock.setAcquired(true);
		}

		if (!messagePending) {
		if (DEBUG) {
		Log.d(TAG, "Display state changed to " + screenState + " delayed by "
		@@ -180,6 +176,18 @@ public class DozeScreenState implements DozeMachine.Part {
		}

		if (shouldDelayTransitionEnteringDoze) {
		if (justInitialized) {
		// If we are delaying transitioning to doze and the display was not
		// turned on we set it to 'on' first to make sure that the animation
		// is visible before eventually moving it to doze state.
		// The display might be off at this point for example on foldable devices
		// when we switch displays and go to doze at the same time.
		applyScreenState(Display.STATE_ON);

		// Restore pending screen state as it gets cleared by 'applyScreenState'
		mPendingScreenState = screenState;
		}

		mHandler.postDelayed(mApplyPendingScreenState, ENTER_DOZE_DELAY);
		} else if (shouldDelayTransitionForUDFPS) {
		mDozeLog.traceDisplayStateDelayedByUdfps(mPendingScreenState);
		@@ -190,6 +198,10 @@ public class DozeScreenState implements DozeMachine.Part {
		} else if (DEBUG) {
		Log.d(TAG, "Pending display state change to " + screenState);
		}

		if (shouldDelayTransitionEnteringDoze \|\| shouldDelayTransitionForUDFPS) {
		mWakeLock.setAcquired(true);
		}
		} else if (turningOff) {
		mDozeHost.prepareForGentleSleep(() -> applyScreenState(screenState));
		} else {

packages/SystemUI/src/com/android/systemui/statusbar/LightRevealScrim.kt

+2 −1

Original line number	Diff line number	Diff line
		@@ -355,7 +355,8 @@ class LightRevealScrim(context: Context?, attrs: AttributeSet?) : View(context,
		}

		override fun onDraw(canvas: Canvas?) {
		if (canvas == null \|\| revealGradientWidth <= 0 \|\| revealGradientHeight <= 0) {
		if (canvas == null \|\| revealGradientWidth <= 0 \|\| revealGradientHeight <= 0
		\|\| revealAmount == 0f) {
		if (revealAmount < 1f) {
		canvas?.drawColor(revealGradientEndColor)
		}

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

+8 −0

Original line number	Diff line number	Diff line
		@@ -304,6 +304,14 @@ public class DozeParameters implements
		return mScreenOffAnimationController.shouldAnimateDozingChange();
		}

		/**
		* When this method returns true then moving display state to power save mode will be
		* delayed for a few seconds. This might be useful to play animations without reducing FPS.
		*/
		public boolean shouldDelayDisplayDozeTransition() {
		return mScreenOffAnimationController.shouldDelayDisplayDozeTransition();
		}

		/**
		* Whether we're capable of controlling the screen off animation if we want to. This isn't
		* possible if AOD isn't even enabled or if the flag is disabled.

packages/SystemUI/src/com/android/systemui/statusbar/phone/ScreenOffAnimationController.kt

+9 −0

Original line number	Diff line number	Diff line
		@@ -179,6 +179,14 @@ class ScreenOffAnimationController @Inject constructor(
		fun shouldAnimateDozingChange(): Boolean =
		animations.all { it.shouldAnimateDozingChange() }

		/**
		* Returns true when moving display state to power save mode should be
		* delayed for a few seconds. This might be useful to play animations in full quality,
		* without reducing FPS.
		*/
		fun shouldDelayDisplayDozeTransition(): Boolean =
		animations.any { it.shouldDelayDisplayDozeTransition() }

		/**
		* Return true to animate large <-> small clock transition
		*/
		@@ -207,6 +215,7 @@ interface ScreenOffAnimation {
		fun shouldHideScrimOnWakeUp(): Boolean = false
		fun overrideNotificationsDozeAmount(): Boolean = false
		fun shouldShowAodIconsWhenShade(): Boolean = false
		fun shouldDelayDisplayDozeTransition(): Boolean = false
		fun shouldAnimateAodIcons(): Boolean = true
		fun shouldAnimateDozingChange(): Boolean = true
		fun shouldAnimateClockChange(): Boolean = true

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

+2 −1

Original line number	Diff line number	Diff line
		@@ -123,7 +123,8 @@ public class ShadeControllerImpl implements ShadeController {
		+ " canPanelBeCollapsed(): "
		+ getNotificationPanelViewController().canPanelBeCollapsed());
		if (getNotificationShadeWindowView() != null
		&& getNotificationPanelViewController().canPanelBeCollapsed()) {
		&& getNotificationPanelViewController().canPanelBeCollapsed()
		&& (flags & CommandQueue.FLAG_EXCLUDE_NOTIFICATION_PANEL) == 0) {
		// release focus immediately to kick off focus change transition
		mNotificationShadeWindowController.setNotificationShadeFocusable(false);