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

2021-04-14 07:49:18 +00:00
parent ab38192a1f eecc97a339
commit 21eaa6d568
2 changed files with 10 additions and 3 deletions
--- a/src/com/android/settings/network/VpnPreferenceController.java
+++ b/src/com/android/settings/network/VpnPreferenceController.java
@@ -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);
                }
            }
        }