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

Merge "Improved always_on_vpn disabled text"

Browse Source
This commit is contained in:
André Lago
2016-07-20 11:31:19 +00:00
committed by Android (Google) Code Review
parent 3e2ddff8f7 f22679abbc
commit 91c03c0962
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/values/strings.xml
View File

@@ -5295,6 +5295,8 @@
<string name="vpn_no_vpns_added">No VPNs added.</string> <string name="vpn_no_vpns_added">No VPNs added.</string>
<!-- Preference summary for active always-on vpn [CHAR LIMIT=40] --> <!-- Preference summary for active always-on vpn [CHAR LIMIT=40] -->
<string name="vpn_always_on_active">Always-on active</string> <string name="vpn_always_on_active">Always-on active</string>
<!-- Preference summary for inactive always-on vpn [CHAR LIMIT=40] -->
<string name="vpn_always_on_inactive">Always-on inactive</string>
<!-- Preference summary for app not supporting always-on vpn [CHAR LIMIT=NONE] --> <!-- Preference summary for app not supporting always-on vpn [CHAR LIMIT=NONE] -->
<string name="vpn_not_supported_by_this_app">Not supported by this app</string> <string name="vpn_not_supported_by_this_app">Not supported by this app</string>

6
res/xml/vpn_app_management.xml
View File

@@ -27,7 +27,11 @@
android:key="always_on_vpn" android:key="always_on_vpn"
android:title="@string/vpn_menu_lockdown" android:title="@string/vpn_menu_lockdown"
android:defaultValue="false" android:defaultValue="false"
settings:userRestriction="no_config_vpn"/> android:summaryOn="@string/vpn_always_on_active"
android:summaryOff="@string/vpn_always_on_inactive"
settings:userRestriction="no_config_vpn"
settings:useAdditionalSummary="true"
settings:restrictedSwitchSummary="@string/disabled_by_admin_summary_text" />
<com.android.settings.DimmableIconPreference <com.android.settings.DimmableIconPreference
android:key="forget_vpn" android:key="forget_vpn"