diff options
| author | Hung-ying Tyan <tyanh@google.com> | 2009-09-28 01:09:34 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-09-28 01:09:34 -0700 |
| commit | ad088b68b646bfc5195f04b1d7e96a68f8995c54 (patch) | |
| tree | 4b2ee2f7f9b3c6b4818c6b9ddcb36dc9e021be8a /AndroidManifest.xml | |
| parent | b62f48c6d32f74d8683bc300332afd5635af143a (diff) | |
| parent | 70cef693d133bc66db029bf055c51733ac54c972 (diff) | |
| download | packages_apps_settings-ad088b68b646bfc5195f04b1d7e96a68f8995c54.zip packages_apps_settings-ad088b68b646bfc5195f04b1d7e96a68f8995c54.tar.gz packages_apps_settings-ad088b68b646bfc5195f04b1d7e96a68f8995c54.tar.bz2 | |
am 70cef693: Add CredentialInstaller.
Merge commit '70cef693d133bc66db029bf055c51733ac54c972' into eclair-plus-aosp
* commit '70cef693d133bc66db029bf055c51733ac54c972':
Add CredentialInstaller.
Diffstat (limited to 'AndroidManifest.xml')
| -rw-r--r-- | AndroidManifest.xml | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 2af7b89..6c429a5 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -313,13 +313,20 @@ <action android:name="android.settings.SECURITY_SETTINGS" /> <action android:name="android.settings.LOCATION_SOURCE_SETTINGS" /> <action android:name="android.credentials.UNLOCK" /> - <action android:name="android.credentials.SYSTEM_INSTALL" /> <category android:name="android.intent.category.DEFAULT" /> <category android:name="android.intent.category.VOICE_LAUNCH" /> <category android:name="com.android.settings.SHORTCUT" /> </intent-filter> </activity> + <activity android:name="CredentialInstaller" + android:label="@string/credential_installer_activity_title"> + <intent-filter> + <action android:name="android.credentials.SYSTEM_INSTALL" /> + <category android:name="android.intent.category.DEFAULT" /> + </intent-filter> + </activity> + <activity android:name="PrivacySettings" android:label="@string/privacy_settings_title" android:configChanges="orientation|keyboardHidden" |