Don't animate unlocked screen off if QS is expanded
Instead of determining whether to run the unlocked screen off animation based on fullyCollapsed, check isExpanded which is the expanded state onPanelExpansionChanged uses when sending panel expansion updates to listeners. This eventually updates DozeParameters#canControlScreenOff => and then checks UnlockedScreenOffAnimationController#shouldPlayUnlockedScreenOffAnimation Test: manually swipe down from home screen to reveal QS, then press power button to AoD, no animation/jank Fixes: 228786469 Change-Id: I0384e1300b6b50aaa8a119d11bf71186fb5379e8
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