Fixes part of #2616: Admin Auth Screen[a11y]

Fixes the TalkBack response for disabled submit button by adding content description
oppia · Feb 7, 2021 · 7b44e1f · 7b44e1f
1 parent c69b3ef
commit 7b44e1f
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 0 deletions.
diff --git a/app/src/main/res/layout-land/admin_auth_activity.xml b/app/src/main/res/layout-land/admin_auth_activity.xml
@@ -117,6 +117,7 @@
  android:layout_marginTop="44dp"
  android:background="@{viewModel.isSubmitButtonActive ? @drawable/state_button_primary_background :@drawable/start_button_transparent_background}"
  android:clickable="@{viewModel.isSubmitButtonActive}"
+ android:contentDescription="@{viewModel.isSubmitButtonActive? @string/admin_auth_submit : @string/admin_auth_submit_disabled}"
  android:minHeight="48dp"
  android:text="@string/admin_auth_submit"
  android:textColor="@{viewModel.isSubmitButtonActive ? @color/white : @color/submitButtonInactiveText }"

diff --git a/app/src/main/res/layout-sw600dp-land/admin_auth_activity.xml b/app/src/main/res/layout-sw600dp-land/admin_auth_activity.xml
@@ -115,6 +115,7 @@
  android:layout_marginTop="58dp"
  android:background="@{viewModel.isSubmitButtonActive ? @drawable/state_button_primary_background :@drawable/start_button_transparent_background}"
  android:clickable="@{viewModel.isSubmitButtonActive}"
+ android:contentDescription="@{viewModel.isSubmitButtonActive? @string/admin_auth_submit : @string/admin_auth_submit_disabled}"
  android:minHeight="36dp"
  android:text="@string/admin_auth_submit"
  android:textColor="@{viewModel.isSubmitButtonActive ? @color/white : @color/submitButtonInactiveText }"

diff --git a/app/src/main/res/layout-sw600dp-port/admin_auth_activity.xml b/app/src/main/res/layout-sw600dp-port/admin_auth_activity.xml
@@ -106,6 +106,7 @@
  android:layout_marginBottom="44dp"
  android:background="@{viewModel.isSubmitButtonActive ? @drawable/state_button_primary_background :@drawable/start_button_transparent_background}"
  android:clickable="@{viewModel.isSubmitButtonActive}"
+ android:contentDescription="@{viewModel.isSubmitButtonActive? @string/admin_auth_submit : @string/admin_auth_submit_disabled}"
  android:minHeight="36dp"
  android:text="@string/admin_auth_submit"
  android:textColor="@{viewModel.isSubmitButtonActive ? @color/white : @color/submitButtonInactiveText }"

diff --git a/app/src/main/res/layout/admin_auth_activity.xml b/app/src/main/res/layout/admin_auth_activity.xml
@@ -111,6 +111,7 @@
  android:layout_marginBottom="44dp"
  android:background="@{viewModel.isSubmitButtonActive ? @drawable/state_button_primary_background :@drawable/start_button_transparent_background}"
  android:clickable="@{viewModel.isSubmitButtonActive}"
+ android:contentDescription="@{viewModel.isSubmitButtonActive? @string/admin_auth_submit : @string/admin_auth_submit_disabled}"
  android:minHeight="48dp"
  android:text="@string/admin_auth_submit"
  android:textColor="@{viewModel.isSubmitButtonActive ? @color/white : @color/submitButtonInactiveText }"

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -200,6 +200,7 @@
  <string name="admin_auth_pin">Administrator\'s PIN</string>
  <string name="admin_auth_incorrect">Incorrect Administrator PIN. Please try again.</string>
  <string name="admin_auth_submit">Submit</string>
+ <string name="admin_auth_submit_disabled">Disabled Submit</string>
  <string name="admin_auth_close">Close</string>
  <!-- AdminPinActivity -->
  <string name="admin_pin_requirement_description">Before we add profiles, we need to protect your account by creating a PIN. This gives you the ability to authorize downloads and manage profiles on the device.</string>