Merge "Update device entry icon label and a11y action" into main (74a64c1f) · Commits · e / os / android_frameworks_base

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,

+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 {