summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* VpnSettings: fix bugs.Chia-chi Yeh2011-08-083-19/+14
* Merge "Update to work with the activity manager taking over OOM settings."Dianne Hackborn2011-08-074-93/+75
|\
| * Update to work with the activity manager taking over OOM settings.Dianne Hackborn2011-08-074-93/+75
* | Merge "Fix for Bug 5110980 Settings: "VPN settings" renamed to "VPN". Changed...Claudia de Veaux2011-08-051-2/+2
|\ \ | |/ |/|
| * Fix for Bug 5110980 Settings: "VPN settings" renamed to "VPN". Changed two in...Claudia de Veaux2011-08-051-2/+2
* | Use new more efficient API for retrieving pss.Dianne Hackborn2011-08-051-5/+5
|/
* Merge "Data usage app icons and details, chart labels."Jeff Sharkey2011-08-0511-57/+183
|\
| * Data usage app icons and details, chart labels.Jeff Sharkey2011-08-0411-57/+183
| |
| \
*-. | Reconcile with gingerbread-release gingerbread-mr4-releaseThe Android Open Source Project2011-08-040-0/+0
|\ \|
| * | Import new translations.Eric Fischer2011-08-0243-103/+270
| * | DO NOT MERGE Show user dialog for BT.Jaikumar Ganesh2011-08-024-0/+324
| * | Remove CHAR LIMIT from string to fix build.Jaikumar Ganesh2011-08-021-1/+1
| * | New strings for BluetoothJaikumar Ganesh2011-08-021-0/+9
* | | Merge "Import revised translations."Eric Fischer2011-08-0492-7609/+11300
|\ \ \ | |_|/ |/| |
| * | Import revised translations.Eric Fischer2011-08-0492-7609/+11300
* | | Merge "Data usage disabled state, smaller parcels."Jeff Sharkey2011-08-041-7/+39
|\ \ \
| * | | Data usage disabled state, smaller parcels.Jeff Sharkey2011-08-031-7/+39
* | | | Merge "Save and restore wifi dialogs on screen rotation."Mike Cleron2011-08-042-17/+111
|\ \ \ \ | |_|/ / |/| | |
| * | | Save and restore wifi dialogs on screen rotation.Amith Yamasani2011-08-042-17/+111
| |/ /
* | | Merge "Remove unused string reference."Eric Fischer2011-08-041-1/+0
|\ \ \
| * | | Remove unused string reference.Amith Yamasani2011-08-041-1/+0
| |/ /
* | | Merge "VpnSettings: the field has been renamed."Chia-chi Yeh2011-08-041-1/+1
|\ \ \
| * | | VpnSettings: the field has been renamed.Chia-chi Yeh2011-08-031-1/+1
* | | | Merge "Restore deleted strings that are still in use."Eric Fischer2011-08-041-0/+6
|\ \ \ \
| * | | | Restore deleted strings that are still in use.Eric Fischer2011-08-021-0/+6
* | | | | Merge "Fix package path for p2p settings"Irfan Sheriff2011-08-043-6/+5
|\ \ \ \ \
| * | | | | Fix package path for p2p settingsIrfan Sheriff2011-08-033-6/+5
| | |_|/ / | |/| | |
* / | | | Give Settings back its split action barsAdam Powell2011-08-031-0/+1
|/ / / /
* | | | Merge "Sound settings screen and volumes dialog reconfiguration."Amith Yamasani2011-08-035-199/+237
|\ \ \ \
| * | | | Sound settings screen and volumes dialog reconfiguration.Amith Yamasani2011-08-025-199/+237
| |/ / /
* | | | Merge "Center button text in the InstalledAppDetails screens."Amith Yamasani2011-08-031-4/+0
|\ \ \ \ | |_|/ / |/| | |
| * | | Center button text in the InstalledAppDetails screens.Amith Yamasani2011-08-031-4/+0
| |/ /
* | | Merge "Follow framework API changes"Adam Powell2011-08-022-2/+2
|\ \ \
| * | | Follow framework API changesAdam Powell2011-08-022-2/+2
* | | | Merge "Tweak font-size summary display"Christopher Tate2011-08-021-2/+2
|\ \ \ \
| * | | | Tweak font-size summary displayChristopher Tate2011-08-021-2/+2
| | |/ / | |/| |
* | | | Merge "Always put 'USB COMPUTER CONNECTION' into the overflow menu"Christopher Tate2011-08-021-1/+1
|\ \ \ \
| * | | | Always put 'USB COMPUTER CONNECTION' into the overflow menuChristopher Tate2011-08-021-1/+1
| |/ / /
* | | | Merge "Clear bitmaps from canvses after done drawing to them."Dianne Hackborn2011-08-021-0/+2
|\ \ \ \
| * | | | Clear bitmaps from canvses after done drawing to them.Dianne Hackborn2011-08-021-0/+2
| |/ / /
* | | | Merge "New development setting for ANRs."Dianne Hackborn2011-08-023-0/+32
|\ \ \ \ | |_|/ / |/| | |
| * | | New development setting for ANRs.Dianne Hackborn2011-08-023-0/+32
| |/ /
* | | Merge "String changes for Location services Settings screen Bug: 5098817"Sean Cotter2011-08-023-24/+15
|\ \ \ | |/ / |/| |
| * | String changes for Location services Settings screenSean Cotter2011-08-023-24/+15
* | | Merge "Fix ActionBar title for NFC sharing."Martijn Coenen2011-08-021-0/+1
|\ \ \
| * | | Fix ActionBar title for NFC sharing.Martijn Coenen2011-08-021-0/+1
* | | | USB: Fix problem updating status of MTP/PTP checkboxesMike Lockwood2011-08-021-3/+3
* | | | Merge "Add a way to choose the current spell checker"satok2011-08-023-10/+230
|\ \ \ \ | |/ / / |/| | |
| * | | Add a way to choose the current spell checkersatok2011-08-023-10/+230
* | | | Always use non-solid action bar theme.Jeff Sharkey2011-08-011-1/+1