summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am 1337d0f7: Implement issue #3094621 and #3094609 - wipe sd cardDianne Hackborn2010-10-1613-205/+696
|\ | | | | | | | | | | | | Merge commit '1337d0f70b18dd732c6a617be83e5be0bb8f2f87' into gingerbread-plus-aosp * commit '1337d0f70b18dd732c6a617be83e5be0bb8f2f87': Implement issue #3094621 and #3094609 - wipe sd card
| * Implement issue #3094621 and #3094609 - wipe sd cardDianne Hackborn2010-10-1613-205/+696
| | | | | | | | | | | | | | | | | | | | 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
* | am 3594b1b7: Import revised translations DO NOT MERGEKenny Root2010-10-1520-700/+700
|\ \ | |/ | | | | | | | | | | Merge commit '3594b1b73d022d5815bcdef78e6143cfd63ee354' into gingerbread-plus-aosp * commit '3594b1b73d022d5815bcdef78e6143cfd63ee354': Import revised translations DO NOT MERGE
| * Import revised translations DO NOT MERGEKenny Root2010-10-1520-700/+700
| | | | | | | | Change-Id: I04e726f28a0ee4b249618c5e485d480ba6f340a9
* | am e1a9ca68: Merge "Use NfcAdapter.getDefaultAdapter() to check for NFC ↵Nick Pelly2010-10-151-1/+2
|\ \ | |/ | | | | | | | | | | | | | | prescence." into gingerbread Merge commit 'e1a9ca686249ebe7c85a98d467bb705e4c3eed2f' into gingerbread-plus-aosp * commit 'e1a9ca686249ebe7c85a98d467bb705e4c3eed2f': Use NfcAdapter.getDefaultAdapter() to check for NFC prescence.
| * Merge "Use NfcAdapter.getDefaultAdapter() to check for NFC prescence." into ↵Nick Pelly2010-10-151-1/+2
| |\ | | | | | | | | | gingerbread
| | * Use NfcAdapter.getDefaultAdapter() to check for NFC prescence.Nick Pelly2010-10-151-1/+2
| | | | | | | | | | | | | | | Change-Id: I518389a317a4e9ab9009fd33330a91f7c35edc2a Signed-off-by: Nick Pelly <npelly@google.com>
* | | am 1bdb7874: Make summary appear for both checked and unchecked NFC checkbox ↵Amith Yamasani2010-10-152-7/+2
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | in Settings. Merge commit '1bdb7874adf52b0fc2fe6ec40913a0562cf585ed' into gingerbread-plus-aosp * commit '1bdb7874adf52b0fc2fe6ec40913a0562cf585ed': Make summary appear for both checked and unchecked NFC checkbox in Settings.
| * | Make summary appear for both checked and unchecked NFC checkbox in Settings.Amith Yamasani2010-10-152-7/+2
| | | | | | | | | | | | | | | | | | | | | And remove the extra "Tag" in the summary. Bug: 3083079 Change-Id: I998c2556a88180098a060d43b720276a7619a368
* | | am 2c489973: Change USB tab to USB storage if it fitsRoy West2010-10-151-1/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit '2c4899737be92b858a9e2d9d743709cae310149b' into gingerbread-plus-aosp * commit '2c4899737be92b858a9e2d9d743709cae310149b': Change USB tab to USB storage if it fits
| * | Change USB tab to USB storage if it fitsRoy West2010-10-151-1/+1
| |/ | | | | | | Change-Id: I7d0c5388b2673e5f513d05700f4f10650cf1a2b5
* | am d3abea0d: Fix a few more cases of USB storage missed at 4am pass...Roy West2010-10-141-4/+4
|\ \ | |/ | | | | | | | | | | Merge commit 'd3abea0d70648e77e694780b7e139b0ed36ba483' into gingerbread-plus-aosp * commit 'd3abea0d70648e77e694780b7e139b0ed36ba483': Fix a few more cases of USB storage missed at 4am pass...
| * Fix a few more cases of USB storage missed at 4am pass...Roy West2010-10-141-4/+4
| | | | | | | | Change-Id: Ia955d4378f4f9003a659763d88312ea7d42b4a3c
* | am 022299df: Merge "Disconnect dock only if its connected." into gingerbreadJaikumar Ganesh2010-10-141-3/+6
|\ \ | |/ | | | | | | | | | | Merge commit '022299dfce6a705a8cbaff972a4309da6e90a8c2' into gingerbread-plus-aosp * commit '022299dfce6a705a8cbaff972a4309da6e90a8c2': Disconnect dock only if its connected.
| * Merge "Disconnect dock only if its connected." into gingerbreadJaikumar Ganesh2010-10-141-3/+6
| |\
| | * Disconnect dock only if its connected.Jaikumar Ganesh2010-10-141-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | am b5848295: Merge "Import revised translations" into gingerbreadKenny Root2010-10-1420-1255/+1155
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit 'b5848295b346df619999458ad55ba8ce1f88bf4f' into gingerbread-plus-aosp * commit 'b5848295b346df619999458ad55ba8ce1f88bf4f': Import revised translations
| * | Merge "Import revised translations" into gingerbreadKenny Root2010-10-1420-1255/+1155
| |\ \ | | |/ | |/|
| | * Import revised translationsKenny Root2010-10-1420-1255/+1155
| | | | | | | | | | | | Change-Id: I1902e768bde862ab73e3ddd806bb778c2b1098de
* | | am 825db2da: Update storage names to 10-13 decision; add USB erase nuggetRoy West2010-10-141-30/+30
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit '825db2da053598d36b5021b3468c7d599ee96a7c' into gingerbread-plus-aosp * commit '825db2da053598d36b5021b3468c7d599ee96a7c': Update storage names to 10-13 decision; add USB erase nugget
| * | Update storage names to 10-13 decision; add USB erase nuggetRoy West2010-10-141-30/+30
| |/ | | | | | | Change-Id: I9df5e217a9f6f4b26fea6d1ed865e359833e53ce
* | am 8021537f: BT settings wait for HS service before connect. DO NOT MERGEJake Hamby2010-10-131-8/+54
|\ \ | |/ | | | | | | | | | | Merge commit '8021537ffea45d1a36274217610a314b3a0ac774' into gingerbread-plus-aosp * commit '8021537ffea45d1a36274217610a314b3a0ac774': BT settings wait for HS service before connect. DO NOT MERGE
| * BT settings wait for HS service before connect. DO NOT MERGEJake Hamby2010-10-131-8/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | am 792d4356: Merge "Move NFC setting lower down the Setting\'s list." into ↵Nick Pelly2010-10-131-6/+6
|\ \ | |/ | | | | | | | | | | | | | | gingerbread Merge commit '792d43560bdbf2f9982eb918cd841672ecfcf9de' into gingerbread-plus-aosp * commit '792d43560bdbf2f9982eb918cd841672ecfcf9de': Move NFC setting lower down the Setting's list.
| * Merge "Move NFC setting lower down the Setting's list." into gingerbreadNick Pelly2010-10-131-6/+6
| |\
| | * Move NFC setting lower down the Setting's list.Nick Pelly2010-10-131-6/+6
| | | | | | | | | | | | Change-Id: I585d060a5b65df05d62c2bf156f5af76b3bf60e0
* | | am 03403712: Merge "DO NOT MERGE Add null check before disconnecting a ↵Jaikumar Ganesh2010-10-131-1/+2
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | device." into gingerbread Merge commit '0340371297887290d7593d7c346e422a4c9ecd1a' into gingerbread-plus-aosp * commit '0340371297887290d7593d7c346e422a4c9ecd1a': DO NOT MERGE Add null check before disconnecting a device.
| * | Merge "DO NOT MERGE Add null check before disconnecting a device." into ↵Jaikumar Ganesh2010-10-131-1/+2
| |\ \ | | |/ | |/| | | | gingerbread
| | * DO NOT MERGE Add null check before disconnecting a device.Jaikumar Ganesh2010-10-131-1/+2
| | | | | | | | | | | | | | | Bug: 3076404 Change-Id: I8ef140395503816296124a38e42ab9cc7e6f7159
* | | am 083310d3: Update NFC settings description, and fix polarity.Nick Pelly2010-10-122-3/+3
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit '083310d316059c6592120c32e1c0b736e85b83c0' into gingerbread-plus-aosp * commit '083310d316059c6592120c32e1c0b736e85b83c0': Update NFC settings description, and fix polarity.
| * | Update NFC settings description, and fix polarity.Nick Pelly2010-10-122-3/+3
| | | | | | | | | | | | Change-Id: I0d45652113617230e04536a7cc2ff148dd52595a
* | | am bdf13107: Merge "Call disconnect / connect without checking the current ↵Jaikumar Ganesh2010-10-121-20/+9
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | status" into gingerbread Merge commit 'bdf1310707e436db484113d7aa2881c966cddd0f' into gingerbread-plus-aosp * commit 'bdf1310707e436db484113d7aa2881c966cddd0f': Call disconnect / connect without checking the current status
| * | Merge "Call disconnect / connect without checking the current status" into ↵Jaikumar Ganesh2010-10-121-20/+9
| |\ \ | | |/ | | | | | | gingerbread
| | * Call disconnect / connect without checking the current statusJaikumar Ganesh2010-10-121-20/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | am cd99332f: Merge "Update settings app for new NFC API." into gingerbreadNick Pelly2010-10-121-16/+10
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit 'cd99332fee649afd85798499cea5c45a098b8a20' into gingerbread-plus-aosp * commit 'cd99332fee649afd85798499cea5c45a098b8a20': Update settings app for new NFC API.
| * | Merge "Update settings app for new NFC API." into gingerbreadNick Pelly2010-10-121-16/+10
| |\ \ | | |/ | |/|
| | * Update settings app for new NFC API.Nick Pelly2010-10-121-16/+10
| | | | | | | | | | | | | | | Change-Id: I2702e36d33591245fa86e00454348fc1a16f5cf8 Signed-off-by: Nick Pelly <npelly@google.com>
* | | am 737e91ef: Merge "Don\'t show the sort menu for running process list" into ↵Kenny Root2010-10-121-0/+8
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | gingerbread Merge commit '737e91efb15fe5908781bc1cf446d28abc7726e8' into gingerbread-plus-aosp * commit '737e91efb15fe5908781bc1cf446d28abc7726e8': Don't show the sort menu for running process list
| * | Merge "Don't show the sort menu for running process list" into gingerbreadKenny Root2010-10-121-0/+8
| |\ \
| | * | Don't show the sort menu for running process listKenny Root2010-10-121-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | am 1054e489: Merge "Hide "System tutorial" option if there\'s no IME ↵Freeman Ng2010-10-121-10/+26
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | tutorial bug: 3074212" into gingerbread Merge commit '1054e4890ae50d2550ee822f0680346f48d48c97' into gingerbread-plus-aosp * commit '1054e4890ae50d2550ee822f0680346f48d48c97': Hide "System tutorial" option if there's no IME tutorial
| * | | Merge "Hide "System tutorial" option if there's no IME tutorial bug: ↵Freeman Ng2010-10-121-10/+26
| |\ \ \ | | |/ / | |/| | | | | | 3074212" into gingerbread
| | * | Hide "System tutorial" option if there's no IME tutorialFreeman Ng2010-10-111-10/+26
| | | | | | | | | | | | | | | | | | | | | | | | bug: 3074212 Change-Id: I3653c23cd893114cec7822efb2d6acb08b7ba91e
* | | | am 30186392: With luck, final take on bug3076083, re back up setttingRoy West2010-10-111-1/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | Merge commit '3018639200a3f04d274166e26c98307ab07fc3b9' into gingerbread-plus-aosp * commit '3018639200a3f04d274166e26c98307ab07fc3b9': With luck, final take on bug3076083, re back up settting
| * | | With luck, final take on bug3076083, re back up setttingRoy West2010-10-111-1/+1
| | | | | | | | | | | | | | | | Change-Id: I236854b4f5d679bd1581d80baba2bd43af7313eb
* | | | am 4c0ff2c7: Merge "Fix bug where car dock sometimes doesn\'t connect." into ↵Jake Hamby2010-10-111-3/+3
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | gingerbread Merge commit '4c0ff2c7b5138c0fce6c83f6c414204e32ac96f3' into gingerbread-plus-aosp * commit '4c0ff2c7b5138c0fce6c83f6c414204e32ac96f3': Fix bug where car dock sometimes doesn't connect.
| * | | Merge "Fix bug where car dock sometimes doesn't connect." into gingerbreadJake Hamby2010-10-111-3/+3
| |\ \ \ | | |/ / | |/| |
| | * | Fix bug where car dock sometimes doesn't connect.Jake Hamby2010-09-291-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Attempt to connect to car/desk dock after pairing completes. This fixes a bug where we didn't try to connect if we received the UUID change intent before the bonding state change intent. Change-Id: I7c12a4eb23d17d506e43a64bf2a3aa5241debcb9
* | | | am 566b5bb0: Improve password hint visibilityIrfan Sheriff2010-10-111-0/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | Merge commit '566b5bb0f91224069bbc98ea7042d22c8929aa59' into gingerbread-plus-aosp * commit '566b5bb0f91224069bbc98ea7042d22c8929aa59': Improve password hint visibility
| * | | Improve password hint visibilityIrfan Sheriff2010-10-111-0/+1
| | | | | | | | | | | | | | | | | | | | Bug: 3083095 Change-Id: I9fcf9d529c598ad75dd438ef0e7a896c6568cbab
generated by cgit v1.1 at 2025-01-20 06:05:11 +0000