diff options
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/DeviceEntryIconViewBinder.kt | 2 | ||||
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/keyguard/ui/view/DeviceEntryIconView.kt | 12 |
2 files changed, 8 insertions, 6 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/DeviceEntryIconViewBinder.kt b/packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/DeviceEntryIconViewBinder.kt index f46a207b273a..cccb93c56d94 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/DeviceEntryIconViewBinder.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/DeviceEntryIconViewBinder.kt @@ -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, diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/ui/view/DeviceEntryIconView.kt b/packages/SystemUI/src/com/android/systemui/keyguard/ui/view/DeviceEntryIconView.kt index af1d0df92652..2735aed3ba4d 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/ui/view/DeviceEntryIconView.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/ui/view/DeviceEntryIconView.kt @@ -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 { |