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 am: 21eaa6d568

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14182147

Change-Id: I9e808af2bb149e7398087979d008aadc85d81deb
This commit is contained in:
Jeremy Goldman
2021-04-14 08:37:01 +00:00
committed by Automerger Merge Worker
parent 5255875f33 21eaa6d568
commit 27dc6600f6
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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);
}
}
}