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

Merge "Gear Preference on VPN page includes subtitle if the vpn is an insecure type" into sc-dev am: bd9a65cca6

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

Change-Id: I7cb414842a1e51aedcbd6fb2750eaf7beb334239
This commit is contained in:
Jeremy Goldman
2021-03-24 01:34:12 +00:00
committed by Automerger Merge Worker
parent 023d1bc080 bd9a65cca6
commit 34e8f315e3
3 changed files with 39 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/values/strings.xml
View File

@@ -7054,6 +7054,8 @@
<string name="vpn_always_on_summary_not_supported">Not supported by this app</string>
<!-- Preference summary for a VPN app that is set to be always-on. [CHAR LIMIT=40] -->
<string name="vpn_always_on_summary_active">Always-on active</string>
<!-- Preference summary for a VPN app that has an insecure type. [CHAR LIMIT=40] -->
<string name="vpn_insecure_summary">not secure VPN</string>
<!-- Preference title for the toggle that controls whether to force all network connections to
go through VPN. [CHAR LIMIT=40] -->
<string name="vpn_require_connection">Block connections without VPN</string>