diff options
| author | Jean Chalard <jchalard@google.com> | 2011-08-31 21:40:43 +0900 |
|---|---|---|
| committer | Jean Chalard <jchalard@google.com> | 2011-09-01 20:38:52 +0900 |
| commit | 8ba5c42b213c4cd5b8773595fea2a1be6a18d711 (patch) | |
| tree | 82bf9da360b59046323fda10c52a87fde8d23e01 /res/xml | |
| parent | 8ff6222a9136cdbaeea9191869b90abd179efc85 (diff) | |
| download | packages_apps_Settings-8ba5c42b213c4cd5b8773595fea2a1be6a18d711.zip packages_apps_Settings-8ba5c42b213c4cd5b8773595fea2a1be6a18d711.tar.gz packages_apps_Settings-8ba5c42b213c4cd5b8773595fea2a1be6a18d711.tar.bz2 | |
Update settings wording for ICS
Bug: 5069983
Change-Id: I882aded067e8cc75197f6d3fa5c11388368b6996
Diffstat (limited to 'res/xml')
| -rw-r--r-- | res/xml/language_settings.xml | 33 |
1 files changed, 12 insertions, 21 deletions
diff --git a/res/xml/language_settings.xml b/res/xml/language_settings.xml index 1598939..fbfb3d7 100644 --- a/res/xml/language_settings.xml +++ b/res/xml/language_settings.xml @@ -18,23 +18,18 @@ xmlns:settings="http://schemas.android.com/apk/res/com.android.settings" android:title="@string/language_keyboard_settings_title"> - <PreferenceCategory android:key="language_settings_category" - android:title="@string/language_settings_category"> + <PreferenceScreen + android:fragment="com.android.settings.LocalePicker" + android:key="phone_language" + android:title="@string/phone_language"/> - <PreferenceScreen - android:fragment="com.android.settings.LocalePicker" - android:key="phone_language" - android:title="@string/phone_language"/> + <com.android.settings.inputmethod.SpellCheckersPreference + android:key="spellcheckers_settings" + android:title="@string/spellcheckers_settings_title"/> - <!-- User dictionary preference title and fragment will be set programmatically. --> - <PreferenceScreen - android:key="key_user_dictionary_settings" /> - - <com.android.settings.inputmethod.SpellCheckersPreference - android:key="spellcheckers_settings" - android:title="@string/spellcheckers_settings_title"/> - - </PreferenceCategory> + <!-- User dictionary preference title and fragment will be set programmatically. --> + <PreferenceScreen + android:key="key_user_dictionary_settings" /> <PreferenceCategory android:key="keyboard_settings_category" android:title="@string/keyboard_settings_category"> @@ -65,8 +60,8 @@ android:persistent="false"/> </PreferenceCategory> - <PreferenceCategory android:key="voice_input_category" - android:title="@string/voice_input_category" > + <PreferenceCategory android:key="voice_category" + android:title="@string/voice_category" > <!-- entries, entryValues, and defaultValue will be populated programmatically. --> <ListPreference @@ -77,10 +72,6 @@ <!-- An intent for this preference will be populated programmatically. --> <PreferenceScreen android:key="recognizer_settings" android:title="@string/recognizer_settings_title" /> - </PreferenceCategory> - - <PreferenceCategory android:key="voice_output_category" - android:title="@string/voice_output_category" > <PreferenceScreen android:key="tts_settings" android:fragment="com.android.settings.tts.TextToSpeechSettings" |