Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Not bypassing when the user is expanding quick settings" into qt-r1-dev

Browse Source
This commit is contained in:
Selim Cinek
2019-06-20 23:21:49 +00:00
committed by Android (Google) Code Review
parent a7719614c6 ae2702d1d6
commit cd29fce36d
2 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBypassController.kt
View File

@@ -49,6 +49,14 @@ class KeyguardBypassController {
private set private set
var bouncerShowing: Boolean = false var bouncerShowing: Boolean = false
var qSExpanded = false
set(value) {
val changed = field != value
field = value
if (changed && !value) {
maybePerformPendingUnlock()
}
}
@Inject @Inject
constructor(context: Context, tunerService: TunerService, constructor(context: Context, tunerService: TunerService,
@@ -98,7 +106,7 @@ class KeyguardBypassController {
// to unlock // to unlock
return false return false
} }
if (isPulseExpanding) { if (isPulseExpanding || qSExpanded) {
pendingUnlockType = biometricSourceType pendingUnlockType = biometricSourceType
return false return false
} }

1
packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java
View File

@@ -1387,6 +1387,7 @@ public class NotificationPanelView extends PanelView implements
mStatusBar.setQsExpanded(expanded); mStatusBar.setQsExpanded(expanded);
mNotificationContainerParent.setQsExpanded(expanded); mNotificationContainerParent.setQsExpanded(expanded);
mPulseExpansionHandler.setQsExpanded(expanded); mPulseExpansionHandler.setQsExpanded(expanded);
mKeyguardBypassController.setQSExpanded(expanded);
} }
} }