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

Merge "Add additional strings to differentiate between single and multiple insecure vpns" into sc-dev

Browse Source
This commit is contained in:
Jeremy Goldman
2021-04-14 07:49:18 +00:00
committed by Android (Google) Code Review
parent ab38192a1f eecc97a339
commit 21eaa6d568
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
res/values/strings.xml
View File

@@ -6565,8 +6565,10 @@
<string name="vpn_settings_title">VPN</string> <string name="vpn_settings_title">VPN</string>
<!-- Title of preference to enter the VPN settings activity [CHAR LIMIT=30] --> <!-- Title of preference to enter the VPN settings activity [CHAR LIMIT=30] -->
<string name="vpn_settings_insecure_single">Not secure</string> <string name="vpn_settings_insecure_single">Not secure</string>
<!-- Title of preference to enter the VPN settings activity [CHAR LIMIT=30] --> <!-- Title of preference to enter the VPN settings activity, if there are multiple vpns but only 1 insecure vpn [CHAR LIMIT=60] -->
<string name="vpn_settings_insecure_multiple"><xliff:g id="vpn_count" example="1">%d</xliff:g> not secure</string> <string name="vpn_settings_single_insecure_multiple_total"><xliff:g id="vpn_count" example="1">%d</xliff:g> not secure</string>
<!-- Title of preference to enter the VPN settings activity, if there are multiple vpns and multiple insecure vpns [CHAR LIMIT=60] -->
<string name="vpn_settings_multiple_insecure_multiple_total"><xliff:g id="vpn_count" example="1">%d</xliff:g> not secure</string>
<!-- Title of Adaptive connectivity. Adaptive connectivity is a feature which automatically manages network connections for better battery life and performance. [CHAR LIMIT=60] --> <!-- Title of Adaptive connectivity. Adaptive connectivity is a feature which automatically manages network connections for better battery life and performance. [CHAR LIMIT=60] -->
<string name="adaptive_connectivity_title">Adaptive connectivity</string> <string name="adaptive_connectivity_title">Adaptive connectivity</string>

7
src/com/android/settings/network/VpnPreferenceController.java
View File

@@ -169,9 +169,14 @@ public class VpnPreferenceController extends AbstractPreferenceController
- connectedLegacyVpnCount; - connectedLegacyVpnCount;
if (vpnCount == 1) { if (vpnCount == 1) {
summary = mContext.getString(R.string.vpn_settings_insecure_single); summary = mContext.getString(R.string.vpn_settings_insecure_single);
} else if (insecureVpnCount == 1) {
summary = mContext.getString(
R.string.vpn_settings_single_insecure_multiple_total,
insecureVpnCount);
} else { } else {
summary = mContext.getString( summary = mContext.getString(
R.string.vpn_settings_insecure_multiple, insecureVpnCount); R.string.vpn_settings_multiple_insecure_multiple_total,
insecureVpnCount);
} }
} }
} }