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

Merge "Improve some comments of strings and codes" into qt-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2019-04-23 00:04:56 +00:00
committed by Android (Google) Code Review
parent c9239e11b6 a79783ca2a
commit 0bc3fac6d9
2 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
res/values/strings.xml
View File

@@ -2243,7 +2243,7 @@
<string name="wifi_carrier_content">Connect via <xliff:g id="name">%1$s</xliff:g></string> <string name="wifi_carrier_content">Connect via <xliff:g id="name">%1$s</xliff:g></string>
<string name="wifi_scan_always_turnon_message">To improve location accuracy and for other purposes, <xliff:g id="app_name">%1$s</xliff:g> wants to turn on network scanning, even when Wi-Fi is off.\n\nAllow this for all apps that want to scan?</string> <string name="wifi_scan_always_turnon_message">To improve location accuracy and for other purposes, <xliff:g id="app_name">%1$s</xliff:g> wants to turn on network scanning, even when Wi-Fi is off.\n\nAllow this for all apps that want to scan?</string>
<!-- Message to inform user, an unknown app want to enable network scanning. [CHAR LIMIT=200] --> <!-- Message to inform user, an unknown app want to enable network scanning. [CHAR LIMIT=250] -->
<string name="wifi_scan_always_turn_on_message_unknown">To improve location accuracy and for other purposes, an unknown app wants to turn on network scanning, even when Wi\u2011Fi is off.\n\nAllow this for all apps that want to scan?</string> <string name="wifi_scan_always_turn_on_message_unknown">To improve location accuracy and for other purposes, an unknown app wants to turn on network scanning, even when Wi\u2011Fi is off.\n\nAllow this for all apps that want to scan?</string>
<!-- Message informing the user how to turn off [CHAR LIMIT=200] --> <!-- Message informing the user how to turn off [CHAR LIMIT=200] -->
<string name="wifi_scan_always_turnoff_message">To turn this off, go to Advanced in the overflow menu.</string> <string name="wifi_scan_always_turnoff_message">To turn this off, go to Advanced in the overflow menu.</string>
@@ -2308,12 +2308,12 @@
<item quantity="one">1 network</item> <item quantity="one">1 network</item>
<item quantity="other">%d networks</item> <item quantity="other">%d networks</item>
</plurals> </plurals>
<!-- Wi-Fi settings screen, Saved passpoint networks summary. This shows below the "Saved networks" item and indicates the number of passpoint networks a user has saved. [CHAR LIMIT=30] --> <!-- Wi-Fi settings screen, Saved networks summary. This shows below the "Saved networks" item and indicates the number of passpoint networks a user has saved. [CHAR LIMIT=30] -->
<plurals name="wifi_saved_passpoint_access_points_summary"> <plurals name="wifi_saved_passpoint_access_points_summary">
<item quantity="one">1 subscription</item> <item quantity="one">1 subscription</item>
<item quantity="other">%d subscriptions</item> <item quantity="other">%d subscriptions</item>
</plurals> </plurals>
<!-- Wi-Fi settings screen, Saved passpoint networks summary. This shows below the "Saved networks" item and indicates number of whole kinds networks, if there are both normal saved networks and saved passpoint networks. The number will be at least 2. [CHAR LIMIT=60] --> <!-- Wi-Fi settings screen, Saved networks summary. This shows below the "Saved networks" item and indicates number of whole kinds networks, if there are both normal saved networks and saved passpoint networks. The number will be at least 2. [CHAR LIMIT=60] -->
<plurals name="wifi_saved_all_access_points_summary"> <plurals name="wifi_saved_all_access_points_summary">
<item quantity="other">%d networks &amp; subscriptions</item> <item quantity="other">%d networks &amp; subscriptions</item>
</plurals> </plurals>

13
src/com/android/settings/wifi/WifiSettings.java
View File

@@ -469,13 +469,12 @@ public class WifiSettings extends RestrictedSettingsFragment
return; return;
} }
// "forget" for normal saved network. And "disconnect" for ephemeral network because we // "forget" for normal saved network. And "disconnect" for ephemeral network because it
// could only disconnect it and put it in blacklists so it won't be used again. // could only be disconnected and be put in blacklists so it won't be used again.
if (mSelectedAccessPoint.isEphemeral()) { if (mSelectedAccessPoint.isSaved() || mSelectedAccessPoint.isEphemeral()) {
menu.add(Menu.NONE, MENU_ID_FORGET, 0 /* order */, final int stringId = mSelectedAccessPoint.isEphemeral() ?
R.string.wifi_disconnect_button_text); R.string.wifi_disconnect_button_text : R.string.forget;
} else if (mSelectedAccessPoint.isSaved()) { menu.add(Menu.NONE, MENU_ID_FORGET, 0 /* order */, stringId);
menu.add(Menu.NONE, MENU_ID_FORGET, 0 /* order */, R.string.forget);
} }
if (mSelectedAccessPoint.isSaved() && !mSelectedAccessPoint.isActive()) { if (mSelectedAccessPoint.isSaved() && !mSelectedAccessPoint.isActive()) {