Commit: d346fce2687237d30677b69e66c76ba6cba8622b - packages-apps-Settings (git)

packages/apps/Settings

Commit MetaInfo

• Revision: d346fce2687237d30677b69e66c76ba6cba8622b (tree)
• Time: 2013-08-02 05:55:38
• Author: Sascha Prueter <saschap@goog...>
• Commiter: Android (Google) Code Review

Log Message

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

Change Summary

• modified: AndroidManifest.xml

Incremental Difference

--- 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"