Merge pull request #3773 from pvagner/a11yAvatarVerbosity

a11y: change some content descriptions
2021-08-23 12:15:43 +02:00 · 2021-08-23 12:15:43 +02:00 · 18936122a8
parent b65ca7243c 395fc47777
commit 18936122a8
43 changed files with 74 additions and 76 deletions
--- a/vector/src/main/res/layout/activity_call.xml
+++ b/vector/src/main/res/layout/activity_call.xml
@ -76,7 +76,6 @@
        android:id="@+id/otherMemberAvatar"
        android:layout_width="80dp"
        android:layout_height="80dp"
-        android:contentDescription="@string/avatar"
        android:importantForAccessibility="no"
        android:scaleType="centerCrop"
        app:layout_constraintBottom_toBottomOf="parent"
--- a/vector/src/main/res/layout/alerter_verification_layout.xml
+++ b/vector/src/main/res/layout/alerter_verification_layout.xml
@ -12,7 +12,7 @@
        android:id="@+id/ivUserAvatar"
        android:layout_width="40dp"
        android:layout_height="40dp"
-        android:contentDescription="@string/avatar"
+        android:importantForAccessibility="no"
        app:layout_constraintBottom_toBottomOf="parent"
        app:layout_constraintEnd_toStartOf="@+id/alerter_texts"
        app:layout_constraintStart_toStartOf="parent"
--- a/vector/src/main/res/layout/bottom_sheet_invited_to_space.xml
+++ b/vector/src/main/res/layout/bottom_sheet_invited_to_space.xml
@ -25,7 +25,7 @@
                android:id="@+id/inviterAvatarImage"
                android:layout_width="40dp"
                android:layout_height="40dp"
-                android:contentDescription="@string/avatar"
+                android:importantForAccessibility="no"
                android:transitionName="profile"
                app:layout_constraintEnd_toEndOf="parent"
                app:layout_constraintHorizontal_bias="0"
--- a/vector/src/main/res/layout/bottom_sheet_room_widget_permission.xml
+++ b/vector/src/main/res/layout/bottom_sheet_room_widget_permission.xml
@ -45,7 +45,7 @@
            android:layout_width="40dp"
            android:layout_height="40dp"
            android:layout_gravity="center"
-            android:contentDescription="@string/avatar"
+            android:importantForAccessibility="no"
            tools:src="@sample/user_round_avatars" />

        <LinearLayout
--- a/vector/src/main/res/layout/bottom_sheet_verification.xml
+++ b/vector/src/main/res/layout/bottom_sheet_verification.xml
@ -21,7 +21,7 @@
            android:layout_marginStart="16dp"
            android:layout_marginTop="16dp"
            android:adjustViewBounds="true"
-            android:contentDescription="@string/avatar"
+            android:importantForAccessibility="no"
            android:scaleType="centerCrop"
            app:layout_constraintStart_toStartOf="parent"
            app:layout_constraintTop_toTopOf="parent"
--- a/vector/src/main/res/layout/composer_layout.xml
+++ b/vector/src/main/res/layout/composer_layout.xml
@ -29,7 +29,7 @@
        android:id="@+id/composerRelatedMessageAvatar"
        android:layout_width="0dp"
        android:layout_height="0dp"
-        android:contentDescription="@string/avatar"
+        android:importantForAccessibility="no"
        tools:ignore="MissingConstraints" />

    <TextView
--- a/vector/src/main/res/layout/composer_layout_constraint_set_compact.xml
+++ b/vector/src/main/res/layout/composer_layout_constraint_set_compact.xml
@ -32,7 +32,7 @@
        android:id="@+id/composerRelatedMessageAvatar"
        android:layout_width="40dp"
        android:layout_height="40dp"
-        android:contentDescription="@string/avatar"
+        android:importantForAccessibility="no"
        android:visibility="invisible"
        app:layout_constraintBottom_toTopOf="parent"
        app:layout_constraintEnd_toStartOf="parent" />
--- a/vector/src/main/res/layout/composer_layout_constraint_set_expanded.xml
+++ b/vector/src/main/res/layout/composer_layout_constraint_set_expanded.xml
@ -33,7 +33,7 @@
        android:layout_marginStart="8dp"
        android:layout_marginTop="8dp"
        android:layout_marginBottom="8dp"
-        android:contentDescription="@string/avatar"
+        android:importantForAccessibility="no"
        app:layout_constraintBottom_toTopOf="@id/composerRelatedMessageActionIcon"
        app:layout_constraintEnd_toStartOf="@+id/composerRelatedMessageTitle"
        app:layout_constraintStart_toStartOf="parent"
--- a/vector/src/main/res/layout/fragment_home_drawer.xml
+++ b/vector/src/main/res/layout/fragment_home_drawer.xml
@ -22,7 +22,7 @@
            android:layout_height="40dp"
            android:layout_marginStart="@dimen/layout_horizontal_margin"
            android:layout_marginTop="24dp"
-            android:contentDescription="@string/avatar"
+            android:importantForAccessibility="no"
            android:transitionName="profile"
            app:layout_constraintStart_toStartOf="parent"
            app:layout_constraintTop_toTopOf="parent"
--- a/vector/src/main/res/layout/fragment_login_account_created.xml
+++ b/vector/src/main/res/layout/fragment_login_account_created.xml
@ -60,7 +60,7 @@
                    android:id="@+id/loginAccountCreatedAvatar"
                    android:layout_width="44dp"
                    android:layout_height="44dp"
-                    android:contentDescription="@string/avatar"
+                    android:importantForAccessibility="no"
                    app:layout_constraintStart_toStartOf="parent"
                    app:layout_constraintTop_toTopOf="parent"
                    tools:src="@tools:sample/avatars" />
--- a/vector/src/main/res/layout/fragment_matrix_to_room_space_card.xml
+++ b/vector/src/main/res/layout/fragment_matrix_to_room_space_card.xml
@ -19,7 +19,7 @@
            android:layout_width="60dp"
            android:layout_height="60dp"
            android:layout_marginTop="20dp"
-            android:contentDescription="@string/avatar"
+            android:importantForAccessibility="no"
            android:elevation="4dp"
            android:transitionName="profile"
            app:layout_constraintEnd_toEndOf="parent"
--- a/vector/src/main/res/layout/fragment_room_detail.xml
+++ b/vector/src/main/res/layout/fragment_room_detail.xml
@ -29,7 +29,7 @@
                    android:layout_height="40dp"
                    android:layout_marginTop="8dp"
                    android:layout_marginBottom="8dp"
-                    android:contentDescription="@string/avatar"
+                    android:importantForAccessibility="no"
                    app:layout_constraintBottom_toBottomOf="parent"
                    app:layout_constraintStart_toStartOf="parent"
                    app:layout_constraintTop_toTopOf="parent"
--- a/vector/src/main/res/layout/fragment_room_preview_no_preview.xml
+++ b/vector/src/main/res/layout/fragment_room_preview_no_preview.xml
@ -31,7 +31,7 @@
                        android:layout_height="40dp"
                        android:layout_marginTop="8dp"
                        android:layout_marginBottom="8dp"
-                        android:contentDescription="@string/avatar"
+                        android:importantForAccessibility="no"
                        app:layout_constraintBottom_toBottomOf="parent"
                        app:layout_constraintStart_toStartOf="parent"
                        app:layout_constraintTop_toTopOf="parent"
--- a/vector/src/main/res/layout/fragment_room_setting_generic.xml
+++ b/vector/src/main/res/layout/fragment_room_setting_generic.xml
@ -31,7 +31,7 @@
                    android:layout_height="40dp"
                    android:layout_marginTop="8dp"
                    android:layout_marginBottom="8dp"
-                    android:contentDescription="@string/avatar"
+                    android:importantForAccessibility="no"
                    app:layout_constraintBottom_toBottomOf="parent"
                    app:layout_constraintStart_toStartOf="parent"
                    app:layout_constraintTop_toTopOf="parent"
--- a/vector/src/main/res/layout/fragment_room_uploads.xml
+++ b/vector/src/main/res/layout/fragment_room_uploads.xml
@ -29,7 +29,7 @@
                    android:layout_height="40dp"
                    android:layout_marginTop="8dp"
                    android:layout_marginBottom="8dp"
-                    android:contentDescription="@string/avatar"
+                    android:importantForAccessibility="no"
                    app:layout_constraintBottom_toBottomOf="parent"
                    app:layout_constraintStart_toStartOf="parent"
                    app:layout_constraintTop_toTopOf="parent"
--- a/vector/src/main/res/layout/fragment_space_preview.xml
+++ b/vector/src/main/res/layout/fragment_space_preview.xml
@ -33,7 +33,7 @@
                        android:layout_height="40dp"
                        android:layout_marginTop="8dp"
                        android:layout_marginBottom="8dp"
-                        android:contentDescription="@string/avatar"
+                        android:importantForAccessibility="no"
                        app:layout_constraintBottom_toBottomOf="parent"
                        app:layout_constraintStart_toStartOf="parent"
                        app:layout_constraintTop_toTopOf="parent"
--- a/vector/src/main/res/layout/fragment_user_code_show.xml
+++ b/vector/src/main/res/layout/fragment_user_code_show.xml
@ -135,6 +135,7 @@
                        android:id="@+id/showUserCodeQRImage"
                        android:layout_width="match_parent"
                        android:layout_height="match_parent"
+                        android:contentDescription="@string/a11y_qr_code_for_verification"
                        tools:src="@drawable/ic_qr_code_add" />

                </com.google.android.material.card.MaterialCardView>
@ -147,7 +148,7 @@
            android:id="@+id/showUserCodeAvatar"
            android:layout_width="76dp"
            android:layout_height="76dp"
-            android:contentDescription="@string/avatar"
+            android:importantForAccessibility="no"
            android:elevation="4dp"
            android:transitionName="profile"
            app:layout_constraintBottom_toTopOf="@id/showUserCodeCard"
--- a/vector/src/main/res/layout/item_bottom_sheet_room_preview.xml
+++ b/vector/src/main/res/layout/item_bottom_sheet_room_preview.xml
@ -16,7 +16,6 @@
        android:layout_marginBottom="8dp"
        android:adjustViewBounds="true"
        android:background="@drawable/circle"
-        android:contentDescription="@string/avatar"
        android:importantForAccessibility="no"
        android:scaleType="centerCrop"
        app:layout_constraintBottom_toBottomOf="parent"
--- a/vector/src/main/res/layout/item_contact_main.xml
+++ b/vector/src/main/res/layout/item_contact_main.xml
@ -14,7 +14,7 @@
        android:id="@+id/contactAvatar"
        android:layout_width="48dp"
        android:layout_height="48dp"
-        android:contentDescription="@string/avatar"
+        android:importantForAccessibility="no"
        app:layout_constraintBottom_toBottomOf="parent"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toTopOf="parent"
--- a/vector/src/main/res/layout/item_create_direct_room_user.xml
+++ b/vector/src/main/res/layout/item_create_direct_room_user.xml
@ -24,7 +24,7 @@
            android:id="@+id/createDirectRoomUserAvatar"
            android:layout_width="40dp"
            android:layout_height="40dp"
-            android:contentDescription="@string/avatar"
+            android:importantForAccessibility="no"
            tools:src="@sample/user_round_avatars" />

        <ImageView
--- a/vector/src/main/res/layout/item_display_read_receipt.xml
+++ b/vector/src/main/res/layout/item_display_read_receipt.xml
@ -16,7 +16,7 @@
        android:layout_width="32dp"
        android:layout_height="32dp"
        android:layout_marginEnd="8dp"
-        android:contentDescription="@string/avatar"
+        android:importantForAccessibility="no"
        tools:src="@sample/user_round_avatars" />

    <TextView
--- a/vector/src/main/res/layout/item_group.xml
+++ b/vector/src/main/res/layout/item_group.xml
@ -16,7 +16,7 @@
        android:layout_height="42dp"
        android:layout_gravity="center"
        android:layout_marginStart="@dimen/layout_horizontal_margin"
-        android:contentDescription="@string/avatar"
+        android:importantForAccessibility="no"
        android:duplicateParentState="true"
        app:layout_constraintBottom_toTopOf="@+id/groupBottomSeparator"
        app:layout_constraintStart_toStartOf="parent"
--- a/vector/src/main/res/layout/item_known_user.xml
+++ b/vector/src/main/res/layout/item_known_user.xml
@ -24,7 +24,7 @@
            android:id="@+id/knownUserAvatar"
            android:layout_width="40dp"
            android:layout_height="40dp"
-            android:contentDescription="@string/avatar"
+            android:importantForAccessibility="no"
            tools:src="@sample/user_round_avatars" />

        <ImageView
--- a/vector/src/main/res/layout/item_profile_matrix_item.xml
+++ b/vector/src/main/res/layout/item_profile_matrix_item.xml
@ -19,7 +19,7 @@
        android:layout_width="32dp"
        android:layout_height="32dp"
        android:layout_centerVertical="true"
-        android:contentDescription="@string/avatar"
+        android:importantForAccessibility="no"
        android:scaleType="centerInside"
        app:layout_constraintBottom_toBottomOf="parent"
        app:layout_constraintStart_toStartOf="parent"
--- a/vector/src/main/res/layout/item_profile_matrix_item_progress.xml
+++ b/vector/src/main/res/layout/item_profile_matrix_item_progress.xml
@ -19,7 +19,7 @@
        android:layout_width="32dp"
        android:layout_height="32dp"
        android:layout_centerVertical="true"
-        android:contentDescription="@string/avatar"
+        android:importantForAccessibility="no"
        android:scaleType="centerInside"
        app:layout_constraintBottom_toBottomOf="parent"
        app:layout_constraintStart_toStartOf="parent"
--- a/vector/src/main/res/layout/item_public_room.xml
+++ b/vector/src/main/res/layout/item_public_room.xml
@ -17,7 +17,7 @@
        android:layout_width="56dp"
        android:layout_height="56dp"
        android:layout_marginStart="8dp"
-        android:contentDescription="@string/avatar"
+        android:importantForAccessibility="no"
        app:layout_constraintBottom_toTopOf="@+id/itemPublicRoomBottomSeparator"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toTopOf="parent"
--- a/vector/src/main/res/layout/item_room.xml
+++ b/vector/src/main/res/layout/item_room.xml
@ -34,7 +34,7 @@
            android:id="@+id/roomAvatarImageView"
            android:layout_width="56dp"
            android:layout_height="56dp"
-            android:contentDescription="@string/avatar"
+            android:importantForAccessibility="no"
            tools:src="@sample/room_round_avatars" />

        <ImageView
--- a/vector/src/main/res/layout/item_room_directory.xml
+++ b/vector/src/main/res/layout/item_room_directory.xml
@ -18,7 +18,7 @@
        android:layout_marginTop="4dp"
        android:layout_marginBottom="4dp"
        android:background="@drawable/circle"
-        android:contentDescription="@string/avatar"
+        android:importantForAccessibility="no"
        android:padding="8dp"
        app:layout_constraintBottom_toBottomOf="parent"
        app:layout_constraintStart_toStartOf="parent"
@ -71,7 +71,7 @@
        android:layout_height="wrap_content"
        android:layout_marginStart="@dimen/layout_horizontal_margin"
        android:layout_marginEnd="@dimen/layout_horizontal_margin"
-        android:contentDescription="@string/avatar"
+        android:contentDescription="@string/a11y_selected"
        android:padding="8dp"
        android:src="@drawable/ic_check_on"
        android:visibility="gone"
--- a/vector/src/main/res/layout/item_room_directory_server.xml
+++ b/vector/src/main/res/layout/item_room_directory_server.xml
@ -53,7 +53,7 @@
        android:layout_height="wrap_content"
        android:layout_marginStart="@dimen/layout_horizontal_margin"
        android:layout_marginEnd="@dimen/layout_horizontal_margin"
-        android:contentDescription="@string/avatar"
+        android:contentDescription="@string/remove"
        android:padding="8dp"
        android:src="@drawable/ic_delete"
        android:visibility="gone"
--- a/vector/src/main/res/layout/item_room_invitation.xml
+++ b/vector/src/main/res/layout/item_room_invitation.xml
@ -16,7 +16,7 @@
        android:layout_height="56dp"
        android:layout_marginStart="8dp"
        android:layout_marginTop="12dp"
-        android:contentDescription="@string/avatar"
+        android:importantForAccessibility="no"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toTopOf="parent"
        tools:src="@sample/room_round_avatars" />
--- a/vector/src/main/res/layout/item_room_to_add_in_space.xml
+++ b/vector/src/main/res/layout/item_room_to_add_in_space.xml
@ -16,7 +16,7 @@
        android:layout_width="32dp"
        android:layout_height="32dp"
        android:layout_marginStart="16dp"
-        android:contentDescription="@string/avatar"
+        android:importantForAccessibility="no"
        app:layout_constraintBottom_toBottomOf="parent"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toTopOf="parent"
--- a/vector/src/main/res/layout/item_room_to_manage_in_space.xml
+++ b/vector/src/main/res/layout/item_room_to_manage_in_space.xml
@ -16,7 +16,7 @@
        android:layout_width="32dp"
        android:layout_height="32dp"
        android:layout_marginStart="16dp"
-        android:contentDescription="@string/avatar"
+        android:importantForAccessibility="no"
        app:layout_constraintBottom_toBottomOf="parent"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toTopOf="parent"
--- a/vector/src/main/res/layout/item_search_result.xml
+++ b/vector/src/main/res/layout/item_search_result.xml
@ -12,7 +12,7 @@
        android:layout_height="44dp"
        android:layout_marginStart="8dp"
        android:layout_marginTop="4dp"
-        android:contentDescription="@string/avatar"
+        android:importantForAccessibility="no"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toTopOf="parent"
        tools:src="@sample/user_round_avatars" />
--- a/vector/src/main/res/layout/item_space.xml
+++ b/vector/src/main/res/layout/item_space.xml
@ -26,7 +26,7 @@
        android:layout_height="42dp"
        android:layout_gravity="center"
        android:layout_marginStart="@dimen/layout_horizontal_margin"
-        android:contentDescription="@string/avatar"
+        android:importantForAccessibility="no"
        android:duplicateParentState="true"
        app:layout_constraintBottom_toTopOf="@+id/groupBottomSeparator"
        app:layout_constraintStart_toEndOf="@id/indent"
--- a/vector/src/main/res/layout/item_space_add.xml
+++ b/vector/src/main/res/layout/item_space_add.xml
@ -18,7 +18,6 @@
        android:layout_marginStart="@dimen/layout_horizontal_margin"
        android:background="@drawable/rounded_rect_shape_8"
        android:backgroundTint="?colorPrimary"
-        android:contentDescription="@string/avatar"
        android:duplicateParentState="true"
        android:importantForAccessibility="no"
        android:padding="10dp"
--- a/vector/src/main/res/layout/item_space_roomchild.xml
+++ b/vector/src/main/res/layout/item_space_roomchild.xml
@ -31,7 +31,7 @@
            android:layout_height="40dp"
            android:layout_marginStart="8dp"
            android:layout_marginTop="12dp"
-            android:contentDescription="@string/avatar"
+            android:importantForAccessibility="no"
            android:scaleType="centerInside"
            android:visibility="visible"
            app:layout_constraintStart_toStartOf="parent"
--- a/vector/src/main/res/layout/item_sub_space.xml
+++ b/vector/src/main/res/layout/item_sub_space.xml
@ -26,7 +26,7 @@
        android:layout_height="26dp"
        android:layout_gravity="center"
        android:layout_marginStart="@dimen/layout_horizontal_margin"
-        android:contentDescription="@string/avatar"
+        android:importantForAccessibility="no"
        android:duplicateParentState="true"
        app:layout_constraintBottom_toBottomOf="parent"
        app:layout_constraintStart_toEndOf="@id/indent"
--- a/vector/src/main/res/layout/item_suggested_room.xml
+++ b/vector/src/main/res/layout/item_suggested_room.xml
@ -21,7 +21,7 @@
            android:id="@+id/roomAvatarImageView"
            android:layout_width="56dp"
            android:layout_height="56dp"
-            android:contentDescription="@string/avatar"
+            android:importantForAccessibility="no"
            tools:src="@sample/room_round_avatars" />

    </FrameLayout>
--- a/vector/src/main/res/layout/item_timeline_event_call_tile_stub.xml
+++ b/vector/src/main/res/layout/item_timeline_event_call_tile_stub.xml
@ -11,7 +11,7 @@
        android:layout_width="40dp"
        android:layout_height="40dp"
        android:layout_gravity="center_horizontal"
-        android:contentDescription="@string/avatar"
+        android:importantForAccessibility="no"
        tools:src="@sample/user_round_avatars" />

    <TextView
--- a/vector/src/main/res/layout/item_unknown_room.xml
+++ b/vector/src/main/res/layout/item_unknown_room.xml
@ -17,7 +17,7 @@
        android:layout_width="56dp"
        android:layout_height="56dp"
        android:layout_marginStart="8dp"
-        android:contentDescription="@string/avatar"
+        android:importantForAccessibility="no"
        app:layout_constraintBottom_toTopOf="@+id/itemPublicRoomBottomSeparator"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toTopOf="parent"
--- a/vector/src/main/res/layout/item_user.xml
+++ b/vector/src/main/res/layout/item_user.xml
@ -16,7 +16,7 @@
        android:layout_width="40dp"
        android:layout_height="40dp"
        android:layout_marginStart="8dp"
-        android:contentDescription="@string/avatar"
+        android:importantForAccessibility="no"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toTopOf="parent"
        tools:src="@sample/user_round_avatars" />
--- a/vector/src/main/res/layout/vector_invite_view.xml
+++ b/vector/src/main/res/layout/vector_invite_view.xml
@ -13,7 +13,7 @@
        android:layout_marginStart="8dp"
        android:layout_marginTop="86dp"
        android:layout_marginEnd="8dp"
-        android:contentDescription="@string/avatar"
+        android:importantForAccessibility="no"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toTopOf="parent"
--- a/vector/src/main/res/values/strings.xml
+++ b/vector/src/main/res/values/strings.xml
@ -3305,7 +3305,7 @@
    <string name="a11y_change_avatar">Change avatar</string>
    <string name="a11y_delete_avatar">Delete avatar</string>
    <string name="a11y_error_some_message_not_sent">Some messages have not been sent</string>
-    <string name="a11y_unsent_draft">This room has unsent draft</string>
+    <string name="a11y_unsent_draft">has unsent draft</string>
    <string name="a11y_video">Video</string>
    <string name="a11y_selected">Selected</string>
    <string name="a11y_trust_level_default">Default trust level</string>
@ -3320,8 +3320,8 @@
    <string name="a11y_rule_notify_silent">Notify without sound</string>
    <string name="a11y_rule_notify_off">Do not notify</string>
    <string name="a11y_view_read_receipts">View read receipts</string>
-    <string name="a11y_public_room">This room is public</string>
-    <string name="a11y_public_space">This Space is public</string>
+    <string name="a11y_public_room">Public room</string>
+    <string name="a11y_public_space">Public space</string>

    <string name="dev_tools_menu_name">Dev Tools</string>
    <string name="dev_tools_explore_room_state">Explore Room State</string>