From b9db1edd2d5e4a99a6c3b6bfbb3253546e383998 Mon Sep 17 00:00:00 2001 From: Matt Pietal Date: Tue, 18 Jun 2024 18:00:50 +0000 Subject: LOCKSCREEN->AOD on FOLD: Hide NPVC The legacy NPVC path still needs to be hidden immediately in order to prevent a flicker on fold. Make sure to tell NPVC to go immediately to doze state without animating. Fixes: 346325723 Test: Fold from LOCKSCREEN, assert there's no flicker on fold Flag: com.android.systemui.migrate_clocks_to_blueprint Change-Id: If1390ffd5273d0f20dc71e0471e1eb25e49e0a9b --- .../com/android/systemui/shade/NotificationPanelViewController.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java b/packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java index 9624e0ffcf26..71fe3712aaa4 100644 --- a/packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java +++ b/packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java @@ -3390,7 +3390,9 @@ public final class NotificationPanelViewController implements ShadeSurface, Dump /** Updates the views to the initial state for the fold to AOD animation. */ @Override public void prepareFoldToAodAnimation() { - if (!MigrateClocksToBlueprint.isEnabled()) { + if (MigrateClocksToBlueprint.isEnabled()) { + setDozing(true /* dozing */, false /* animate */); + } else { // Force show AOD UI even if we are not locked showAodUi(); } -- cgit v1.2.3-59-g8ed1b