fix(presentation): Make changes to support accessibility according to guidelines.

account-manager/presentation/src/main/res/layout/account_primary_view.xml

@@ -32,6 +32,7 @@
         android:layout_height="0dp"
         android:background="@drawable/background_account_initials"
         android:gravity="center"
+        android:importantForAccessibility="no"
         android:textColor="@color/white"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintDimensionRatio="1"

auth/presentation/src/main/res/layout/activity_login.xml

@@ -33,6 +33,7 @@
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            app:navigationContentDescription="@string/presentation_close"
             app:navigationIcon="@drawable/ic_proton_close"
             tools:title="Title" />
 

auth/presentation/src/main/res/layout/fragment_signup_choose_password.xml

@@ -33,6 +33,7 @@
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            app:navigationContentDescription="@string/presentation_back"
             tools:title="Title" />
 
     </com.google.android.material.appbar.AppBarLayout>

auth/presentation/src/main/res/layout/fragment_signup_choose_username.xml

@@ -33,6 +33,7 @@
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            app:navigationContentDescription="@string/presentation_close"
             app:navigationIcon="@drawable/ic_proton_close"
             tools:title="Title" />
 

auth/presentation/src/main/res/layout/fragment_signup_recovery.xml

@@ -38,6 +38,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 app:menu="@menu/recovery_menu"
+                app:navigationContentDescription="@string/presentation_back"
                 tools:title="Title" />
 
         </com.google.android.material.appbar.AppBarLayout>

challenge/presentation/src/main/res/layout/proton_metadata_input.xml

@@ -33,6 +33,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginBottom="@dimen/input_padding"
+        android:labelFor="@id/input"
         android:visibility="gone"
         tools:text="Input Header"
         tools:visibility="visible" />

human-verification/presentation/src/main/res/layout/dialog_human_verification_main.xml

@@ -34,6 +34,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             app:menu="@menu/help_menu"
+            app:navigationContentDescription="@string/presentation_close"
             app:navigationIcon="@drawable/ic_proton_close"
             app:title="@string/human_verification_title"
             tools:title="Title" />

human-verification/presentation/src/main/res/layout/dialog_human_verification_v3.xml

@@ -34,6 +34,7 @@
             android:layout_width="match_parent"
             android:layout_height="?actionBarSize"
             app:menu="@menu/help_menu"
+            app:navigationContentDescription="@string/presentation_close"
             app:navigationIcon="@drawable/ic_proton_close"
             app:title="@string/human_verification_title"
             tools:title="Title" />

human-verification/presentation/src/main/res/layout/fragment_human_verification_help.xml

@@ -33,6 +33,7 @@
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            app:navigationContentDescription="@string/presentation_close"
             app:navigationIcon="@drawable/ic_proton_close"
             app:title="@string/human_verification_help"
             tools:title="Title" />

plan/presentation/src/main/res/layout/fragment_plans_upgrade.xml

@@ -33,6 +33,7 @@
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            app:navigationContentDescription="@string/presentation_back"
             tools:title="Title" />
 
     </com.google.android.material.appbar.AppBarLayout>

presentation-compose/src/main/kotlin/me/proton/core/compose/component/ProtonListItem.kt

@@ -127,7 +127,7 @@ fun ProtonListItem(
     onClick: () -> Unit = {},
 ) {
     ProtonListItem(
-        modifier = modifier.semantics(mergeDescendants = true) { contentDescription = text },
+        modifier = modifier.semantics(mergeDescendants = true) { },
         onClick = onClick,
         isClickable = isClickable,
         isSelected = isSelected,

presentation-compose/src/main/kotlin/me/proton/core/compose/component/ProtonSettings.kt

@@ -28,9 +28,12 @@ import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.offset
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.sizeIn
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.LazyListScope
 import androidx.compose.foundation.lazy.rememberLazyListState
+import androidx.compose.foundation.selection.selectable
+import androidx.compose.foundation.selection.toggleable
 import androidx.compose.material.Icon
 import androidx.compose.material.IconButton
 import androidx.compose.material.RadioButton
@@ -44,8 +47,7 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.semantics.contentDescription
-import androidx.compose.ui.semantics.heading
+import androidx.compose.ui.semantics.Role
 import androidx.compose.ui.semantics.semantics
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
@@ -53,6 +55,7 @@ import me.proton.core.compose.component.appbar.ProtonTopAppBar
 import me.proton.core.compose.theme.ProtonDimens
 import me.proton.core.compose.theme.ProtonTheme
 import me.proton.core.compose.theme.textNorm
+import me.proton.core.presentation.compose.R
 
 /**
  * A full-size [LazyColumn] list styled with [ProtonTheme]
@@ -93,7 +96,7 @@ fun ProtonSettingsTopBar(
         title = { Text(title) },
         navigationIcon = {
             IconButton(onClick = onBackClick) {
-                Icon(Icons.Filled.ArrowBack, contentDescription = "Back")
+                Icon(Icons.Filled.ArrowBack, contentDescription = stringResource(id = R.string.presentation_back))
             }
         }
     )
@@ -146,10 +149,7 @@ fun ProtonSettingsItem(
     ) {
         Column(
             modifier = Modifier
-                .semantics(mergeDescendants = true) {
-                    contentDescription = name
-                    heading()
-                }
+                .semantics(mergeDescendants = true) {}
                 .fillMaxWidth(),
         ) {
             Text(
@@ -180,40 +180,38 @@ fun ProtonSettingsToggleItem(
 ) {
     val isSwitchChecked = value ?: false
     val isViewEnabled = value != null
-    ProtonRawListItem(
+    Column(
         modifier = modifier
-            .clickable(enabled = isViewEnabled, onClick = { onToggle(!isSwitchChecked) })
-            .padding(
-                horizontal = ProtonDimens.DefaultSpacing
-            )
+            .toggleable(
+                value = isSwitchChecked,
+                enabled = isViewEnabled,
+                role = Role.Switch
+            ) { onToggle(!isSwitchChecked) }
+            .padding(horizontal = ProtonDimens.DefaultSpacing),
+        verticalArrangement = Arrangement.SpaceBetween
     ) {
-        Column(
-            modifier = Modifier
-                .semantics(mergeDescendants = true) {
-                    contentDescription = name
-                    heading()
-                }
+        ProtonRawListItem(
+            modifier = Modifier.sizeIn(minHeight = ProtonDimens.ListItemHeight),
+            horizontalArrangement = Arrangement.SpaceBetween
         ) {
-            ProtonRawListItem(horizontalArrangement = Arrangement.SpaceBetween) {
-                Text(
-                    text = name,
-                    color = ProtonTheme.colors.textNorm(isViewEnabled),
-                    style = ProtonTheme.typography.body1Regular
-                )
-                Switch(
-                    checked = isSwitchChecked,
-                    onCheckedChange = onToggle,
-                    enabled = isViewEnabled
-                )
-            }
-            hint?.let {
-                Text(
-                    modifier = Modifier.offset(y = toggleItemNegativeOffset),
-                    text = hint,
-                    color = ProtonTheme.colors.textHint,
-                    style = ProtonTheme.typography.body2Regular
-                )
-            }
+            Text(
+                text = name,
+                color = ProtonTheme.colors.textNorm(isViewEnabled),
+                style = ProtonTheme.typography.body1Regular
+            )
+            Switch(
+                checked = isSwitchChecked,
+                onCheckedChange = null,
+                enabled = isViewEnabled
+            )
+        }
+        hint?.let {
+            Text(
+                modifier = Modifier.offset(y = toggleItemNegativeOffset),
+                text = hint,
+                color = ProtonTheme.colors.textHint,
+                style = ProtonTheme.typography.body2Regular
+            )
         }
     }
 }
@@ -227,10 +225,9 @@ fun ProtonSettingsRadioItem(
 ) {
     ProtonRawListItem(
         modifier = modifier
-            .clickable { onItemSelected(name) }
-            .padding(
-                horizontal = ProtonDimens.DefaultSpacing
-            ),
+            .selectable(selected = isSelected, role = Role.RadioButton) { onItemSelected(name) }
+            .sizeIn(minHeight = ProtonDimens.ListItemHeight)
+            .padding(horizontal = ProtonDimens.DefaultSpacing),
         horizontalArrangement = Arrangement.SpaceBetween
     ) {
         Text(
@@ -240,7 +237,7 @@ fun ProtonSettingsRadioItem(
         )
         RadioButton(
             selected = isSelected,
-            onClick = { onItemSelected(name) }
+            onClick = null
         )
     }
 }

presentation/src/main/res/layout/proton_autocomplete_input.xml

@@ -31,6 +31,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginBottom="@dimen/input_padding"
+        android:labelFor="@id/input"
         android:visibility="gone"
         tools:text="Input Header"
         tools:visibility="gone" />

presentation/src/main/res/layout/proton_input.xml

@@ -31,6 +31,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginBottom="@dimen/input_padding"
+        android:labelFor="@id/input"
         android:visibility="gone"
         tools:text="Input Header"
         tools:visibility="visible" />

presentation/src/main/res/values/strings.xml

@@ -42,6 +42,7 @@
     <string name="presentation_menu_item_title_sign_out">Sign out</string>
 
     <!-- Other -->
+    <string name="presentation_back">Back</string>
     <string name="presentation_close">Close</string>
     <string name="presentation_skip">Skip</string>
     <string name="presentation_phone_calling_code_template">+%s</string>

user-settings/presentation/src/main/res/layout/activity_password_management.xml

@@ -31,6 +31,7 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
+        app:navigationContentDescription="@string/presentation_back"
         tools:title="Title" />
 
     <FrameLayout