commit 9159fe9af8f85e4156f7f68430ed04615862da90
author Sudheer Shanka <sudheersai@google.com> Mon Nov 23 12:07:05 2015 +0000
committer Kenny Guy <kennyguy@google.com> Fri Dec 11 19:44:14 2015 +0000
tree 0f9b01f271702e227035808b2dd12326668e7eef
parent f467c0acacd834257189dd73f260939a742114f9

Add support for showing the admin disabling settings.

For settings disabled by user restrictions show
the user a lock icon and allow them to click to
find more info.

Bug: 22543585

Change-Id: Ie8b02ac26f2b22db386a9044f3c6570098f6e14b

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 43fe796..3bbc667 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -2646,5 +2646,15 @@
                 android:value="com.android.settings.applications.WriteSettingsDetails" />
         </activity>
 
+        <activity android:name="ShowAdminSupportDetailsDialog"
+                android:theme="@style/Transparent"
+                android:excludeFromRecents="true">
+
+            <intent-filter>
+                <action android:name="android.app.action.SHOW_ADMIN_SUPPORT_DETAILS" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity>
+
     </application>
 </manifest>