Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 21eaa6d5 authored by Jeremy Goldman's avatar Jeremy Goldman Committed by Android (Google) Code Review
Browse files

Merge "Add additional strings to differentiate between single and multiple... 

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

res/values/strings.xml

+4 −2
Original line number Diff line number Diff line
@@ -6565,8 +6565,10 @@ 
    <string name="vpn_settings_title">VPN</string>

    <!-- Title of preference to enter the VPN settings activity [CHAR LIMIT=30] -->

    <string name="vpn_settings_insecure_single">Not secure</string>

    <!-- Title of preference to enter the VPN settings activity [CHAR LIMIT=30] -->

    <string name="vpn_settings_insecure_multiple"><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 but only 1 insecure vpn [CHAR LIMIT=60] -->

    <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] -->









    <string name="adaptive_connectivity_title">Adaptive connectivity</string>

























src/com/android/settings/network/VpnPreferenceController.java



+6
−1






























Original line number
Diff line number
Diff line







@@ -169,9 +169,14 @@ public class VpnPreferenceController extends AbstractPreferenceController







                        - connectedLegacyVpnCount;









                if (vpnCount == 1) {









                    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 {









                    summary = mContext.getString(









                            R.string.vpn_settings_insecure_multiple, insecureVpnCount);









                            R.string.vpn_settings_multiple_insecure_multiple_total,









                            insecureVpnCount);









                }









            }









        }