diff options
| author | Wink Saville <wink@google.com> | 2009-09-27 12:00:01 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-09-27 12:00:01 -0700 |
| commit | bfcb8900804cc9e7e18ef60805d994dcf53a45c7 (patch) | |
| tree | 1fa0dd4635ebcfed6eec66eac6a5d920f6bfade5 /AndroidManifest.xml | |
| parent | d13e95cc2605c3ffe9d961d2e2c269c9179b5007 (diff) | |
| parent | a40fb23734cc5d5ac6e69a060cbb488269ad8af3 (diff) | |
| download | packages_apps_settings-bfcb8900804cc9e7e18ef60805d994dcf53a45c7.zip packages_apps_settings-bfcb8900804cc9e7e18ef60805d994dcf53a45c7.tar.gz packages_apps_settings-bfcb8900804cc9e7e18ef60805d994dcf53a45c7.tar.bz2 | |
am a40fb237: Add Safety information to Settings > About Phone
Merge commit 'a40fb23734cc5d5ac6e69a060cbb488269ad8af3' into eclair-plus-aosp
* commit 'a40fb23734cc5d5ac6e69a060cbb488269ad8af3':
Add Safety information to Settings > About Phone
Diffstat (limited to 'AndroidManifest.xml')
| -rw-r--r-- | AndroidManifest.xml | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 1700349..2af7b89 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -249,6 +249,15 @@ </intent-filter> </activity> + <activity android:name="SettingsSafetyLegalActivity" + android:label="@string/settings_safetylegal_activity_title" + android:theme="@*android:style/Theme.Dialog.Alert"> + <intent-filter> + <action android:name="android.settings.SAFETY" /> + <category android:name="android.intent.category.DEFAULT" /> + </intent-filter> + </activity> + <activity android:name="ApplicationSettings" android:label="@string/applications_settings_header" > <intent-filter> |