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

Merge "VPN settings: update strings for always-on VPN"

Browse Source
This commit is contained in:
Charles He
2017-03-25 00:01:18 +00:00
committed by Android (Google) Code Review
parent ece7be14cb cce4e61260
commit eff418df7f
3 changed files with 32 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
res/xml/vpn_app_management.xml
View File

@@ -27,8 +27,7 @@
android:key="always_on_vpn"
android:title="@string/vpn_menu_lockdown"
android:defaultValue="false"
android:summaryOn="@string/vpn_always_on_active"
android:summaryOff="@string/vpn_always_on_inactive"
android:summary="@string/vpn_always_on_summary"
settings:userRestriction="no_config_vpn"
settings:useAdditionalSummary="true"
settings:restrictedSwitchSummary="@string/disabled_by_admin_summary_text" />
@@ -37,8 +36,6 @@
android:key="lockdown_vpn"
android:title="@string/vpn_require_connection"
android:defaultValue="false"
android:summaryOn="@string/vpn_lockdown_active"
android:summaryOff="@string/vpn_lockdown_inactive"
android:dependency="always_on_vpn"
settings:userRestriction="no_config_vpn"
settings:useAdditionalSummary="true"