Merge commit '52e8542d9dfb9c0d9a3530df1d790a0275d27f31'
* commit '52e8542d9dfb9c0d9a3530df1d790a0275d27f31':
Don't show the sort menu for running process list
Merge commit '8021537ffea45d1a36274217610a314b3a0ac774' into gingerbread-plus-aosp
* commit '8021537ffea45d1a36274217610a314b3a0ac774':
BT settings wait for HS service before connect. DO NOT MERGE
Bluetooth connections from Settings app can sometimes fail if the
connection to BluetoothHeadsetService isn't ready. Changed code to
delay any headset connect or disconnect attempt when the service isn't
connected until onServiceConnected() is called.
Tested by adding a call to Thread.sleep(5000) before the return
statement in BluetoothHeadsetService.onBind(). This makes it easier to
kill the phone process and then attempt to connect in the settings app
before the service restarts.
Bug: 3048839
Change-Id: I2114ff8ad67c8c672fcf6ce0bf3de61fca7a49b3
Merge commit '0340371297887290d7593d7c346e422a4c9ecd1a' into gingerbread-plus-aosp
* commit '0340371297887290d7593d7c346e422a4c9ecd1a':
DO NOT MERGE Add null check before disconnecting a device.
Merge commit 'bdf1310707e436db484113d7aa2881c966cddd0f' into gingerbread-plus-aosp
* commit 'bdf1310707e436db484113d7aa2881c966cddd0f':
Call disconnect / connect without checking the current status
Merge commit 'cd99332fee649afd85798499cea5c45a098b8a20' into gingerbread-plus-aosp
* commit 'cd99332fee649afd85798499cea5c45a098b8a20':
Update settings app for new NFC API.
Its the job of the framework to check that, it already does that.
Framework will queue the commands. Earlier settings app used to queue
them.
Bug: 3076404
Change-Id: I664e1c4e2c0ef9c697066251ccca382ad12dfa2f
Merge commit 'd7f7213af27fa6c5e476bb8a8d2951feb5e630b5'
* commit 'd7f7213af27fa6c5e476bb8a8d2951feb5e630b5':
Fix bug where car dock sometimes doesn't connect.
Merge commit '737e91efb15fe5908781bc1cf446d28abc7726e8' into gingerbread-plus-aosp
* commit '737e91efb15fe5908781bc1cf446d28abc7726e8':
Don't show the sort menu for running process list
Merge commit '1054e4890ae50d2550ee822f0680346f48d48c97' into gingerbread-plus-aosp
* commit '1054e4890ae50d2550ee822f0680346f48d48c97':
Hide "System tutorial" option if there's no IME tutorial
You could bring up the menu and sort running processes by size or name
which would display the applications list at the same time the running
process list was being displayed. This happened because the
mApplicationsAdapter is used for the list of apps and is sortable, but
the running process list doesn't use the adapter.
Disable the menu when the running applications list is presented to
prevent this situation where two ListViews are visible.
Bug: 3084901
Change-Id: I5304cf7a1f426269ed4858e649729a35b9344717
Merge commit '4c0ff2c7b5138c0fce6c83f6c414204e32ac96f3' into gingerbread-plus-aosp
* commit '4c0ff2c7b5138c0fce6c83f6c414204e32ac96f3':
Fix bug where car dock sometimes doesn't connect.
- make status refresh thru onResume()
This issue was a regression from the change to use Fragments
Change-Id: I5e293c4a72bdc70f02ccfe4fc84bfb32e2887fad
Merge commit 'b8f9c9cf7c0343c6c05296bb7af8fdccdc3b7a3b' into gingerbread-plus-aosp
* commit 'b8f9c9cf7c0343c6c05296bb7af8fdccdc3b7a3b':
Add confirmation when stopping system service, as per rwest.
Merge commit '3e15e4e91b69da9091310bf9aadb1bcffcb3137c'
* commit '3e15e4e91b69da9091310bf9aadb1bcffcb3137c':
Manage apps "on SD card" now shows all apps that can go on SD card.
Fix fragment launching from another app - pass along the fragment class name
and bundle from the original intent.
Bug: 3064432
Bug: 3059311 (partial fix)
Merge commit '6dc1bf84cf72dd72a2517878f6b280e8afdcf4c2' into gingerbread-plus-aosp
* commit '6dc1bf84cf72dd72a2517878f6b280e8afdcf4c2':
Manage apps "on SD card" now shows all apps that can go on SD card.
