diff options
| author | Dianne Hackborn <hackbod@google.com> | 2009-09-01 12:34:33 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-09-01 12:34:33 -0700 |
| commit | feab7249a970b0670513a35495cbc53bbf909f8e (patch) | |
| tree | 136ac7ac2e458df11960e46445a1d5f13bcca205 /AndroidManifest.xml | |
| parent | f602bc8bee72c9845bd4c2319fdd149ff6861daf (diff) | |
| parent | c58c549cc963bd8946d332a0f9945d9a1ed19e99 (diff) | |
| download | packages_apps_settings-feab7249a970b0670513a35495cbc53bbf909f8e.zip packages_apps_settings-feab7249a970b0670513a35495cbc53bbf909f8e.tar.gz packages_apps_settings-feab7249a970b0670513a35495cbc53bbf909f8e.tar.bz2 | |
am c58c549c: New UI for viewing and stopping currently running services.
Merge commit 'c58c549cc963bd8946d332a0f9945d9a1ed19e99' into eclair-plus-aosp
* commit 'c58c549cc963bd8946d332a0f9945d9a1ed19e99':
New UI for viewing and stopping currently running services.
Diffstat (limited to 'AndroidManifest.xml')
| -rw-r--r-- | AndroidManifest.xml | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 2e31143..5c64fa1 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -279,6 +279,18 @@ </intent-filter> </activity> + <activity android:name="RunningServices" + android:label="@string/runningservices_settings_title" + android:clearTaskOnLaunch="true"> + <intent-filter> + <action android:name="android.intent.action.MAIN" /> + <category android:name="android.intent.category.DEFAULT" /> + <category android:name="android.intent.category.MONKEY" /> + <category android:name="android.intent.category.VOICE_LAUNCH" /> + <category android:name="com.android.settings.SHORTCUT" /> + </intent-filter> + </activity> + <activity android:name="SecuritySettings" android:label="@string/security_settings_title" android:configChanges="orientation|keyboardHidden" android:clearTaskOnLaunch="true" |