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

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

Merge "Fingerprint sensor should be AccessibilityHintType BOUNCER" into main

parents 28632ca3 d881cd5a

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

+9 −0
Original line number Diff line number Diff line
@@ -224,6 +224,15 @@ class DeviceEntryIconViewModelTest : SysuiTestCase() { 
            // interactive lock icon

            setUpState(isUdfpsSupported = true)



            assertThat(accessibilityDelegateHint)

                .isEqualTo(DeviceEntryIconView.AccessibilityHintType.BOUNCER)



            // udfps running

            setUpState(

                isUdfpsSupported = true,

                isUdfpsRunning = true,

            )



            assertThat(accessibilityDelegateHint)

                .isEqualTo(DeviceEntryIconView.AccessibilityHintType.BOUNCER)

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

+1 −1
Original line number Diff line number Diff line
@@ -284,9 +284,9 @@ constructor( 
    private fun DeviceEntryIconView.IconType.toAccessibilityHintType():

        DeviceEntryIconView.AccessibilityHintType {

        return when (this) {

            DeviceEntryIconView.IconType.FINGERPRINT,

            DeviceEntryIconView.IconType.LOCK -> DeviceEntryIconView.AccessibilityHintType.BOUNCER

            DeviceEntryIconView.IconType.UNLOCK -> DeviceEntryIconView.AccessibilityHintType.ENTER

            DeviceEntryIconView.IconType.FINGERPRINT,

            DeviceEntryIconView.IconType.NONE -> DeviceEntryIconView.AccessibilityHintType.NONE

        }

    }