Merge commit '6ee7dd09138363737805ae1e6e93649959c6ab83' into eclair-plus-aosp
* commit '6ee7dd09138363737805ae1e6e93649959c6ab83':
Fix display strings and enter passkey handling.
Merge commit '76315391f07d022e31c176633ae3aeaee5bb14ec' into eclair-plus-aosp
* commit '76315391f07d022e31c176633ae3aeaee5bb14ec':
Improve running services to services managed by the system.
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 '77395cc39c88af0bb20ea18af532c87e934fb187' into eclair-plus-aosp
* commit '77395cc39c88af0bb20ea18af532c87e934fb187':
b/2050798 Bluetooth Passkeys should always be 6 digits so show leading zeros if needed.
Merge commit 'c58c549cc963bd8946d332a0f9945d9a1ed19e99' into eclair-plus-aosp
* commit 'c58c549cc963bd8946d332a0f9945d9a1ed19e99':
New UI for viewing and stopping currently running services.
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.
Add Bluetooth device picker in Settings
- add resource to support device picker
- show different UI accroding to start Intent
- add OPP profile manager
- Changed the Passkey confirmation to show Pair/Don't Pair.
- Fixed the problem where the Ok button was showing up as Pair for the error dialog box.
- Disable the toasts when pairing failed in this case. Will need to check if this causes regression in other cases.
+ Now it shows shadowed "(unchanged)" (as in wifi settings) and "(not set)"
instead of two dots.
Patch Set 2:
+ Show cancellation confirmation dialog only when there's change in
profile.
Patch Set 3:
+ Re-enable profile preferences when the reconnect dialog is cancelled.
Merge commit '8d4faa9ec3e29695b8d5d039bc8ac12d9bd655a8'
* commit '8d4faa9ec3e29695b8d5d039bc8ac12d9bd655a8':
Add a way to override the display names for locales in the locale picker.
Merge commit '241610e986a8d2823f519762737903779089c253'
* commit '241610e986a8d2823f519762737903779089c253':
Add password error hint when adding new cert.
