commit ed71af9bd7ddddbd81da07b8d38b80243bcba55c
author Dave Burke <daveburke@google.com> Fri Aug 02 20:25:35 2013 +0000
committer The Android Automerger <android-build@android.com> Fri Aug 02 13:54:33 2013 -0700
tree 396d2cb8937fbb01aa0158ac7cf22cb6216fccc1
parent c8ee999b9df706209aeb1f230574131a032fef27

Revert "Completely remove app ops activity."

This reverts commit 1ad26e9c370e3db3ac801bda42b3fa52ab2e2d07.

Change-Id: I58b5ea280ed0dbff00f7f6f98fbd41575cdd5222

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 2d1f158..67aa7ee 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -794,7 +794,6 @@
                 android:value="com.android.settings.NotificationStation" />
         </activity>
 
-        <!--
         <activity android:name="Settings$AppOpsSummaryActivity"
                 android:label="@string/app_ops_settings"
                 android:taskAffinity=""
@@ -803,15 +802,17 @@
                 <action android:name="android.intent.action.MAIN" />
                 <action android:name="android.settings.APP_OPS_SETTINGS" />
                 <category android:name="android.intent.category.DEFAULT" />
+                <!-- Not yet ready to expose.
                 <category android:name="android.intent.category.VOICE_LAUNCH" />
                 <category android:name="com.android.settings.SHORTCUT" />
+                -->
             </intent-filter>
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
                 android:value="com.android.settings.applications.AppOpsSummary" />
+            <!--
             <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
-                android:resource="@id/application_settings" />
+                android:resource="@id/application_settings" /> -->
         </activity>
-        -->
         
         <activity android:name="Settings$LocationSettingsActivity"
                 android:label="@string/location_settings_title"