Merge "Check for forceVisible when updating from a new status event" into sc-dev
This commit is contained in:
@@ -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
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user