am c6b0b206: am b5e9842f: am fa36ce56: Add letters associated with a number to content description.
* commit 'c6b0b20624e5be8c6c84e0ba07e686e8212385cd':
Add letters associated with a number to content description.
diff --git a/src/com/android/phone/common/dialpad/DialpadView.java b/src/com/android/phone/common/dialpad/DialpadView.java
index b5c3982..43bbeca 100644
--- a/src/com/android/phone/common/dialpad/DialpadView.java
+++ b/src/com/android/phone/common/dialpad/DialpadView.java
@@ -153,12 +153,21 @@
lettersView = (TextView) dialpadKey.findViewById(R.id.dialpad_key_letters);
final String numberString;
+ final String numberContentDescription;
if (mButtonIds[i] == R.id.pound) {
numberString = resources.getString(R.string.dialpad_pound_number);
+ numberContentDescription = numberString;
} else if (mButtonIds[i] == R.id.star) {
numberString = resources.getString(R.string.dialpad_star_number);
+ numberContentDescription = numberString;
} else {
numberString = nf.format(i);
+ // The content description is used for announcements on key
+ // press when TalkBack is enabled. They contain a ","
+ // (to introduce a slight delay) followed by letters
+ // corresponding to the keys in addition to the number.
+ numberContentDescription = numberString + "," +
+ resources.getString(letterIds[i]);
}
final RippleDrawable rippleBackground =
@@ -169,7 +178,7 @@
numberView.setText(numberString);
numberView.setElegantTextHeight(false);
- dialpadKey.setContentDescription(numberString);
+ dialpadKey.setContentDescription(numberContentDescription);
dialpadKey.setBackground(rippleBackground);
if (lettersView != null) {