diff options
| author | Amith Yamasani <yamasani@google.com> | 2009-09-22 13:50:19 -0700 |
|---|---|---|
| committer | Amith Yamasani <yamasani@google.com> | 2009-09-23 15:01:11 -0700 |
| commit | e65c943f974966e21c6f18dc9a95107ea1f07631 (patch) | |
| tree | e591365b25c8288ae045e523e62c32f4f10b6080 /AndroidManifest.xml | |
| parent | 0ce6f6dbc842b4a9fce0c34850b17bf543a12ed0 (diff) | |
| download | packages_apps_settings-e65c943f974966e21c6f18dc9a95107ea1f07631.zip packages_apps_settings-e65c943f974966e21c6f18dc9a95107ea1f07631.tar.gz packages_apps_settings-e65c943f974966e21c6f18dc9a95107ea1f07631.tar.bz2 | |
New Privacy settings screen and Backup settings toggle. See #2132044 & #2133178
Also fixes 2138367: Share with Google setting doesn't get updated on checking the setting
And 2098232: "Set unlock pattern" should be at the top of the section
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 367aa9c..21e4dc2 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> |