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

Merge "Fix Biometric prompt is getting dismissed while receiving the heads-up notification" into udc-dev

Browse Source
This commit is contained in:
Vincent Wang
2023-04-12 06:00:20 +00:00
committed by Android (Google) Code Review
parent be0315f944 28ba1dd2cb
commit 5a0eb9c2ae
2 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/SystemUI/src/com/android/systemui/biometrics/AuthDialogPanelInteractionDetector.kt
View File

@@ -39,7 +39,7 @@ constructor(
private fun onPanelExpansionChanged(event: ShadeExpansionChangeEvent) =
mainExecutor.execute {
action?.let {
if (event.tracking || event.expanded) {
if (event.tracking || (event.expanded && event.fraction > 0)) {
Log.v(TAG, "Detected panel interaction, event: $event")
it.onPanelInteraction.run()
disable()

19
packages/SystemUI/tests/src/com/android/systemui/biometrics/AuthDialogPanelInteractionDetectorTest.kt
View File

@@ -51,32 +51,37 @@ class AuthDialogPanelInteractionDetectorTest : SysuiTestCase() {
@Test
fun testEnableDetector_expandWithTrack_shouldPostRunnable() {
detector.enable(action)
// simulate notification expand
shadeExpansionStateManager.onPanelExpansionChanged(5566f, true, true, 5566f)
shadeExpansionStateManager.onPanelExpansionChanged(1.0f, true, true, 0f)
verify(action).run()
}
@Test
fun testEnableDetector_trackOnly_shouldPostRunnable() {
detector.enable(action)
// simulate notification expand
shadeExpansionStateManager.onPanelExpansionChanged(5566f, false, true, 5566f)
shadeExpansionStateManager.onPanelExpansionChanged(1.0f, false, true, 0f)
verify(action).run()
}
@Test
fun testEnableDetector_expandOnly_shouldPostRunnable() {
detector.enable(action)
// simulate notification expand
shadeExpansionStateManager.onPanelExpansionChanged(5566f, true, false, 5566f)
shadeExpansionStateManager.onPanelExpansionChanged(1.0f, true, false, 0f)
verify(action).run()
}
@Test
fun testEnableDetector_expandWithoutFraction_shouldPostRunnable() {
detector.enable(action)
// simulate headsup notification
shadeExpansionStateManager.onPanelExpansionChanged(0.0f, true, false, 0f)
verifyZeroInteractions(action)
}
@Test
fun testEnableDetector_shouldNotPostRunnable() {
detector.enable(action)
detector.disable()
shadeExpansionStateManager.onPanelExpansionChanged(5566f, true, true, 5566f)
shadeExpansionStateManager.onPanelExpansionChanged(1.0f, true, true, 0f)
verifyZeroInteractions(action)
}
}