Merge "Fix first swipe after exiting AOD" into main (4b397b90) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java

+11 −0

Original line number	Diff line number	Diff line
		@@ -30,6 +30,7 @@ import static com.android.systemui.classifier.Classifier.BOUNCER_UNLOCK;
		import static com.android.systemui.classifier.Classifier.GENERIC;
		import static com.android.systemui.classifier.Classifier.QUICK_SETTINGS;
		import static com.android.systemui.classifier.Classifier.UNLOCK;
		import static com.android.systemui.keyguard.shared.model.KeyguardState.AOD;
		import static com.android.systemui.keyguard.shared.model.KeyguardState.DREAMING;
		import static com.android.systemui.keyguard.shared.model.KeyguardState.DREAMING_LOCKSCREEN_HOSTED;
		import static com.android.systemui.keyguard.shared.model.KeyguardState.GONE;
		@@ -1213,6 +1214,16 @@ public final class NotificationPanelViewController implements ShadeSurface, Dump
		}, mMainDispatcher);
		}

		if (MigrateClocksToBlueprint.isEnabled()) {
		collectFlow(mView, mKeyguardTransitionInteractor.transition(
		Edge.Companion.create(AOD, LOCKSCREEN)),
		(TransitionStep step) -> {
		if (step.getTransitionState() == TransitionState.FINISHED) {
		updateExpandedHeightToMaxHeight();
		}
		}, mMainDispatcher);
		}

		// Ensures that flags are updated when an activity launches
		collectFlow(mView,
		mShadeAnimationInteractor.isLaunchingActivity(),

+3 −1

Original line number	Diff line number	Diff line
		@@ -556,11 +556,13 @@ public class NotificationPanelViewControllerBaseTest extends SysuiTestCase {
		return null;
		}).when(mView).setOnTouchListener(any(NotificationPanelViewController.TouchHandler.class));

		// Dreaming->Lockscreen
		// Any edge transition
		when(mKeyguardTransitionInteractor.transition(any()))
		.thenReturn(emptyFlow());
		when(mKeyguardTransitionInteractor.transition(any(), any()))
		.thenReturn(emptyFlow());

		// Dreaming->Lockscreen
		when(mDreamingToLockscreenTransitionViewModel.getLockscreenAlpha())
		.thenReturn(emptyFlow());
		when(mDreamingToLockscreenTransitionViewModel.lockscreenTranslationY(anyInt()))