Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9e288902 authored by Brad Hinegardner's avatar Brad Hinegardner Committed by Chandru S
Browse files

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
parent 88178f7c

packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/ui/viewmodel/DeviceEntryIconViewModelTest.kt

+2 −2
Original line number Diff line number Diff line
@@ -227,11 +227,11 @@ class DeviceEntryIconViewModelTest : SysuiTestCase() { 
            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

packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/DeviceEntryIconViewModel.kt

+1 −1
Original line number Diff line number Diff line
@@ -264,7 +264,7 @@ constructor( 
        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