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

Merge "[Provider Model] Update Internet preference summary" into sc-dev

Browse Source
This commit is contained in:
Weng Su
2021-03-23 03:21:08 +00:00
committed by Android (Google) Code Review
parent 9f046e55b6 784eb94a14
commit 5ac8414834
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/values/strings.xml
View File

@@ -12804,6 +12804,8 @@
<string name="resetting_internet_text">Resetting your internet\u2026</string> <string name="resetting_internet_text">Resetting your internet\u2026</string>
<!-- Menu option for data connectivity recovery for all requested technologies. [CHAR_LIMIT=NONE] --> <!-- Menu option for data connectivity recovery for all requested technologies. [CHAR_LIMIT=NONE] -->
<string name="fix_connectivity">Fix connectivity</string> <string name="fix_connectivity">Fix connectivity</string>
<!-- Summary for networks available (includes no network connected). [CHAR_LIMIT=NONE] -->
<string name="networks_available">Networks available</string>
<!-- Summary for warning to disconnect ethernet first then switch to other networks. [CHAR LIMIT=60] --> <!-- Summary for warning to disconnect ethernet first then switch to other networks. [CHAR LIMIT=60] -->
<string name="to_switch_networks_disconnect_ethernet">To switch networks, disconnect ethernet</string> <string name="to_switch_networks_disconnect_ethernet">To switch networks, disconnect ethernet</string>
<!-- Panel subtitle for Wi-Fi turned on. [CHAR LIMIT=60] --> <!-- Panel subtitle for Wi-Fi turned on. [CHAR LIMIT=60] -->

2
src/com/android/settings/network/InternetPreferenceController.java
View File

@@ -75,7 +75,7 @@ public class InternetPreferenceController extends AbstractPreferenceController i
private static Map<Integer, Integer> sSummaryMap = new HashMap<>(); private static Map<Integer, Integer> sSummaryMap = new HashMap<>();
static { static {
sSummaryMap.put(INTERNET_OFF, R.string.condition_airplane_title); sSummaryMap.put(INTERNET_OFF, R.string.condition_airplane_title);
sSummaryMap.put(INTERNET_NETWORKS_AVAILABLE, R.string.disconnected); sSummaryMap.put(INTERNET_NETWORKS_AVAILABLE, R.string.networks_available);
sSummaryMap.put(INTERNET_WIFI, 0); sSummaryMap.put(INTERNET_WIFI, 0);
sSummaryMap.put(INTERNET_CELLULAR, 0); sSummaryMap.put(INTERNET_CELLULAR, 0);
sSummaryMap.put(INTERNET_ETHERNET, R.string.to_switch_networks_disconnect_ethernet); sSummaryMap.put(INTERNET_ETHERNET, R.string.to_switch_networks_disconnect_ethernet);