From 71ab9605a30dbc04b5a8c3a895e98197552ca657 Mon Sep 17 00:00:00 2001 From: Fan Zhang Date: Thu, 6 Oct 2016 13:17:06 -0700 Subject: [PATCH] Use a Digit TtsSpan for pairing pins for talkback. Fixes: 31539689 Test: manually enabled talkback and focused on bt pairing pin. Verified read-out is digits instead of a big number. Change-Id: I71c53094762a71459e70485470684c515053b600 --- .../settings/bluetooth/BluetoothPairingDialog.java | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/src/com/android/settings/bluetooth/BluetoothPairingDialog.java b/src/com/android/settings/bluetooth/BluetoothPairingDialog.java index fe4814801b0..27cd5329667 100755 --- a/src/com/android/settings/bluetooth/BluetoothPairingDialog.java +++ b/src/com/android/settings/bluetooth/BluetoothPairingDialog.java @@ -29,7 +29,10 @@ import android.text.Editable; import android.text.InputFilter; import android.text.InputFilter.LengthFilter; import android.text.InputType; +import android.text.SpannableString; +import android.text.Spanned; import android.text.TextWatcher; +import android.text.style.TtsSpan; import android.util.Log; import android.view.KeyEvent; import android.view.View; @@ -298,16 +301,17 @@ public final class BluetoothPairingDialog extends AlertActivity implements } }); - String messageCaption = null; - String pairingContent = null; + SpannableString pairingContent = null; switch (mType) { case BluetoothDevice.PAIRING_VARIANT_DISPLAY_PASSKEY: case BluetoothDevice.PAIRING_VARIANT_DISPLAY_PIN: messagePairing.setVisibility(View.VISIBLE); - case BluetoothDevice.PAIRING_VARIANT_PASSKEY_CONFIRMATION: - pairingContent = mPairingKey; + case BluetoothDevice.PAIRING_VARIANT_PASSKEY_CONFIRMATION: { + pairingContent = new SpannableString(mPairingKey); + pairingContent.setSpan(new TtsSpan.DigitsBuilder(mPairingKey).build(), + 0, mPairingKey.length(), Spanned.SPAN_INCLUSIVE_INCLUSIVE); break; - + } case BluetoothDevice.PAIRING_VARIANT_CONSENT: messagePairing.setVisibility(view.GONE); break;