Merge "Talkback issue in Dialer Settings for back button"
diff --git a/res/values/strings.xml b/res/values/strings.xml
index bf5abca..d3196b9 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -381,4 +381,6 @@
<string name="developer_enhanced_call_blocking" translatable="false">Enhanced Call Blocking</string>
<!-- Button label for generic cancel action [CHAR LIMIT=20] -->
<string name="cancel">Cancel</string>
+ <!-- Button label for generic back action [CHAR LIMIT=20] -->
+ <string name="back">Back</string>
</resources>
diff --git a/src/com/android/server/telecom/RespondViaSmsSettings.java b/src/com/android/server/telecom/RespondViaSmsSettings.java
index 661038b..d038a6e 100755
--- a/src/com/android/server/telecom/RespondViaSmsSettings.java
+++ b/src/com/android/server/telecom/RespondViaSmsSettings.java
@@ -89,6 +89,8 @@
if (actionBar != null) {
// android.R.id.home will be triggered in onOptionsItemSelected()
actionBar.setDisplayHomeAsUpEnabled(true);
+ // set the talkback voice prompt to "Back" instead of "Navigate Up"
+ actionBar.setHomeActionContentDescription(R.string.back);
}
}
diff --git a/src/com/android/server/telecom/settings/BlockedNumbersActivity.java b/src/com/android/server/telecom/settings/BlockedNumbersActivity.java
index bc54e11..6e2eb97 100644
--- a/src/com/android/server/telecom/settings/BlockedNumbersActivity.java
+++ b/src/com/android/server/telecom/settings/BlockedNumbersActivity.java
@@ -101,6 +101,8 @@
ActionBar actionBar = getActionBar();
if (actionBar != null) {
actionBar.setDisplayHomeAsUpEnabled(true);
+ // set the talkback voice prompt to "Back" instead of "Navigate Up"
+ actionBar.setHomeActionContentDescription(R.string.back);
}
if (!BlockedNumberContract.canCurrentUserBlockNumbers(this)) {