summaryrefslogtreecommitdiffstats
path: root/src/com/android/settings
Commit message (Expand)AuthorAgeFilesLines
* am 36469186: DO NOT MERGE WiMAX settings menuTK MUN2011-03-092-3/+42
|\
| * DO NOT MERGE WiMAX settings menuTK MUN2011-03-092-3/+42
* | am f4393101: Merge "Support configuring the protocol in APN settings." into g...Lorenzo Colitti2011-03-031-1/+49
|\ \ | |/
| * Merge "Support configuring the protocol in APN settings." into gingerbreadLorenzo Colitti2011-03-031-1/+49
| |\
| | * Support configuring the protocol in APN settings.Lorenzo Colitti2011-02-221-1/+49
* | | am 0552d336: DO NOT MERGE: InstalledAppDetails: "Clear defaults" button now c...Mike Lockwood2011-03-021-3/+19
|\ \ \ | |/ /
| * | DO NOT MERGE: InstalledAppDetails: "Clear defaults" button now clears USB ser...Mike Lockwood2011-03-021-3/+19
| |/
* | am aae04e43: Prevent monkeys from USB tethering. It disconnects the test host...Amith Yamasani2011-02-111-1/+1
|\ \ | |/
| * Prevent monkeys from USB tethering. It disconnects the test host. DO NOT MERGE.Amith Yamasani2011-02-101-1/+1
* | am 1798fc04: Merge "Fixed a memory leak in the bluetooth settings"Jake Hamby2011-02-041-2/+3
|\ \
| * | Fixed a memory leak in the bluetooth settingsGustaf Nilklint2011-01-041-2/+3
| * | merge from gingerbreadJean-Baptiste Queru2010-12-091-1/+2
| |\ \
| | * | Reduce max BT device length to 246 bytes due to Bluez bug. (DO NOT MERGE)Jake Hamby2010-12-091-1/+2
* | | | am c1286804: Merge "Update Settings for new NfcAdapter.getDefaultAdapter(Cont...Nick Pelly2010-12-102-2/+2
|\ \ \ \ | | |_|/ | |/| |
| * | | Update Settings for new NfcAdapter.getDefaultAdapter(Context)Nick Pelly2010-12-092-2/+2
* | | | am b0fda6f5: Reduce max BT device length to 246 bytes due to Bluez bug. (DO N...Jake Hamby2010-12-041-1/+2
|\ \ \ \ | |/ / / | | / / | |/ / |/| |
| * | Reduce max BT device length to 246 bytes due to Bluez bug. (DO NOT MERGE)Jake Hamby2010-12-031-1/+2
| |/
* | am 04b646df: Merge "Possible NumberFormatException of parseInt is outside try...Jean-Baptiste Queru2010-11-291-1/+1
|\ \
| * | Possible NumberFormatException of parseInt is outside try-catchPeter Kuterna2010-11-281-1/+1
* | | am 83d2698f: Merge "Fix issue #3177284: Account for wake lock power usage on ...Dianne Hackborn2010-11-101-0/+4
|\ \ \ | | |/ | |/|
| * | Merge "Fix issue #3177284: Account for wake lock power usage on Crespo" into ...Dianne Hackborn2010-11-101-0/+4
| |\ \
| | * | Fix issue #3177284: Account for wake lock power usage on CrespoDianne Hackborn2010-11-081-0/+4
* | | | am 91ba0709: Update settings text on success, so we clear out error text afte...Nick Pelly2010-11-031-1/+6
|\ \ \ \ | |/ / /
| * | | Update settings text on success, so we clear out error text after recovery.Nick Pelly2010-11-031-1/+6
| |/ /
* | | am 4e4ed14e: Fix issue #3146784: ANR in manage applicationsDianne Hackborn2010-10-292-5/+64
|\ \ \ | |/ /
| * | Fix issue #3146784: ANR in manage applicationsDianne Hackborn2010-10-292-5/+64
* | | am 8815f032: Merge "Always set right auth_type value in apn."Jean-Baptiste Queru2010-10-251-0/+2
|\ \ \ | | |/ | |/|
| * | Always set right auth_type value in apn.Marta Białka2010-10-251-0/+2
* | | am 5e34f239: Fix issue #3124528: Mange applications is including cache files ...Dianne Hackborn2010-10-221-1/+1
|\ \ \ | | |/ | |/|
| * | Fix issue #3124528: Mange applications is including cache files in storage sizeDianne Hackborn2010-10-221-1/+1
* | | am 781c0aa2: Merge "NFC Settings cleanup." into gingerbreadNick Pelly2010-10-211-4/+3
|\ \ \ | |/ /
| * | Merge "NFC Settings cleanup." into gingerbreadNick Pelly2010-10-211-4/+3
| |\ \
| | * | NFC Settings cleanup.Nick Pelly2010-10-201-4/+3
* | | | am 7a519955: Merge "Fix issue #3114356: Storage visualization in Manage Apps ...Dianne Hackborn2010-10-204-32/+119
|\ \ \ \ | |/ / /
| * | | Fix issue #3114356: Storage visualization in Manage Apps is confusingDianne Hackborn2010-10-204-32/+119
* | | | am 916adce0: Fix issue #3108683: GRH18: Battery usage chart FCsDianne Hackborn2010-10-191-2/+2
|\ \ \ \ | |/ / /
| * | | Fix issue #3108683: GRH18: Battery usage chart FCsDianne Hackborn2010-10-191-2/+2
| |/ /
| * | NFC: async enabling/disabling, ala Bluewooth & Wifi.Brad Fitzpatrick2010-10-181-25/+61
* | | NFC: async enabling/disabling, ala Bluewooth & Wifi.Brad Fitzpatrick2010-10-181-25/+61
* | | am 1337d0f7: Implement issue #3094621 and #3094609 - wipe sd cardDianne Hackborn2010-10-168-161/+532
|\ \ \ | |/ /
| * | Implement issue #3094621 and #3094609 - wipe sd cardDianne Hackborn2010-10-168-161/+532
* | | am e1a9ca68: Merge "Use NfcAdapter.getDefaultAdapter() to check for NFC presc...Nick Pelly2010-10-151-1/+2
|\ \ \ | |/ /
| * | Merge "Use NfcAdapter.getDefaultAdapter() to check for NFC prescence." into g...Nick Pelly2010-10-151-1/+2
| |\ \
| | * | Use NfcAdapter.getDefaultAdapter() to check for NFC prescence.Nick Pelly2010-10-151-1/+2
* | | | am 1bdb7874: Make summary appear for both checked and unchecked NFC checkbox ...Amith Yamasani2010-10-151-6/+1
|\ \ \ \ | |/ / /
| * | | Make summary appear for both checked and unchecked NFC checkbox in Settings.Amith Yamasani2010-10-151-6/+1
| |/ /
* | | am 022299df: 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
* | | am 8021537f: BT settings wait for HS service before connect. DO NOT MERGEJake Hamby2010-10-131-8/+54
|\ \ \ | |/ /
| * | BT settings wait for HS service before connect. DO NOT MERGEJake Hamby2010-10-131-8/+54