Merge commit '10d3cf5082edb42f196ce0d5ac77c7a12b959599' into eclair-plus-aosp
* commit '10d3cf5082edb42f196ce0d5ac77c7a12b959599':
Enable cert install from sdcard in Settings...
Merge commit 'dd498f901efd7984c38e18b548927c19c2b607f0' into eclair-plus-aosp
* commit 'dd498f901efd7984c38e18b548927c19c2b607f0':
Transient patch for the WifiConfiguration change.
Merge commit 'a383452afd6576da5a56c8b1ef73750892e43636' into eclair-plus-aosp
* commit 'a383452afd6576da5a56c8b1ef73750892e43636':
Show name for incoming pairing requests.
Settings apps invalidates its cache whenever a new scan is started.
When there is a new incoming pairing request, we will not get a DeviceFound
signal, because its not due to a inquiry scan. Thus when the pairing request
is displayed, the settings app doesn't have it in cache and hence will
just display the address. Make it query the framework when it doesn't have the name.
Merge commit 'cd03f5320d42290b1619933954a344b59dc55f4f' into eclair-plus-aosp
* commit 'cd03f5320d42290b1619933954a344b59dc55f4f':
Move backlight brightness from HardwareService to PowerManager
to prevent apps from changing the hardware behind its back.
Fixes b/2041941 Lock screen flashes the screen very bright before dimming
Change-Id: Ic4faa008357fd3d74225ba90f05801c5127fd8c0
Signed-off-by: Mike Lockwood <lockwood@android.com>
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>
Comment out the access to the enterprise fields of
WifiConfiguration class in AccessPointState class.
And will have a new patch for accessing the new WifiConfiguration.
Merge commit 'd6375e975e74924082cbf3f9b4c6f2a67b1ee08d' into eclair-plus-aosp
* commit 'd6375e975e74924082cbf3f9b4c6f2a67b1ee08d':
Update AndroidManifest.xml for new Intent locations.
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.
This will fix a regression since the recent BT API changes. The settings app
would have missed some Bluetooth events, especially pairing.
Change-Id: Ia5e6371279feb389578e798fe11f1c239a4aa17b
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 '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.
