commit | 9e2889023ef00f26ec54f36dfba371689713a2a7 | [log] [tgz] |
---|---|---|
author | Brad Hinegardner <bhinegardner@google.com> | Thu Jun 06 14:12:26 2024 -0400 |
committer | Chandru S <chandruis@google.com> | Fri Jun 07 23:55:39 2024 +0000 |
tree | 301b525bb98f2775cce4dc38700bdde6dd4761b7 | |
parent | 88178f7cdc2fcd2ae06c662709af5492fcd5043f [diff] |
Enable a11y actions on lock icon in non-udfps devices We do not want the lock icon to be interactive in non udfps devices when a11y actions are disabled. However, when a11y acttions are enabled, the lock icon should be interactive on all devices. Fixes: 344493721 Test: manual - enable talkback on non-udfps device and able to trigger bouncer from lock icon Flag: com.android.systemui.device_entry_udfps_refactor Change-Id: I8a931e0a000d1aecb300b1ccc997ce4ed08a6b37
diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/ui/viewmodel/DeviceEntryIconViewModelTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/ui/viewmodel/DeviceEntryIconViewModelTest.kt index 68fbd1c..3f93401 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/ui/viewmodel/DeviceEntryIconViewModelTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/ui/viewmodel/DeviceEntryIconViewModelTest.kt
@@ -227,11 +227,11 @@ assertThat(accessibilityDelegateHint) .isEqualTo(DeviceEntryIconView.AccessibilityHintType.AUTHENTICATE) - // non-interactive lock icon + // interactive lock icon for non udfps as well so that user can navigate to bouncer fingerprintPropertyRepository.supportsRearFps() assertThat(accessibilityDelegateHint) - .isEqualTo(DeviceEntryIconView.AccessibilityHintType.NONE) + .isEqualTo(DeviceEntryIconView.AccessibilityHintType.AUTHENTICATE) } @Test
diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/DeviceEntryIconViewModel.kt b/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/DeviceEntryIconViewModel.kt index fa43ec2..92bba38 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/DeviceEntryIconViewModel.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/DeviceEntryIconViewModel.kt
@@ -264,7 +264,7 @@ accessibilityInteractor.isEnabled.flatMapLatest { touchExplorationEnabled -> if (touchExplorationEnabled) { combine(iconType, isInteractive) { iconType, isInteractive -> - if (isInteractive) { + if (isInteractive || iconType == DeviceEntryIconView.IconType.LOCK) { iconType.toAccessibilityHintType() } else { DeviceEntryIconView.AccessibilityHintType.NONE