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

Merge "Improve discoverability of the intent & actions progress" into sc-dev am: ca5f4e4952 am: 46d3fc525e

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

Change-Id: If6651e153ac623305f933bee6cb57a02b753d905
This commit is contained in:
Weng Su
2021-05-20 01:55:37 +00:00
committed by Automerger Merge Worker
parent d9db863dc2 46d3fc525e
commit c1382e3007
3 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
tests/unit/src/com/android/settings/panel/InternetConnectivityPanelTest.java
View File

@@ -63,6 +63,10 @@ public class InternetConnectivityPanelTest {
ApplicationProvider.getApplicationContext(), "airplane_mode");
public static final String SUBTITLE_WIFI_IS_TURNED_ON = ResourcesUtils.getResourcesString(
ApplicationProvider.getApplicationContext(), "wifi_is_turned_on_subtitle");
public static final String SUBTITLE_TEXT_SELECT_NETWORK_TO_CONNECT_INTERNET =
ResourcesUtils.getResourcesString(
ApplicationProvider.getApplicationContext(),
"select_network_to_connect_internet");
public static final String BUTTON_SETTINGS = ResourcesUtils.getResourcesString(
ApplicationProvider.getApplicationContext(), "settings_button");
public static final String SUBTITLE_NON_CARRIER_NETWORK_UNAVAILABLE =
@@ -175,7 +179,7 @@ public class InternetConnectivityPanelTest {
}
@Test
public void getSubTitle_apmOffWifiOnTwoWifiItemsNoCarrierData_shouldBeNull() {
public void getSubTitle_apmOffWifiOnTwoWifiItemsNoCarrierData_selectNetworkToConnectInternet() {
List wifiList = new ArrayList<ScanResult>();
wifiList.add(new ScanResult());
wifiList.add(new ScanResult());
@@ -183,7 +187,8 @@ public class InternetConnectivityPanelTest {
mPanel.updatePanelTitle();
assertThat(mPanel.getSubTitle()).isNull();
assertThat(mPanel.getSubTitle())
.isEqualTo(SUBTITLE_TEXT_SELECT_NETWORK_TO_CONNECT_INTERNET);
}
@Test