Merge "Fix issue where screen off is disabled after expanding then collapsing the shade." into sc-dev

This commit is contained in:
Josh Tsuji
2021-07-21 15:40:24 +00:00
committed by Android (Google) Code Review

View File

@@ -199,10 +199,9 @@ class UnlockedScreenOffAnimationController @Inject constructor(
// We currently draw both the light reveal scrim, and the AOD UI, in the shade. If it's
// already expanded and showing notifications/QS, the animation looks really messy. For now,
// disable it if the notification panel is expanded.
// disable it if the notification panel is not fully collapsed.
if (!this::statusBar.isInitialized ||
statusBar.notificationPanelViewController.isFullyExpanded ||
statusBar.notificationPanelViewController.isExpanding) {
!statusBar.notificationPanelViewController.isFullyCollapsed) {
return false
}