Merge "Check for forceVisible when updating from a new status event" into sc-dev am: ce6e70884e

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15605596

Change-Id: I1a1b9b703bc5d659ca33912f832252f5c3d3b85e
This commit is contained in:
Nate Myren
2021-08-18 23:52:21 +00:00
committed by Automerger Merge Worker

View File

@@ -114,6 +114,10 @@ class SystemStatusAnimationScheduler @Inject constructor(
Log.d(TAG, "updating current event from: $event") Log.d(TAG, "updating current event from: $event")
} }
scheduledEvent?.updateFromEvent(event) scheduledEvent?.updateFromEvent(event)
if (event.forceVisible) {
hasPersistentDot = true
notifyTransitionToPersistentDot()
}
} else { } else {
if (DEBUG) { if (DEBUG) {
Log.d(TAG, "ignoring event $event") Log.d(TAG, "ignoring event $event")
@@ -154,6 +158,7 @@ class SystemStatusAnimationScheduler @Inject constructor(
// If animations are turned off, we'll transition directly to the dot // If animations are turned off, we'll transition directly to the dot
if (!event.showAnimation && event.forceVisible) { if (!event.showAnimation && event.forceVisible) {
notifyTransitionToPersistentDot() notifyTransitionToPersistentDot()
scheduledEvent = null
return return
} }