diff --git a/res/values/strings.xml b/res/values/strings.xml index 0f7651ad940..1c5f833da78 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -13143,8 +13143,8 @@ To switch networks, disconnect ethernet Wi\u2011Fi is turned on - - Select the network you want to use for data + + Tap a network to connect W+ connections diff --git a/src/com/android/settings/panel/InternetConnectivityPanel.java b/src/com/android/settings/panel/InternetConnectivityPanel.java index 50371ae8fb7..a6c18a5b749 100644 --- a/src/com/android/settings/panel/InternetConnectivityPanel.java +++ b/src/com/android/settings/panel/InternetConnectivityPanel.java @@ -65,8 +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_TAP_A_NETWORK_TO_CONNECT = + R.string.tap_a_network_to_connect; 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 = @@ -326,7 +326,7 @@ public class InternetConnectivityPanel implements PanelContent, LifecycleObserve 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; + mSubtitle = SUBTITLE_TEXT_TAP_A_NETWORK_TO_CONNECT; return; } diff --git a/tests/unit/src/com/android/settings/panel/InternetConnectivityPanelTest.java b/tests/unit/src/com/android/settings/panel/InternetConnectivityPanelTest.java index 651eb048905..150c99e2945 100644 --- a/tests/unit/src/com/android/settings/panel/InternetConnectivityPanelTest.java +++ b/tests/unit/src/com/android/settings/panel/InternetConnectivityPanelTest.java @@ -63,10 +63,9 @@ 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 SUBTITLE_TEXT_TAP_A_NETWORK_TO_CONNECT = + ResourcesUtils.getResourcesString(ApplicationProvider.getApplicationContext(), + "tap_a_network_to_connect"); public static final String BUTTON_SETTINGS = ResourcesUtils.getResourcesString( ApplicationProvider.getApplicationContext(), "settings_button"); public static final String SUBTITLE_NON_CARRIER_NETWORK_UNAVAILABLE = @@ -179,7 +178,7 @@ public class InternetConnectivityPanelTest { } @Test - public void getSubTitle_apmOffWifiOnTwoWifiItemsNoCarrierData_selectNetworkToConnectInternet() { + public void getSubTitle_apmOffWifiOnTwoWifiItemsNoCarrierData_tapANetworkToConnect() { List wifiList = new ArrayList(); wifiList.add(new ScanResult()); wifiList.add(new ScanResult()); @@ -187,8 +186,7 @@ public class InternetConnectivityPanelTest { mPanel.updatePanelTitle(); - assertThat(mPanel.getSubTitle()) - .isEqualTo(SUBTITLE_TEXT_SELECT_NETWORK_TO_CONNECT_INTERNET); + assertThat(mPanel.getSubTitle()).isEqualTo(SUBTITLE_TEXT_TAP_A_NETWORK_TO_CONNECT); } @Test