diff options
| author | Amith Yamasani <yamasani@google.com> | 2009-09-16 12:43:50 -0700 |
|---|---|---|
| committer | Amith Yamasani <yamasani@google.com> | 2009-09-17 10:39:10 -0700 |
| commit | 985f5efc8278e1a5c2170c3aba354a4c9367b741 (patch) | |
| tree | 782d6a556a3b35f17a8ad780efa53a7c105d6374 /AndroidManifest.xml | |
| parent | 5d9ee1490258d56e0e1074b5e9b9a4bff39dd602 (diff) | |
| download | packages_apps_settings-985f5efc8278e1a5c2170c3aba354a4c9367b741.zip packages_apps_settings-985f5efc8278e1a5c2170c3aba354a4c9367b741.tar.gz packages_apps_settings-985f5efc8278e1a5c2170c3aba354a4c9367b741.tar.bz2 | |
Add "settings" to a bunch of screens. Fix 2110077, 2115734, 2101651
Move Factory data reset to About phone.
Show input method when dialog to enter/edit new dictionary word is displayed.
Add title to Accessibility settings.
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 1ea703c..908c955 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" /> |