diff --git a/CHANGELOG.md b/CHANGELOG.md index 7df0348fb..d2b02b840 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -74,6 +74,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - #3865 - Added a new nightly icon and app name ### Changed +- #3424 - Make talkback ignore ImageButton in Collection Selection by removing contentDescription and setting importantForAccessibility=no - #3278 - Updates strings in preferences - #2673 - Fixed can't upload files using third party apps from the file manager. - #1429 - Updated site permissions ui for MVP diff --git a/app/src/main/java/org/mozilla/fenix/collections/CollectionCreationUIView.kt b/app/src/main/java/org/mozilla/fenix/collections/CollectionCreationUIView.kt index 42704fb32..8fec68be0 100644 --- a/app/src/main/java/org/mozilla/fenix/collections/CollectionCreationUIView.kt +++ b/app/src/main/java/org/mozilla/fenix/collections/CollectionCreationUIView.kt @@ -144,7 +144,9 @@ class CollectionCreationUIView( val drawable = view.context.getDrawable(R.drawable.ic_close) drawable?.setTint(ContextCompat.getColor(view.context, R.color.photonWhite)) view.bottom_bar_icon_button.setImageDrawable(drawable) - + view.bottom_bar_icon_button.contentDescription = + view.context.getString(R.string.create_collection_close) + view.bottom_bar_icon_button.importantForAccessibility = View.IMPORTANT_FOR_ACCESSIBILITY_YES view.bottom_bar_icon_button.setOnClickListener { actionEmitter.onNext(CollectionCreationAction.Close) } @@ -203,10 +205,8 @@ class CollectionCreationUIView( val drawable = view.context.getDrawable(R.drawable.ic_new) drawable?.setTint(ContextCompat.getColor(view.context, R.color.photonWhite)) view.bottom_bar_icon_button.setImageDrawable(drawable) - view.bottom_bar_icon_button.setOnClickListener { - actionEmitter.onNext(CollectionCreationAction.AddNewCollection) - } - + view.bottom_bar_icon_button.contentDescription = null + view.bottom_bar_icon_button.importantForAccessibility = View.IMPORTANT_FOR_ACCESSIBILITY_NO view.bottom_button_bar_layout.isClickable = true view.bottom_button_bar_layout.setOnClickListener { actionEmitter.onNext(CollectionCreationAction.AddNewCollection) diff --git a/app/src/main/res/layout/component_collection_creation_select_collection.xml b/app/src/main/res/layout/component_collection_creation_select_collection.xml index ceef3ae8d..cf38431e9 100644 --- a/app/src/main/res/layout/component_collection_creation_select_collection.xml +++ b/app/src/main/res/layout/component_collection_creation_select_collection.xml @@ -121,9 +121,9 @@ android:layout_height="wrap_content" android:layout_margin="16dp" android:background="?android:attr/selectableItemBackground" - android:contentDescription="@string/create_collection_close" android:src="@drawable/ic_new" android:tint="?neutral" + android:importantForAccessibility="no" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" />