Merge "Don't animate unlocked screen off if QS is expanded" into tm-dev
This commit is contained in:
@@ -311,9 +311,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 not fully collapsed.
|
||||
// disable it if the notification panel is expanded.
|
||||
if ((!this::mCentralSurfaces.isInitialized ||
|
||||
!mCentralSurfaces.notificationPanelViewController.isFullyCollapsed) &&
|
||||
mCentralSurfaces.notificationPanelViewController.isExpanded) &&
|
||||
// Status bar might be expanded because we have started
|
||||
// playing the animation already
|
||||
!isAnimationPlaying()
|
||||
|
||||
Reference in New Issue
Block a user