3094621: add "wipe sd card" option to factory data reset
3094609: collapse unmount/format into one command
Implements requested UI changes. Also some final tweaks to
Manage Applications.
Change-Id: I0219195dd0c74d8c003ef1c3f6e09714859d7f89
Merge commit '3594b1b73d022d5815bcdef78e6143cfd63ee354' into gingerbread-plus-aosp
* commit '3594b1b73d022d5815bcdef78e6143cfd63ee354':
Import revised translations DO NOT MERGE
Merge commit 'e1a9ca686249ebe7c85a98d467bb705e4c3eed2f' into gingerbread-plus-aosp
* commit 'e1a9ca686249ebe7c85a98d467bb705e4c3eed2f':
Use NfcAdapter.getDefaultAdapter() to check for NFC prescence.
Merge commit '1bdb7874adf52b0fc2fe6ec40913a0562cf585ed' into gingerbread-plus-aosp
* commit '1bdb7874adf52b0fc2fe6ec40913a0562cf585ed':
Make summary appear for both checked and unchecked NFC checkbox in Settings.
Merge commit '2c4899737be92b858a9e2d9d743709cae310149b' into gingerbread-plus-aosp
* commit '2c4899737be92b858a9e2d9d743709cae310149b':
Change USB tab to USB storage if it fits
Merge commit 'd3abea0d70648e77e694780b7e139b0ed36ba483' into gingerbread-plus-aosp
* commit 'd3abea0d70648e77e694780b7e139b0ed36ba483':
Fix a few more cases of USB storage missed at 4am pass...
Merge commit '022299dfce6a705a8cbaff972a4309da6e90a8c2' into gingerbread-plus-aosp
* commit '022299dfce6a705a8cbaff972a4309da6e90a8c2':
Disconnect dock only if its connected.
Scenario: BT is off, device is paired with the desk dock.
Media is switched off. So when the user docks, it was trying to
disconnect even when BT was off and hence DBUS was crashing.
Bug: 3097224
Change-Id: I13e1dd4459c47d5ba9a403f2ae1cc8a131f02a08
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 '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 '3018639200a3f04d274166e26c98307ab07fc3b9' into gingerbread-plus-aosp
* commit '3018639200a3f04d274166e26c98307ab07fc3b9':
With luck, final take on bug3076083, re back up settting
Merge commit '4c0ff2c7b5138c0fce6c83f6c414204e32ac96f3' into gingerbread-plus-aosp
* commit '4c0ff2c7b5138c0fce6c83f6c414204e32ac96f3':
Fix bug where car dock sometimes doesn't connect.
