diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-03-20 15:56:05 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-03-20 15:56:05 +0000 |
| commit | dd7b1691ab5bc2a5ed27f77d2874aa7d6584b39d (patch) | |
| tree | 859346ba7a9ae8460065cfe18749ab9f23dab356 | |
| parent | 52a836d49c7b686c6df40b0614b5b56889993716 (diff) | |
| parent | 791509de7f660e563f2953d900222a6ce0c43cca (diff) | |
Merge "Put accessibility labels for tabs." into rvc-dev
| -rw-r--r-- | core/java/com/android/internal/app/ResolverActivity.java | 7 | ||||
| -rw-r--r-- | core/res/res/values/strings.xml | 5 | ||||
| -rw-r--r-- | core/res/res/values/symbols.xml | 2 |
3 files changed, 14 insertions, 0 deletions
diff --git a/core/java/com/android/internal/app/ResolverActivity.java b/core/java/com/android/internal/app/ResolverActivity.java index d14203381c65..2352180bcba3 100644 --- a/core/java/com/android/internal/app/ResolverActivity.java +++ b/core/java/com/android/internal/app/ResolverActivity.java @@ -1608,6 +1608,8 @@ public class ResolverActivity extends Activity implements } private void resetTabsHeaderStyle(TabWidget tabWidget) { + String workContentDescription = getString(R.string.resolver_work_tab_accessibility); + String personalContentDescription = getString(R.string.resolver_personal_tab_accessibility); for (int i = 0; i < tabWidget.getChildCount(); i++) { View tabView = tabWidget.getChildAt(i); TextView title = tabView.findViewById(android.R.id.title); @@ -1615,6 +1617,11 @@ public class ResolverActivity extends Activity implements title.setTextColor(getAttrColor(this, android.R.attr.textColorTertiary)); title.setTextSize(TypedValue.COMPLEX_UNIT_PX, getResources().getDimension(R.dimen.resolver_tab_text_size)); + if (title.getText().equals(getString(R.string.resolver_personal_tab))) { + tabView.setContentDescription(personalContentDescription); + } else if (title.getText().equals(getString(R.string.resolver_work_tab))) { + tabView.setContentDescription(workContentDescription); + } } } diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml index ec69874d68d6..4cc9f735f638 100644 --- a/core/res/res/values/strings.xml +++ b/core/res/res/values/strings.xml @@ -5428,6 +5428,11 @@ <!-- Label of a tab on a screen. A user can tap this tab to switch to the 'Work' view (that shows their work content) if they have a work profile on their device. [CHAR LIMIT=NONE] --> <string name="resolver_work_tab">Work</string> + <!-- Accessibility label for the personal tab button. [CHAR LIMIT=NONE] --> + <string name="resolver_personal_tab_accessibility">Personal view</string> + <!-- Accessibility label for the work tab button. [CHAR LIMIT=NONE] --> + <string name="resolver_work_tab_accessibility">Work view</string> + <!-- Title of a screen. This text lets the user know that their IT admin doesn't allow them to share this specific content with work apps. [CHAR LIMIT=NONE] --> <string name="resolver_cant_share_with_work_apps">Can\u2019t share this with work apps</string> <!-- Error message. This text is explaining that the user's IT admin doesn't allow this specific content to be shared with apps in the work profile. [CHAR LIMIT=NONE] --> diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml index 6c598d6480e2..20d943d787e1 100644 --- a/core/res/res/values/symbols.xml +++ b/core/res/res/values/symbols.xml @@ -3885,7 +3885,9 @@ <!-- Intent resolver and share sheet --> <java-symbol type="string" name="resolver_personal_tab" /> + <java-symbol type="string" name="resolver_personal_tab_accessibility" /> <java-symbol type="string" name="resolver_work_tab" /> + <java-symbol type="string" name="resolver_work_tab_accessibility" /> <java-symbol type="id" name="stub" /> <java-symbol type="id" name="resolver_empty_state" /> <java-symbol type="id" name="resolver_empty_state_icon" /> |