diff options
2 files changed, 14 insertions, 1 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java b/packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java index 5896659e9898..2bff7c86059d 100644 --- a/packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java +++ b/packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java @@ -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(), diff --git a/packages/SystemUI/tests/src/com/android/systemui/shade/NotificationPanelViewControllerBaseTest.java b/packages/SystemUI/tests/src/com/android/systemui/shade/NotificationPanelViewControllerBaseTest.java index f5a901963f05..0e9ef06aa1b9 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/shade/NotificationPanelViewControllerBaseTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/shade/NotificationPanelViewControllerBaseTest.java @@ -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())) |