diff options
| author | Charles Chen <clchen@google.com> | 2010-04-08 22:42:14 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-04-08 22:42:14 -0700 |
| commit | df7d8ee6a59fe67bf41f026b1245238c21acd56e (patch) | |
| tree | 22411e90cda45e059ad56c6f0d4a754f6d880f6f /res/values | |
| parent | d86cfddae6fe44ac33066302cf568faafa9a09c0 (diff) | |
| parent | 8c8185b2606f3a232e4498b1128ca7bdecc3628f (diff) | |
| download | packages_apps_Settings-df7d8ee6a59fe67bf41f026b1245238c21acd56e.zip packages_apps_Settings-df7d8ee6a59fe67bf41f026b1245238c21acd56e.tar.gz packages_apps_Settings-df7d8ee6a59fe67bf41f026b1245238c21acd56e.tar.bz2 | |
am 8c8185b2: Fixing bugs 2577511 and 2581920. Making sure that the language, country, and variant defaults are always set to something to ensure that there won\'t be an NPE. Dismissing the ListPreference dialogs before a rotation to avoid list data corruption caused by
Merge commit '8c8185b2606f3a232e4498b1128ca7bdecc3628f' into kraken
* commit '8c8185b2606f3a232e4498b1128ca7bdecc3628f':
Fixing bugs 2577511 and 2581920.
Diffstat (limited to 'res/values')
| -rw-r--r-- | res/values/arrays.xml | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/res/values/arrays.xml b/res/values/arrays.xml index ed80892..0ae8eb4 100644 --- a/res/values/arrays.xml +++ b/res/values/arrays.xml @@ -161,6 +161,15 @@ <item>Questo è un esempio di sintesi vocale in italiano.</item> <item>Este es un ejemplo de síntesis de voz en español.</item> </string-array> + <!-- Do not translate. --> + <string-array name="tts_engine_entries"> + <item>Pico TTS</item> + </string-array> + <!-- Do not translate. --> + <string-array name="tts_engine_values"> + <item>com.svox.pico</item> + </string-array> + <!-- Wi-Fi settings --> |