Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Adapt first time VPN connection warning to TV form factor" am: 2af1306a77

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1652319

Change-Id: I267072399a8d60097704b4c5e35b67ffc26077e4
This commit is contained in:
Dorin Drimus
2021-03-25 06:05:45 +00:00
committed by Automerger Merge Worker
parent e29ed20fff 2af1306a77
commit 601e1dd64c
1 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
packages/VpnDialogs/res/values/strings.xml
View File

@@ -28,6 +28,17 @@
]]> appears at the top of your screen when VPN is active. ]]> appears at the top of your screen when VPN is active.
</string> </string>
<!-- TV specific dialog message to warn about the risk of using a VPN application. [CHAR LIMIT=NONE] -->
<string name="warning" product="tv">
<xliff:g id="app">%s</xliff:g> wants to set up a VPN connection
that allows it to monitor network traffic. Only accept if you trust the source.
<![CDATA[
<br />
<br />
<img src="vpn_icon" />
]]> appears on your screen when VPN is active.
</string>
<!-- Dialog title for built-in VPN. [CHAR LIMIT=40] --> <!-- Dialog title for built-in VPN. [CHAR LIMIT=40] -->
<string name="legacy_title">VPN is connected</string> <string name="legacy_title">VPN is connected</string>
<!-- Label for the name of the current VPN session. [CHAR LIMIT=20] --> <!-- Label for the name of the current VPN session. [CHAR LIMIT=20] -->