Not bypassing when the user is expanding quick settings
Previously we would also bypass when the user would
look at QS.
Fixes: 134094877
Test: pull down QS, wait on bypass, nothing happens!
Change-Id: I0b2ec98f3c361307845c16cc27866c6f3b3d4136
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBypassController.kt b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBypassController.kt
index 4be4d90..fbd6adc 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBypassController.kt
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBypassController.kt
@@ -49,6 +49,14 @@
private set
var bouncerShowing: Boolean = false
+ var qSExpanded = false
+ set(value) {
+ val changed = field != value
+ field = value
+ if (changed && !value) {
+ maybePerformPendingUnlock()
+ }
+ }
@Inject
constructor(context: Context, tunerService: TunerService,
@@ -98,7 +106,7 @@
// to unlock
return false
}
- if (isPulseExpanding) {
+ if (isPulseExpanding || qSExpanded) {
pendingUnlockType = biometricSourceType
return false
}
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java
index e805575..bbbb9b1 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java
@@ -1384,6 +1384,7 @@
mStatusBar.setQsExpanded(expanded);
mNotificationContainerParent.setQsExpanded(expanded);
mPulseExpansionHandler.setQsExpanded(expanded);
+ mKeyguardBypassController.setQSExpanded(expanded);
}
}
