From a2998fc3ee39e9e388c65ec7fee920e3caa81055 Mon Sep 17 00:00:00 2001 From: pastychang Date: Tue, 26 Jun 2018 13:37:34 +0800 Subject: [PATCH] Remove TtsSpan from Ssid Telephone type span caused talkback stop to read next texture in Setupwizard wifi page. Remove it and doesn't impact previous issue ag/1468171. New Google TTS can recognize work and doesn't only spell words. Test: atest Bug: b/110104543 Change-Id: I4f37a6280294446e5f33ea3620366803b6d30a4e --- .../src/com/android/settingslib/wifi/AccessPoint.java | 5 +---- .../com/android/settingslib/wifi/AccessPointTest.java | 9 ++------- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/packages/SettingsLib/src/com/android/settingslib/wifi/AccessPoint.java b/packages/SettingsLib/src/com/android/settingslib/wifi/AccessPoint.java index b9c76013b0d76..18a44ed735bda 100644 --- a/packages/SettingsLib/src/com/android/settingslib/wifi/AccessPoint.java +++ b/packages/SettingsLib/src/com/android/settingslib/wifi/AccessPoint.java @@ -756,10 +756,7 @@ public class AccessPoint implements Comparable { } public CharSequence getSsid() { - final SpannableString str = new SpannableString(ssid); - str.setSpan(new TtsSpan.TelephoneBuilder(ssid).build(), 0, ssid.length(), - Spannable.SPAN_INCLUSIVE_INCLUSIVE); - return str; + return ssid; } public String getConfigName() { diff --git a/packages/SettingsLib/tests/integ/src/com/android/settingslib/wifi/AccessPointTest.java b/packages/SettingsLib/tests/integ/src/com/android/settingslib/wifi/AccessPointTest.java index e435a72861da8..032479990caec 100644 --- a/packages/SettingsLib/tests/integ/src/com/android/settingslib/wifi/AccessPointTest.java +++ b/packages/SettingsLib/tests/integ/src/com/android/settingslib/wifi/AccessPointTest.java @@ -104,18 +104,13 @@ public class AccessPointTest { } @Test - public void testSsidIsTelephoneSpan() { + public void testSsidIsSpannableString_returnFalse() { final Bundle bundle = new Bundle(); bundle.putString("key_ssid", TEST_SSID); final AccessPoint ap = new AccessPoint(InstrumentationRegistry.getTargetContext(), bundle); final CharSequence ssid = ap.getSsid(); - assertThat(ssid instanceof SpannableString).isTrue(); - - TtsSpan[] spans = ((SpannableString) ssid).getSpans(0, TEST_SSID.length(), TtsSpan.class); - - assertThat(spans.length).isEqualTo(1); - assertThat(spans[0].getType()).isEqualTo(TtsSpan.TYPE_TELEPHONE); + assertThat(ssid instanceof SpannableString).isFalse(); } @Test