Merge commit '909a945031ec5ec372991de1d2ea1718f494ab9c' into eclair-plus-aosp
* commit '909a945031ec5ec372991de1d2ea1718f494ab9c':
Import revised translations. DO NOT MERGE
Merge commit '87f0c26b31f14860f4db564362087d7bc91f27cb'
* commit '87f0c26b31f14860f4db564362087d7bc91f27cb':
Use new memory API; show memory used by bg and fg processes.
Merge commit '3faa23a2b0dcd0a19acf7b24e7eea36d67b4eda1' into eclair-plus-aosp
* commit '3faa23a2b0dcd0a19acf7b24e7eea36d67b4eda1':
Use new memory API; show memory used by bg and fg processes.
Merge commit '985f5efc8278e1a5c2170c3aba354a4c9367b741' into eclair-plus-aosp
* commit '985f5efc8278e1a5c2170c3aba354a4c9367b741':
Add "settings" to a bunch of screens. Fix 2110077, 2115734, 2101651
Move Factory data reset to About phone.
Show input method when dialog to enter/edit new dictionary word is displayed.
Add title to Accessibility settings.
Add changes to have the ability to turn on and off the
automatic light sensing for the device. This is fully configurable
and is by default not present. Vendors should override the ALS setting
to enable the automatic lighting controls.
These changes will add a check box to the Brightness settings menu to give control
to the user to allow the device's display lighting to be controlled via the slide bar
or the auto lighting system.
If the user selects auto then the slide bar will become invisible. Manual mode
will present the slide bar to the user.
Change-Id: I512c9d5dd72ddd831b33eb8fcd4680e2fc7f786e
Signed-off-by: Dan Murphy <D.Murphy@motorola.com>
Signed-off-by: Mike Lockwood <lockwood@android.com>
Add incoming pairing dialog
Add DisplayPasskey handling of pairing keyboards with 2.1 devices.
Modify code path to show errors when bonding request fails.
Misc fixes like string changes.
Merge commit '88651a0b2a7a7038c8befb321100a64aec9933b8' into eclair-plus-aosp
* commit '88651a0b2a7a7038c8befb321100a64aec9933b8':
Regenerate timezones.xml after adding Asia/Shanghai timezone for
mainland China, using cldr 1.7.1 and merging translations for "Beijing".
Remove unused localized timezone "xml-no/timezones.xml".
"nb" is now used instead of the deprecated "no".
Merge commit 'cded847838c726342bfe56e69d417d160c73f212' into eclair-plus-aosp
* commit 'cded847838c726342bfe56e69d417d160c73f212':
Make running services show dependent processes.
Merge commit 'c93110409c05bef4be5428ef36099a586828cbb2'
* commit 'c93110409c05bef4be5428ef36099a586828cbb2':
Fix display strings and enter passkey handling.
Merge commit '6ee7dd09138363737805ae1e6e93649959c6ab83' into eclair-plus-aosp
* commit '6ee7dd09138363737805ae1e6e93649959c6ab83':
Fix display strings and enter passkey handling.
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 '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.
