From 415bd9ece19ee0574eea505ca91835a72843c20f Mon Sep 17 00:00:00 2001
From: Sudheer Shanka <sudheersai@google.com>
Date: Wed, 13 Apr 2016 10:13:16 -0700
Subject: [PATCH] Add additional summaries for some restricted switch
 preferences.

For some of the switch preferences, we need the new summary
"Enabled/Disabled" so that the user know about the switch state but
we can't replace some existing summaries because they provide
context.

Bug: 27659072
Change-Id: I65aca79184f543ef3fc85634594cad75f516d2fa
---
 res/xml/security_settings_misc.xml | 6 ++++--
 res/xml/user_settings.xml          | 3 ++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/res/xml/security_settings_misc.xml b/res/xml/security_settings_misc.xml
index 2577b6c6e7d..0ba10c07b53 100644
--- a/res/xml/security_settings_misc.xml
+++ b/res/xml/security_settings_misc.xml
@@ -15,7 +15,8 @@
 -->
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-                  android:title="@string/security_settings_title">
+        xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
+        android:title="@string/security_settings_title">
 
     <PreferenceCategory android:key="sim_lock"
             android:title="@string/sim_lock_settings_title"
@@ -54,7 +55,8 @@
         <com.android.settingslib.RestrictedSwitchPreference android:key="toggle_install_applications"
                 android:title="@string/install_applications"
                 android:summaryOff="@string/install_unknown_applications"
-                android:summaryOn="@string/install_unknown_applications" />
+                android:summaryOn="@string/install_unknown_applications"
+                settings:useAdditionalSummary="true" />
 
     </PreferenceCategory>
 
diff --git a/res/xml/user_settings.xml b/res/xml/user_settings.xml
index b89f7668eaf..cd0103d476a 100644
--- a/res/xml/user_settings.xml
+++ b/res/xml/user_settings.xml
@@ -34,7 +34,8 @@
         <com.android.settingslib.RestrictedSwitchPreference
                 android:key="add_users_when_locked"
                 android:title="@string/user_add_on_lockscreen_menu"
-                android:summary="@string/user_add_on_lockscreen_menu_summary" />
+                android:summary="@string/user_add_on_lockscreen_menu_summary"
+                settings:useAdditionalSummary="true" />
     </PreferenceCategory>
     <Preference
         android:key="emergency_info"