diff options
| author | Amith Yamasani <yamasani@google.com> | 2009-09-17 10:46:44 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-09-17 10:46:44 -0700 |
| commit | 88da45e51ba137a7e83992efc9b63babad42d57c (patch) | |
| tree | 97abb2a2f051e83a8c30d86833fca071570f0093 /AndroidManifest.xml | |
| parent | 04f3b82137ae952f0e0653b9fdd1cf8d8d08afd7 (diff) | |
| parent | 985f5efc8278e1a5c2170c3aba354a4c9367b741 (diff) | |
| download | packages_apps_settings-88da45e51ba137a7e83992efc9b63babad42d57c.zip packages_apps_settings-88da45e51ba137a7e83992efc9b63babad42d57c.tar.gz packages_apps_settings-88da45e51ba137a7e83992efc9b63babad42d57c.tar.bz2 | |
am 985f5efc: Add "settings" to a bunch of screens. Fix 2110077, 2115734, 2101651
Merge commit '985f5efc8278e1a5c2170c3aba354a4c9367b741' into eclair-plus-aosp
* commit '985f5efc8278e1a5c2170c3aba354a4c9367b741':
Add "settings" to a bunch of screens. Fix 2110077, 2115734, 2101651
Diffstat (limited to 'AndroidManifest.xml')
| -rw-r--r-- | AndroidManifest.xml | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index a6ffb58..152c636 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -66,7 +66,7 @@ <!-- Wireless Controls --> <activity android:name="WirelessSettings" - android:label="@string/radio_controls_title" + android:label="@string/wireless_networks_settings_title" > <intent-filter> <action android:name="android.intent.action.MAIN" /> @@ -182,7 +182,8 @@ </intent-filter> </activity> - <activity android:name="LanguageSettings" android:label="@string/language_picker_title" + <activity android:name="LanguageSettings" + android:label="@string/language_keyboard_settings_title" android:clearTaskOnLaunch="true" > <intent-filter> @@ -215,7 +216,8 @@ </intent-filter> </activity> - <activity android:name="SoundAndDisplaySettings" android:label="@string/sound_and_display_settings" + <activity android:name="SoundAndDisplaySettings" + android:label="@string/sound_and_display_settings_title" android:clearTaskOnLaunch="true" > <intent-filter> @@ -292,7 +294,8 @@ </intent-filter> </activity> - <activity android:name="SecuritySettings" android:label="@string/security_settings_title" + <activity android:name="SecuritySettings" + android:label="@string/location_security_settings_title" android:configChanges="orientation|keyboardHidden" android:clearTaskOnLaunch="true" > @@ -316,8 +319,8 @@ </intent-filter> </activity> - <activity android:name="AccessibilitySettings" android:label="@string/accessibility_settings_title" - android:theme="@android:style/Theme.NoTitleBar"> + <activity android:name="AccessibilitySettings" + android:label="@string/accessibility_settings_title"> <intent-filter> <action android:name="android.intent.action.MAIN" /> <action android:name="android.settings.ACCESSIBILITY_SETTINGS" /> @@ -372,7 +375,8 @@ </intent-filter> </activity> - <activity android:name=".deviceinfo.Memory" android:label="@string/storage_settings_title"> + <activity android:name=".deviceinfo.Memory" + android:label="@string/storage_settings_title"> <intent-filter> <action android:name="android.intent.action.MAIN" /> <action android:name="android.settings.INTERNAL_STORAGE_SETTINGS" /> |