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

Commit e407396e authored by Beverly's avatar Beverly
Browse files

Update device entry icon label and a11y action 

Previously there was no content description so
the device entry icon was announced as unlabled.

Update the a11y action for the device entry
icon to accurately represent a longpress, not
a click.

Fixes: 336313562
Flag: ACONFIG com.android.systemui.device_entry_udfps_refactor NEXTFOOD
Test: manually enable a11y and select device entry icon. observe
the correct label & hint is announced.

Change-Id: I91fef201f56636cdb0c8306a665ab4f6acbadac7
parent 26d9dcb8

packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/DeviceEntryIconViewBinder.kt

+2 −0
Original line number Diff line number Diff line
@@ -128,6 +128,8 @@ object DeviceEntryIconViewBinder { 
                            view.getIconState(viewModel.type, viewModel.useAodVariant),

                            /* merge */ false

                        )

                        fgIconView.contentDescription =

                            fgIconView.resources.getString(viewModel.type.contentDescriptionResId)

                        fgIconView.imageTintList = ColorStateList.valueOf(viewModel.tint)

                        fgIconView.setPadding(

                            viewModel.padding,

packages/SystemUI/src/com/android/systemui/keyguard/ui/view/DeviceEntryIconView.kt

+6 −6
Original line number Diff line number Diff line
@@ -68,12 +68,12 @@ constructor( 
            object : AccessibilityDelegate() {

                private val accessibilityAuthenticateHint =

                    AccessibilityNodeInfo.AccessibilityAction(

                        AccessibilityNodeInfoCompat.ACTION_CLICK,

                        AccessibilityNodeInfoCompat.ACTION_LONG_CLICK,

                        resources.getString(R.string.accessibility_authenticate_hint)

                    )

                private val accessibilityEnterHint =

                    AccessibilityNodeInfo.AccessibilityAction(

                        AccessibilityNodeInfoCompat.ACTION_CLICK,

                        AccessibilityNodeInfoCompat.ACTION_LONG_CLICK,

                        resources.getString(R.string.accessibility_enter_hint)

                    )

                override fun onInitializeAccessibilityNodeInfo(
@@ -261,10 +261,10 @@ constructor( 
        return lockIconState

    }



    enum class IconType {

        LOCK,

        UNLOCK,

        FINGERPRINT,

    enum class IconType(val contentDescriptionResId: Int) {

        LOCK(R.string.accessibility_lock_icon),

        UNLOCK(R.string.accessibility_unlock_button),

        FINGERPRINT(R.string.accessibility_fingerprint_label),

    }



    enum class AccessibilityHintType {