diff options
| author | Jeff Davidson <jpd@google.com> | 2014-08-11 14:07:27 -0700 |
|---|---|---|
| committer | Jeff Davidson <jpd@google.com> | 2014-08-20 16:55:28 -0700 |
| commit | 05542603dd4f1e0ea47a3dca01de3999a9a329a9 (patch) | |
| tree | 69b8c0c2c2cec2e11b633c9232f7e97ad144b085 /packages/VpnDialogs/res/values | |
| parent | 23ad2790ed45d56eeb5d03c66531cb9b5811d6fe (diff) | |
| download | frameworks_base-05542603dd4f1e0ea47a3dca01de3999a9a329a9.zip frameworks_base-05542603dd4f1e0ea47a3dca01de3999a9a329a9.tar.gz frameworks_base-05542603dd4f1e0ea47a3dca01de3999a9a329a9.tar.bz2 | |
Less intrusive VPN dialog and other UX tweaks.
-The ability to launch VPNs is now sticky; once approved by the user,
further approvals are not needed UNLESS the connection is revoked in
Quick Settings.
-The old persistent notification has been removed in favor of the new
Quick Settings UI.
-The name of the VPN app is now pulled from the label of the VPN
service rather than the app itself, if one is set.
Bug: 12878887
Bug: 16578022
Change-Id: I102a14c05db26ee3aef030cda971e5165f078a91
Diffstat (limited to 'packages/VpnDialogs/res/values')
| -rw-r--r-- | packages/VpnDialogs/res/values/strings.xml | 41 |
1 files changed, 8 insertions, 33 deletions
diff --git a/packages/VpnDialogs/res/values/strings.xml b/packages/VpnDialogs/res/values/strings.xml index 3ff767a..84206a1 100644 --- a/packages/VpnDialogs/res/values/strings.xml +++ b/packages/VpnDialogs/res/values/strings.xml @@ -17,40 +17,15 @@ <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <!-- Dialog title to identify the request from a VPN application. [CHAR LIMIT=60] --> - <string name="prompt"><xliff:g id="app">%s</xliff:g> - attempts to create a VPN connection. - </string> + <string name="prompt">Connection request</string> <!-- Dialog message to warn about the risk of using a VPN application. [CHAR LIMIT=NONE] --> - <string name="warning">By proceeding, you are giving the application - permission to intercept all network traffic. - <b>Do NOT accept unless you trust the application.</b> Otherwise, - you run the risk of having your data compromised by a malicious - software. - </string> - - <!-- Checkbox label to accept the request from a VPN application. [CHAR LIMIT=60] --> - <string name="accept">I trust this application.</string> - - <!-- Dialog title for built-in VPN. [CHAR LIMIT=40] --> - <string name="legacy_title">VPN is connected</string> - <!-- Button label to configure the current VPN session. [CHAR LIMIT=20] --> - <string name="configure">Configure</string> - <!-- Button label to disconnect the current VPN session. [CHAR LIMIT=20] --> - <string name="disconnect">Disconnect</string> - - <!-- Label for the name of the current VPN session. [CHAR LIMIT=20] --> - <string name="session">Session:</string> - <!-- Label for the duration of the current VPN session. [CHAR LIMIT=20] --> - <string name="duration">Duration:</string> - <!-- Label for the network usage of data transmitted over VPN. [CHAR LIMIT=20] --> - <string name="data_transmitted">Sent:</string> - <!-- Label for the network usage of data received over VPN. [CHAR LIMIT=20] --> - <string name="data_received">Received:</string> - - <!-- Formatted string for the network usage over VPN. [CHAR LIMIT=40] --> - <string name="data_value_format"> - <xliff:g id="number">%1$s</xliff:g> bytes / - <xliff:g id="number">%2$s</xliff:g> packets + <string name="warning"><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 at the top of your screen when VPN is active. </string> </resources> |