diff options
| author | Sascha Prueter <saschap@google.com> | 2013-08-01 13:58:23 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-08-01 13:58:23 -0700 |
| commit | df195650191ba2d5a6090ff0721242b044b9b010 (patch) | |
| tree | f80617dff9e8348553343ad8a9b241a8453f9924 | |
| parent | bdf28a1892e0116a8d6774d9c9d47033eb354368 (diff) | |
| parent | d346fce2687237d30677b69e66c76ba6cba8622b (diff) | |
| download | packages_apps_Settings-df195650191ba2d5a6090ff0721242b044b9b010.zip packages_apps_Settings-df195650191ba2d5a6090ff0721242b044b9b010.tar.gz packages_apps_Settings-df195650191ba2d5a6090ff0721242b044b9b010.tar.bz2 | |
am d346fce2: Merge "Completely remove app ops activity." into jb-mr2-dev
* commit 'd346fce2687237d30677b69e66c76ba6cba8622b':
Completely remove app ops activity.
| -rw-r--r-- | AndroidManifest.xml | 7 |
1 files changed, 3 insertions, 4 deletions
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" |