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

Improved always_on_vpn disabled text

Browse Source 
When the admin disallowed config vpn, always-on vpn description was
"Disabled by admin", so it was changed to "Controlled by admin" which
suits it better.

Bug: 29265180
Change-Id: If0da6b9ef3ce7179adeda53203c6caf4e3e9a995
This commit is contained in:
Andre Lago
2016-07-19 15:26:34 +01:00
parent 6263c2f6d4
commit f22679abbc
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>
<!-- Preference summary for active always-on vpn [CHAR LIMIT=40] -->
<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] -->
<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:title="@string/vpn_menu_lockdown"
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
android:key="forget_vpn"