diff options
| author | Amith Yamasani <yamasani@google.com> | 2009-09-23 15:32:53 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-09-23 15:32:53 -0700 |
| commit | ef83ad69c79069de13202173351183af46036bfd (patch) | |
| tree | a89c31d35036c81c63f9b0b95f0a69fdd15c4f2a /AndroidManifest.xml | |
| parent | e7f230a36332f5cdc1454e9ce44195c01a49806f (diff) | |
| parent | e65c943f974966e21c6f18dc9a95107ea1f07631 (diff) | |
| download | packages_apps_settings-ef83ad69c79069de13202173351183af46036bfd.zip packages_apps_settings-ef83ad69c79069de13202173351183af46036bfd.tar.gz packages_apps_settings-ef83ad69c79069de13202173351183af46036bfd.tar.bz2 | |
am e65c943f: New Privacy settings screen and Backup settings toggle. See #2132044 & #2133178
Merge commit 'e65c943f974966e21c6f18dc9a95107ea1f07631' into eclair-plus-aosp
* commit 'e65c943f974966e21c6f18dc9a95107ea1f07631':
New Privacy settings screen and Backup settings toggle. See #2132044 & #2133178
Diffstat (limited to 'AndroidManifest.xml')
| -rw-r--r-- | AndroidManifest.xml | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 7e2c248..de34dcd 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -311,6 +311,19 @@ </intent-filter> </activity> + <activity android:name="PrivacySettings" + android:label="@string/privacy_settings_title" + android:configChanges="orientation|keyboardHidden" + android:clearTaskOnLaunch="true" + > + <intent-filter> + <action android:name="android.intent.action.MAIN" /> + <action android:name="android.settings.PRIVACY_SETTINGS" /> + <category android:name="android.intent.category.DEFAULT" /> + <category android:name="android.intent.category.VOICE_LAUNCH" /> + </intent-filter> + </activity> + <activity android:name="IccLockSettings" android:label="@string/sim_lock_settings" android:process="com.android.phone"> <intent-filter> |