Update icons and strings for always-on VPN info
- Replaces the realistic outline of a key with the key icon used in other places, eg. status bar icon - Updates string "tap to configure" to "tap to set up" and adds another string "always-on vpn disconnected" which is more neutral than "always-on VPN failed". Bug: 29123115 Change-Id: I4685758b682dbc947423d4ec81891506a7dc826e
|
Before Width: | Height: | Size: 539 B After Width: | Height: | Size: 282 B |
|
Before Width: | Height: | Size: 577 B After Width: | Height: | Size: 297 B |
|
Before Width: | Height: | Size: 502 B After Width: | Height: | Size: 196 B |
|
Before Width: | Height: | Size: 496 B After Width: | Height: | Size: 209 B |
24
core/res/res/drawable-nodpi/vpn_connected.xml
Normal file
@@ -0,0 +1,24 @@
|
||||
<!--
|
||||
Copyright (C) 2016 The Android Open Source Project
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
you may not use this file except in compliance with the License.
|
||||
You may obtain a copy of the License at
|
||||
|
||||
http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
||||
Unless required by applicable law or agreed to in writing, software
|
||||
distributed under the License is distributed on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
-->
|
||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:width="48dp"
|
||||
android:height="48dp"
|
||||
android:viewportWidth="48.0"
|
||||
android:viewportHeight="48.0">
|
||||
<path
|
||||
android:fillColor="#FF000000"
|
||||
android:pathData="M25.3,20c-1.65,-4.66 -6.08,-8 -11.3,-8 -6.63,0 -12,5.37 -12,12s5.37,12 12,12c5.22,0 9.65,-3.34 11.3,-8H34v8h8v-8h4v-8H25.3zM14,28c-2.21,0 -4,-1.79 -4,-4s1.79,-4 4,-4 4,1.79 4,4 -1.79,4 -4,4z"/>
|
||||
</vector>
|
||||
24
core/res/res/drawable-nodpi/vpn_disconnected.xml
Normal file
@@ -0,0 +1,24 @@
|
||||
<!--
|
||||
Copyright (C) 2016 The Android Open Source Project
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
you may not use this file except in compliance with the License.
|
||||
You may obtain a copy of the License at
|
||||
|
||||
http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
||||
Unless required by applicable law or agreed to in writing, software
|
||||
distributed under the License is distributed on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
-->
|
||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:width="48dp"
|
||||
android:height="48dp"
|
||||
android:viewportWidth="48.0"
|
||||
android:viewportHeight="48.0">
|
||||
<path
|
||||
android:fillColor="#FF000000"
|
||||
android:pathData="M25.3,20c-1.65,-4.66 -6.08,-8 -11.3,-8 -6.63,0 -12,5.37 -12,12s5.37,12 12,12c5.22,0 9.65,-3.34 11.3,-8H34v8h8v-8h4v-8H25.3zM14,28c-2.21,0 -4,-1.79 -4,-4s1.79,-4 4,-4 4,1.79 4,4 -1.79,4 -4,4z"/>
|
||||
</vector>
|
||||
|
Before Width: | Height: | Size: 688 B After Width: | Height: | Size: 342 B |
|
Before Width: | Height: | Size: 717 B After Width: | Height: | Size: 360 B |
|
Before Width: | Height: | Size: 781 B After Width: | Height: | Size: 476 B |
|
Before Width: | Height: | Size: 868 B After Width: | Height: | Size: 513 B |
@@ -3294,10 +3294,12 @@
|
||||
<string name="vpn_lockdown_connecting">Always-on VPN connecting\u2026</string>
|
||||
<!-- Notification title when connected to lockdown VPN. -->
|
||||
<string name="vpn_lockdown_connected">Always-on VPN connected</string>
|
||||
<!-- Notification title when not connected to lockdown VPN. -->
|
||||
<string name="vpn_lockdown_disconnected">Always-on VPN disconnected</string>
|
||||
<!-- Notification title when error connecting to lockdown VPN. -->
|
||||
<string name="vpn_lockdown_error">Always-on VPN error</string>
|
||||
<!-- Notification body that indicates user can touch to configure lockdown VPN connection. -->
|
||||
<string name="vpn_lockdown_config">Tap to configure</string>
|
||||
<string name="vpn_lockdown_config">Tap to set up</string>
|
||||
|
||||
<!-- Localized strings for WebView -->
|
||||
<!-- Label for button in a WebView that will open a chooser to choose a file to upload -->
|
||||
|
||||
@@ -1861,6 +1861,7 @@
|
||||
<java-symbol type="string" name="vpn_title_long" />
|
||||
<java-symbol type="string" name="vpn_lockdown_connecting" />
|
||||
<java-symbol type="string" name="vpn_lockdown_connected" />
|
||||
<java-symbol type="string" name="vpn_lockdown_disconnected" />
|
||||
<java-symbol type="string" name="vpn_lockdown_error" />
|
||||
<java-symbol type="string" name="vpn_lockdown_config" />
|
||||
<java-symbol type="string" name="wallpaper_binding_label" />
|
||||
|
||||