PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Update subtext for "Network & internet"" into sc-dev am: 259b678865 am: 2d74dfc566 am: 77dd6bef37

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14675090

Change-Id: Idaed1124410714ee2de0b619146bffe9d4de7024
This commit is contained in:
Yanting Yang
2021-05-25 09:30:04 +00:00
committed by Automerger Merge Worker
parent 3713218dc1 77dd6bef37
commit 094ce5f07b
2 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tests/robotests/src/com/android/settings/network/TopLevelNetworkEntryPreferenceControllerTest.java
View File

@@ -92,7 +92,7 @@ public class TopLevelNetworkEntryPreferenceControllerTest {
when(mTetherPreferenceController.isAvailable()).thenReturn(true);
assertThat(mController.getSummary())
.isEqualTo("Wi\u2011Fi, mobile, data usage, and hotspot");
.isEqualTo("Wi\u2011Fi, mobile, data usage, hotspot");
}
@Test
@@ -101,6 +101,6 @@ public class TopLevelNetworkEntryPreferenceControllerTest {
when(mMobileNetworkPreferenceController.isAvailable()).thenReturn(false);
when(mTetherPreferenceController.isAvailable()).thenReturn(false);
assertThat(mController.getSummary()).isEqualTo("Wi\u2011Fi and data usage");
assertThat(mController.getSummary()).isEqualTo("Wi\u2011Fi, data usage");
}
}