diff options
| author | Sascha Prueter <saschap@google.com> | 2013-08-01 14:01:13 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-08-01 14:01:13 -0700 |
| commit | 99d5938cf26d818deb9b30917ffafcb4b6b46365 (patch) | |
| tree | 90b5718a1bc87175965f68cd8b8834085f6b1900 | |
| parent | 781458b374bf0914ca96993b19f5cc52c572ff65 (diff) | |
| parent | df195650191ba2d5a6090ff0721242b044b9b010 (diff) | |
| download | packages_apps_Settings-99d5938cf26d818deb9b30917ffafcb4b6b46365.zip packages_apps_Settings-99d5938cf26d818deb9b30917ffafcb4b6b46365.tar.gz packages_apps_Settings-99d5938cf26d818deb9b30917ffafcb4b6b46365.tar.bz2 | |
am df195650: am d346fce2: Merge "Completely remove app ops activity." into jb-mr2-dev
* commit 'df195650191ba2d5a6090ff0721242b044b9b010':
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 7025a9c..b489a89 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -795,6 +795,7 @@ android:value="com.android.settings.NotificationStation" /> </activity> + <!-- <activity android:name="Settings$AppOpsSummaryActivity" android:label="@string/app_ops_settings" android:taskAffinity="" @@ -803,17 +804,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" |