Merge "Remove TtsSpan from Ssid" (be57a018) · Commits · e / os / android_frameworks_base

packages/SettingsLib/src/com/android/settingslib/wifi/AccessPoint.java

+1 −4

Original line number	Original line	Diff line number	Diff line
	@@ -756,10 +756,7 @@ public class AccessPoint implements Comparable<AccessPoint> {
	}		}

	public CharSequence getSsid() {		public CharSequence getSsid() {
	final SpannableString str = new SpannableString(ssid);		return ssid;
	str.setSpan(new TtsSpan.TelephoneBuilder(ssid).build(), 0, ssid.length(),
	Spannable.SPAN_INCLUSIVE_INCLUSIVE);
	return str;
	}		}

	public String getConfigName() {		public String getConfigName() {

+2 −7

Original line number	Original line	Diff line number	Diff line
	@@ -104,18 +104,13 @@ public class AccessPointTest {
	}		}

	@Test		@Test
	public void testSsidIsTelephoneSpan() {		public void testSsidIsSpannableString_returnFalse() {
	final Bundle bundle = new Bundle();		final Bundle bundle = new Bundle();
	bundle.putString("key_ssid", TEST_SSID);		bundle.putString("key_ssid", TEST_SSID);
	final AccessPoint ap = new AccessPoint(InstrumentationRegistry.getTargetContext(), bundle);		final AccessPoint ap = new AccessPoint(InstrumentationRegistry.getTargetContext(), bundle);
	final CharSequence ssid = ap.getSsid();		final CharSequence ssid = ap.getSsid();

	assertThat(ssid instanceof SpannableString).isTrue();		assertThat(ssid instanceof SpannableString).isFalse();

	TtsSpan[] spans = ((SpannableString) ssid).getSpans(0, TEST_SSID.length(), TtsSpan.class);

	assertThat(spans.length).isEqualTo(1);
	assertThat(spans[0].getType()).isEqualTo(TtsSpan.TYPE_TELEPHONE);
	}		}

	@Test		@Test