Merge commit '3ca2df1ce5683fe9713290f7819b54cea3a2cdfa'
* commit '3ca2df1ce5683fe9713290f7819b54cea3a2cdfa':
Update application for Bluetooth API changes.
Merge commit '16cc86315d7a8e1f6a0f3083d0a810a7cb097832' into eclair-plus-aosp
* commit '16cc86315d7a8e1f6a0f3083d0a810a7cb097832':
Update application for Bluetooth API changes.
Merge commit 'cded847838c726342bfe56e69d417d160c73f212' into eclair-plus-aosp
* commit 'cded847838c726342bfe56e69d417d160c73f212':
Make running services show dependent processes.
Merge commit '23c24f87914da3cc798e2fb3b2b08898d89acb49'
* commit '23c24f87914da3cc798e2fb3b2b08898d89acb49':
Fix bug 2078454 where clicking on Settings in the Home menu would
Merge commit 'c93110409c05bef4be5428ef36099a586828cbb2'
* commit 'c93110409c05bef4be5428ef36099a586828cbb2':
Fix display strings and enter passkey handling.
Merge commit '8a6730df320b2fa10ac11ea1aad06d85bbed31e4'
* commit '8a6730df320b2fa10ac11ea1aad06d85bbed31e4':
Update application for Bluetooth API change: deprecation of BluetoothError.
Merge commit '3b83477fe391ea6b9eb6ff783283a3f3002e8e7a'
* commit '3b83477fe391ea6b9eb6ff783283a3f3002e8e7a':
Update application for Bluetooth API change.
Merge commit '18cd40930179a7c6ab30e4e5ce62919fde16ce6f' into eclair-plus-aosp
* commit '18cd40930179a7c6ab30e4e5ce62919fde16ce6f':
Fix bug 2078454 where clicking on Settings in the Home menu would
* changes:
Fix bug 2078454 where clicking on Settings in the Home menu would take the user to Market after clicking on "Install Voice Data" in the TTS Settings page. Launching the Activity for the installation of the TTS data should be a distinct task, dissociated from the one associated with the Settings app. Also the intent ACTION_INSTALL_TTS_DATA doesn't return a result, so the activity should be started with startActivity() rather than startActivityForResult().
take the user to Market after clicking on "Install Voice Data" in
the TTS Settings page.
Launching the Activity for the installation of the TTS data should
be a distinct task, dissociated from the one associated with the
Settings app. Also the intent ACTION_INSTALL_TTS_DATA doesn't return
a result, so the activity should be started with startActivity()
rather than startActivityForResult().
Merge commit '6ee7dd09138363737805ae1e6e93649959c6ab83' into eclair-plus-aosp
* commit '6ee7dd09138363737805ae1e6e93649959c6ab83':
Fix display strings and enter passkey handling.
Merge commit '843b4ee178f6cfd7b965c8e2dea5296d1520894d' into eclair-plus-aosp
* commit '843b4ee178f6cfd7b965c8e2dea5296d1520894d':
Update application for Bluetooth API change: deprecation of BluetoothError.
Merge commit '1e4519979b32957698a6825eb6eb61bd85dd7370' into eclair-plus-aosp
* commit '1e4519979b32957698a6825eb6eb61bd85dd7370':
Update application for Bluetooth API change.
Merge commit '140fb90a5cfc6e146e006350edfb41a9978ad105' into eclair-plus-aosp
* commit '140fb90a5cfc6e146e006350edfb41a9978ad105':
Import revised translations. DO NOT MERGE
Merge commit 'b7558f3700c6588e323975af2c24cd7f18ba007a'
* commit 'b7558f3700c6588e323975af2c24cd7f18ba007a':
Improve running services to services managed by the system.
Merge commit '76315391f07d022e31c176633ae3aeaee5bb14ec' into eclair-plus-aosp
* commit '76315391f07d022e31c176633ae3aeaee5bb14ec':
Improve running services to services managed by the system.
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 '476331d9ec0b0f700e79d04873c75d788a946cb8'
* commit '476331d9ec0b0f700e79d04873c75d788a946cb8':
b/2045917 Fixed the problem where Bluetooth enable/disable remain disabled when Airplane mode is turned off.
Merge commit '39ec58134dcdfac4c8cbd102187da211f17aa8de' into eclair-plus-aosp
* commit '39ec58134dcdfac4c8cbd102187da211f17aa8de':
b/2045917 Fixed the problem where Bluetooth enable/disable remain disabled when Airplane mode is turned off.
