From c467e62734e6ebba7492d4f9f1816ebd3b0e6e9e Mon Sep 17 00:00:00 2001 From: Selim Cinek Date: Tue, 30 Mar 2021 12:09:04 +0000 Subject: [PATCH 1/2] Fixed an issue where the user would have no notifications on lockscreen When pressing power twice the user could be stuck in a state with the notifications hidden Fixes: 184028145 Test: double tap power quickly (longer than camera) observe normal notifications Change-Id: Ibd18d410dd16f2fcd125eee9d371c8a540fe28f1 --- .../statusbar/notification/NotificationWakeUpCoordinator.kt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationWakeUpCoordinator.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationWakeUpCoordinator.kt index 50cbbd5d48526..91a4f94eea436 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationWakeUpCoordinator.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationWakeUpCoordinator.kt @@ -393,6 +393,11 @@ class NotificationWakeUpCoordinator @Inject constructor( override fun onDozingChanged(isDozing: Boolean) { if (isDozing) { setNotificationsVisible(visible = false, animate = false, increaseSpeed = false) + } else { + // We only unset the flag once we fully went asleep. If the user interrupts the + // animation in the middle, we have to abort the animation as well to make sure + // the notifications are visible again. + animatingScreenOff = false } } From 6950e65cc40dec9b4ef9d808a0c4b25dd88d441f Mon Sep 17 00:00:00 2001 From: Selim Cinek Date: Wed, 10 Mar 2021 14:06:03 +0000 Subject: [PATCH 2/2] Updating owners of SystemUI Bug: N/A Change-Id: Iab923d09542447869d19b63326af2ec156900337 Test: ensure new owners work --- packages/SystemUI/OWNERS | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/packages/SystemUI/OWNERS b/packages/SystemUI/OWNERS index f884270eaba85..835471d5cb948 100644 --- a/packages/SystemUI/OWNERS +++ b/packages/SystemUI/OWNERS @@ -9,6 +9,7 @@ asc@google.com awickham@google.com beverlyt@google.com brockman@google.com +ccassidy@google.com cinek@google.com cwren@google.com dupin@google.com @@ -19,10 +20,10 @@ hwwang@google.com hyunyoungs@google.com jaggies@google.com jamesoleary@google.com +jdemeulenaere@google.com jeffdq@google.com jjaggi@google.com jonmiranda@google.com -joshmcgrath@google.com joshtrask@google.com juliacr@google.com juliatuttle@google.com @@ -37,7 +38,6 @@ mkephart@google.com mpietal@google.com mrcasey@google.com mrenouf@google.com -nbenbernou@google.com nesciosquid@google.com ogunwale@google.com peanutbutter@google.com @@ -45,6 +45,7 @@ pinyaoting@google.com pixel@google.com roosa@google.com santie@google.com +shanh@google.com snoeberger@google.com sreyasr@google.com steell@google.com @@ -59,6 +60,7 @@ twickham@google.com vadimt@google.com victortulias@google.com winsonc@google.com +yurilin@google.com xuqiu@google.com zakcohen@google.com