am f3a0ce28: am 64b28a0d: Disable AppOps for real.

* commit 'f3a0ce28ba5c276a74bbd76b44ce5d421aac4812':
  Disable AppOps for real.
This commit is contained in:
Dave Burke
2013-09-25 10:38:19 -07:00
committed by Android Git Automerger

View File

@@ -797,6 +797,7 @@
android:value="com.android.settings.NotificationStation" />
</activity>
<!--
<activity android:name="Settings$AppOpsSummaryActivity"
android:label="@string/app_ops_settings"
android:taskAffinity=""
@@ -805,17 +806,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:uiOptions="splitActionBarWhenNarrow"