Merge commit 'a640fb4f97ee5e317ed51bd585c892d465b3da38' into gingerbread-plus-aosp
* commit 'a640fb4f97ee5e317ed51bd585c892d465b3da38':
Fix the build. A "--" token is not just text in an XML comment.
Merge commit '69827524365ae448d19b2089c46534e925cc2bfd' into gingerbread-plus-aosp
* commit '69827524365ae448d19b2089c46534e925cc2bfd':
Try to fix bug3119318 without breaking the build this time
Merge commit 'af06d7a94a69d82ef5f2d8082e75c368f4204afb' into gingerbread-plus-aosp
* commit 'af06d7a94a69d82ef5f2d8082e75c368f4204afb':
Fix bug3119318, missing Mount USB storage strings
NFC service now tracks its own settings. Call the NFC API to determine
state.
Change-Id: Ibdb33e68abdbe36df31fb13ad95c8ca1b3bcb35b
Signed-off-by: Nick Pelly <npelly@google.com>
Also fixes issue #3097388: If you launch Manage Applications when SD
card app info isn't available, incomplete information gets cached
Change-Id: If3377a965653590e5bc1df25e38764a83e96b820
Merge commit 'dd49624ed049d6f2f9946f71381bcde83f19e5e0' into gingerbread-plus-aosp
* commit 'dd49624ed049d6f2f9946f71381bcde83f19e5e0':
Del "erase" from new unmount setting subtext
Merge commit '8abc40bb11690125fa441775041e0a64c79acc43' into gingerbread-plus-aosp
* commit '8abc40bb11690125fa441775041e0a64c79acc43':
Correct some typos, impose more consistency.
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
