From f22679abbc5154b02e89c3a99ddb2097db05c3e0 Mon Sep 17 00:00:00 2001
From: Andre Lago <andrelago@google.com>
Date: Tue, 19 Jul 2016 15:26:34 +0100
Subject: [PATCH] Improved always_on_vpn disabled text

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
---
 res/values/strings.xml         | 2 ++
 res/xml/vpn_app_management.xml | 6 +++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 6eb82192acc..df8c31f5d48 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -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>
 
diff --git a/res/xml/vpn_app_management.xml b/res/xml/vpn_app_management.xml
index 9e9b6cecb4e..93e15bc5945 100644
--- a/res/xml/vpn_app_management.xml
+++ b/res/xml/vpn_app_management.xml
@@ -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"