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

Browse Source
This commit is contained in:
Weng Su
2021-05-19 03:48:16 +00:00
committed by Android (Google) Code Review
parent bac284a622 4bf9551c30
commit ca5f4e4952
3 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/values/strings.xml
View File

@@ -13128,6 +13128,8 @@
<string name="to_switch_networks_disconnect_ethernet">To switch networks, disconnect ethernet</string>
<!-- Panel subtitle for Wi-Fi turned on. [CHAR LIMIT=60] -->
<string name="wifi_is_turned_on_subtitle">Wi\u2011Fi is turned on</string>
<!-- Panel subtitle for select the network you want to use for data. [CHAR LIMIT=60] -->
<string name="select_network_to_connect_internet">Select the network you want to use for data</string>
<!-- Title for merged carrier Wi-Fi offload toggle. [CHAR LIMIT=NONE] -->
<string name="carrier_wifi_offload_title">W+ connections</string>
<!-- Summary for merged carrier Wi-Fi offload toggle. [CHAR LIMIT=NONE] -->

5
src/com/android/settings/panel/InternetConnectivityPanel.java
View File

@@ -65,6 +65,8 @@ public class InternetConnectivityPanel implements PanelContent, LifecycleObserve
private static final String TAG = "InternetConnectivityPanel";
private static final int SUBTITLE_TEXT_NONE = -1;
private static final int SUBTITLE_TEXT_WIFI_IS_TURNED_ON = R.string.wifi_is_turned_on_subtitle;
private static final int SUBTITLE_TEXT_SELECT_NETWORK_TO_CONNECT_INTERNET =
R.string.select_network_to_connect_internet;
private static final int SUBTITLE_TEXT_SEARCHING_FOR_NETWORKS =
R.string.wifi_empty_list_wifi_on;
private static final int SUBTITLE_TEXT_NON_CARRIER_NETWORK_UNAVAILABLE =
@@ -322,6 +324,9 @@ public class InternetConnectivityPanel implements PanelContent, LifecycleObserve
final List<ScanResult> wifiList = mWifiManager.getScanResults();
if (wifiList != null && wifiList.size() != 0) {
// When the Wi-Fi scan result is not empty
// Sub-Title: Select the network you want to use for data
mSubtitle = SUBTITLE_TEXT_SELECT_NETWORK_TO_CONNECT_INTERNET;
return;
}

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