diff options
| author | Dave Burke <daveburke@google.com> | 2013-08-02 13:42:04 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-08-02 13:42:04 -0700 |
| commit | 0b849a704b92e74b3e8c23c7ffbd26c38579369c (patch) | |
| tree | acf4142e3af9aa8599cc73824106fccd47062821 | |
| parent | 99d5938cf26d818deb9b30917ffafcb4b6b46365 (diff) | |
| parent | 1a32d477934399ca5331863fe17651c1dbf165b8 (diff) | |
| download | packages_apps_Settings-0b849a704b92e74b3e8c23c7ffbd26c38579369c.zip packages_apps_Settings-0b849a704b92e74b3e8c23c7ffbd26c38579369c.tar.gz packages_apps_Settings-0b849a704b92e74b3e8c23c7ffbd26c38579369c.tar.bz2 | |
am 1a32d477: am 136059f1: Merge "Revert "Completely remove app ops activity."" into jb-mr2-dev
* commit '1a32d477934399ca5331863fe17651c1dbf165b8':
Revert "Completely remove app ops activity."
| -rw-r--r-- | AndroidManifest.xml | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index b489a89..7025a9c 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -795,7 +795,6 @@ android:value="com.android.settings.NotificationStation" /> </activity> - <!-- <activity android:name="Settings$AppOpsSummaryActivity" android:label="@string/app_ops_settings" android:taskAffinity="" @@ -804,15 +803,17 @@ <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" |