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

This commit is contained in:
Sascha Prueter
2013-08-01 20:55:38 +00:00
committed by Android (Google) Code Review

View File

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