summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvan Laird <evanlaird@google.com>2021-08-17 21:46:10 -0400
committerAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2021-08-19 03:21:42 +0000
commite22dae6f4614ef9607051de02853d2afcfb3baea (patch)
tree7726b530408a8f72e39b5b4244249d211751933a
parent4d404ff17ef0ed613eb6f660dd4c7ed60ea6acac (diff)
downloadbase-e22dae6f4614ef9607051de02853d2afcfb3baea.tar.gz
Check for forceVisible when updating from a new status event
In the case where we get a status event update that doesn't trigger a new scheduled event, we also need to check to see if the forceVisible bit flipped, otherwise we will fail to show the persistent dot. Bug: 197025130 Test: manual Change-Id: I261bce40e0a4525e7d1302a983c5fb4622ddc6e2 (cherry picked from commit cc30c17347308af647f413294aaf2dc9355abe8c)
-rw-r--r--packages/SystemUI/src/com/android/systemui/statusbar/events/SystemStatusAnimationScheduler.kt5
1 files changed, 5 insertions, 0 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/events/SystemStatusAnimationScheduler.kt b/packages/SystemUI/src/com/android/systemui/statusbar/events/SystemStatusAnimationScheduler.kt
index f1610d866f34..dcf8e739a76e 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/events/SystemStatusAnimationScheduler.kt
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/events/SystemStatusAnimationScheduler.kt
@@ -114,6 +114,10 @@ class SystemStatusAnimationScheduler @Inject constructor(
Log.d(TAG, "updating current event from: $event")
}
scheduledEvent?.updateFromEvent(event)
+ if (event.forceVisible) {
+ hasPersistentDot = true
+ notifyTransitionToPersistentDot()
+ }
} else {
if (DEBUG) {
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 (!event.showAnimation && event.forceVisible) {
notifyTransitionToPersistentDot()
+ scheduledEvent = null
return
}