Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove TtsSpan from Ssid"

Browse Source
This commit is contained in:
Pasty Chang
2018-06-27 05:12:43 +00:00
committed by Android (Google) Code Review
parent 024b8dc48e a2998fc3ee
commit be57a0189b
2 changed files with 3 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
packages/SettingsLib/src/com/android/settingslib/wifi/AccessPoint.java
View File

@@ -756,10 +756,7 @@ public class AccessPoint implements Comparable<AccessPoint> {
}
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() {

9
packages/SettingsLib/tests/integ/src/com/android/settingslib/wifi/AccessPointTest.java
View File

@@ -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