Merge commit '089e08d8c9b323064a75434a68dd76bbbcddbe9f'
* commit '089e08d8c9b323064a75434a68dd76bbbcddbe9f':
Fix bug 2088099 where the TTS example doesn't play in the Settings app
Merge commit '5b41931e1f94b2051b7c015081465f19a33096f9' into eclair-plus-aosp
* commit '5b41931e1f94b2051b7c015081465f19a33096f9':
Fix bug 2088099 where the TTS example doesn't play in the Settings app
* changes:
Fix bug 2088099 where the TTS example doesn't play in the Settings app when the UI is in Japanese. Rewrite of the initialization of the default language in the TTS Settings. The previous implementation had the following issues: - the "Listen to an example" didn't use the default settings - the string used for the example didn't match the selected language (this was in order to not imply that TTS is doing translation, but that proved confusing to users). The language initialization is now implemented in initDefaultLang() and ensures that the default locale is one supported in the array of available locales. The speech rate is also initialized from the settings or the default rate (if no value was stored in the settings).
when the UI is in Japanese.
Rewrite of the initialization of the default language in the TTS Settings.
The previous implementation had the following issues:
- the "Listen to an example" didn't use the default settings
- the string used for the example didn't match the selected language
(this was in order to not imply that TTS is doing translation, but
that proved confusing to users).
The language initialization is now implemented in initDefaultLang()
and ensures that the default locale is one supported in the array
of available locales.
The speech rate is also initialized from the settings or the
default rate (if no value was stored in the settings).
Merge commit '054509a8d420feac2b12c1aa46354dd6840505e1'
* commit '054509a8d420feac2b12c1aa46354dd6840505e1':
b/2050798 Bluetooth Passkeys should always be 6 digits so show leading zeros if needed.
Merge commit '77395cc39c88af0bb20ea18af532c87e934fb187' into eclair-plus-aosp
* commit '77395cc39c88af0bb20ea18af532c87e934fb187':
b/2050798 Bluetooth Passkeys should always be 6 digits so show leading zeros if needed.
Merge commit 'feab7249a970b0670513a35495cbc53bbf909f8e'
* commit 'feab7249a970b0670513a35495cbc53bbf909f8e':
New UI for viewing and stopping currently running services.
Merge commit 'c58c549cc963bd8946d332a0f9945d9a1ed19e99' into eclair-plus-aosp
* commit 'c58c549cc963bd8946d332a0f9945d9a1ed19e99':
New UI for viewing and stopping currently running services.
Merge commit 'f602bc8bee72c9845bd4c2319fdd149ff6861daf'
* commit 'f602bc8bee72c9845bd4c2319fdd149ff6861daf':
Fix grammar in unknown sources dialog. issue 1938
screenOrientation written as content instead of attribute by mistake
Merge commit '71964dd6598cf2b4744535e537ded21dbffe611c'
* commit '71964dd6598cf2b4744535e537ded21dbffe611c':
Show the Use location prompt only once if user agrees. Bug #1910370
Merge commit '98fa0e2941a86284d3eaae8c60fbde4a2410b786'
* commit '98fa0e2941a86284d3eaae8c60fbde4a2410b786':
High-resolution (hdpi) artwork from TAT for Settings.
REMOTE_PPP_HUNG_UP and PPP_NEGOTIATION_FAILED.
Also refactor the dialog creation code to directly use the err code as
the dialog id and make it easier to tell which type of dialog (reconnect
or edit) is invoked for which err code.
Merge commit 'd1de20d883725ce98931fbebeef9bed8c340352d'
* commit 'd1de20d883725ce98931fbebeef9bed8c340352d':
Fix strings whose apostrophes were eaten because of the lack of a backslash.
Merge commit '57d72f2c5d3de1eff9c11b43c30af796ebc008d7'
* commit '57d72f2c5d3de1eff9c11b43c30af796ebc008d7':
Cap the length of dictionary words to keep TextView from exploding.
Add Bluetooth device picker in Settings
- add resource to support device picker
- show different UI accroding to start Intent
- add OPP profile manager
Merge commit '36efef1d7122aab2cc1172e7b7fe4d79ac98a41f' into eclair
* commit '36efef1d7122aab2cc1172e7b7fe4d79ac98a41f':
cut number of frames in lock screen demo animation from 15 to 8
* changes:
1. Added the missing timezone for mainland China "Asia/Shanghai". In each localized version of timezones.xml, the name of this timezone is defined like "China Standard Time (Beijing)" if some other timezones are also in this format, or just "Beijing" if all of other timezones are of city names.
Now, instead of having equal space overall above and below lock pattern widget,
the lock pattern widget is centered within the space above the button bar
at the bottom. Also, removing the line below the lock pattern widget per
romain's recommendation; it looks goofy with the button bar below.
see screen shots in http://b/2045023 for the differences.
