commit d346fce2687237d30677b69e66c76ba6cba8622b
author Sascha Prueter <saschap@google.com> Thu Aug 01 20:55:38 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Aug 01 20:55:38 2013 +0000
tree f80617dff9e8348553343ad8a9b241a8453f9924
parent 0cb57011065dd06e5faba2f4d72bbb1d31a3c309
parent 1ad26e9c370e3db3ac801bda42b3fa52ab2e2d07

Merge "Completely remove app ops activity." into jb-mr2-dev

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 67aa7ee..2d1f158 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -794,6 +794,7 @@
                 android:value="com.android.settings.NotificationStation" />
         </activity>
 
+        <!--
         <activity android:name="Settings$AppOpsSummaryActivity"
                 android:label="@string/app_ops_settings"
                 android:taskAffinity=""
@@ -802,17 +803,15 @@
                 <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"