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

Commit 90d82974 authored by Brad Hinegardner's avatar Brad Hinegardner Committed by Android (Google) Code Review
Browse files

Merge "Enable a11y actions on lock icon in non-udfps devices" into main

parents 630caf05 9e288902

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