summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge "Minor changes in Settings"Gilles Debunne2011-06-284-16/+12
|\
| * Minor changes in SettingsGilles Debunne2011-06-244-16/+12
* | Merge "Check to see if the power source is a valid charger."Jason parks2011-06-281-1/+7
|\ \
| * | Check to see if the power source is a valid charger.Jason parks2011-06-241-1/+7
* | | Fix a bug in the TTS settings.Narayan Kamath2011-06-281-7/+7
* | | Merge "Add WifiWatchdogService toggle to Wifi Settings"Isaac Levy2011-06-274-0/+25
|\ \ \
| * | | Add WifiWatchdogService toggle to Wifi SettingsIsaac Levy2011-06-274-0/+25
* | | | am d2157460: am 6a078ed3: (-s ours) am a18484fb: Import new translations.Eric Fischer2011-06-270-0/+0
|\ \ \ \
| * \ \ \ am 6a078ed3: (-s ours) am a18484fb: Import new translations.Eric Fischer2011-06-270-0/+0
| |\ \ \ \
| | * \ \ \ am a18484fb: Import new translations.Eric Fischer2011-06-2743-103/+270
| | |\ \ \ \
| | | * | | | Import new translations.Eric Fischer2011-06-2743-103/+270
* | | | | | | CA certificate settings fragmentBrian Carlstrom2011-06-277-0/+573
* | | | | | | Merge "Fix crash in Settings"Marco Nelissen2011-06-271-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Fix crash in SettingsMarco Nelissen2011-06-271-1/+1
| | |_|_|/ / / | |/| | | | |
* | | | | | | am c9a477ae: am e3cfa9bc: am 13bac39d: Remove obsolete compat mode UI.Dianne Hackborn2011-06-271-2/+4
|\ \ \ \ \ \ \ | |/ / / / / / |/| / / / / / | |/ / / / /
| * | | | | am e3cfa9bc: am 13bac39d: Remove obsolete compat mode UI.Dianne Hackborn2011-06-241-2/+4
| |\ \ \ \ \
| | * \ \ \ \ am 13bac39d: Remove obsolete compat mode UI.Dianne Hackborn2011-06-241-2/+4
| | |\ \ \ \ \
| | | * | | | | Remove obsolete compat mode UI.Dianne Hackborn2011-06-231-2/+4
* | | | | | | | Merge "Settings: add a new layout for VpnSettings."Chia-chi Yeh2011-06-261-0/+22
|\ \ \ \ \ \ \ \
| * | | | | | | | Settings: add a new layout for VpnSettings.Chia-chi Yeh2011-06-261-0/+22
* | | | | | | | | Merge "Settings: add a new layout for VpnDialog."Chia-chi Yeh2011-06-261-0/+126
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Settings: add a new layout for VpnDialog.Chia-chi Yeh2011-06-261-0/+126
* | | | | | | | | Merge "Settings: revise VpnSettings."Chia-chi Yeh2011-06-266-7/+885
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Settings: revise VpnSettings.Chia-chi Yeh2011-06-266-7/+885
* | | | | | | | | Merge "Fix animation bugs, stop disabled sweep touches."Jeff Sharkey2011-06-2410-40/+86
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix animation bugs, stop disabled sweep touches.Jeff Sharkey2011-06-2410-40/+86
| | |_|_|_|_|_|/ / | |/| | | | | | |
* | | | | | | | | Add "emergency call" button to CryptKeeperDavid Brown2011-06-247-2/+96
| |_|_|_|_|_|_|/ |/| | | | | | |
* | | | | | | | Merge "Add "large text" accessibility option."Dianne Hackborn2011-06-243-26/+65
|\ \ \ \ \ \ \ \
| * | | | | | | | Add "large text" accessibility option.Dianne Hackborn2011-06-233-26/+65
* | | | | | | | | Reconcile with gingerbread-releaseThe Android Open Source Project2011-06-240-0/+0
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | merge in gingerbread-release history after reset to gingerbreadThe Android Automerger2011-06-160-0/+0
| |\ \ \ \ \ \ \ \
* | | | | | | | | | More data usage chart iteration, app details.Jeff Sharkey2011-06-2338-461/+481
* | | | | | | | | | Resize data usage assets.Jeff Sharkey2011-06-2323-0/+0
* | | | | | | | | | Merge "Turn off hardware acceleration to avoid crashes due to driver."Justin Ho2011-06-231-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Turn off hardware acceleration to avoid crashes due to driver.Amith Yamasani2011-06-231-1/+1
* | | | | | | | | | | Merge "Refactoring in Settings/Applications"Gilles Debunne2011-06-2310-95/+102
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Refactoring in Settings/ApplicationsGilles Debunne2011-06-2210-95/+102
| |/ / / / / / / / /
* | | | | | | | | | Merge "Bug 4879032: NPE fix when restarting Settings."Gilles Debunne2011-06-231-23/+24
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Bug 4879032: NPE fix when restarting Settings.Gilles Debunne2011-06-221-23/+24
| |/ / / / / / / / /
* | | | | | | | | | am 45679d94: (-s ours) am 38ae9125: (-s ours) am 7ab66973: Merge "DO NOT MERG...Jaikumar Ganesh2011-06-230-0/+0
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / | |/| | | | | | | |
| * | | | | | | | | am 38ae9125: (-s ours) am 7ab66973: Merge "DO NOT MERGE Show user dialog for ...Jaikumar Ganesh2011-06-210-0/+0
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / | | |/| | | | | | |
| | * | | | | | | | am 7ab66973: Merge "DO NOT MERGE Show user dialog for BT." into gingerbreadJaikumar Ganesh2011-06-214-0/+324
| | |\ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|/ | | | |/| | | | | |
| | | * | | | | | | Merge "DO NOT MERGE Show user dialog for BT." into gingerbreadJaikumar Ganesh2011-06-214-0/+324
| | | |\ \ \ \ \ \ \
| | | | * | | | | | | DO NOT MERGE Show user dialog for BT.Jaikumar Ganesh2011-06-204-0/+324
* | | | | | | | | | | am 47504c7b: am a7bb204a: am c6f14410: Merge "Remove CHAR LIMIT from string t...Jaikumar Ganesh2011-06-230-0/+0
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | am a7bb204a: am c6f14410: Merge "Remove CHAR LIMIT from string to fix build."...Jaikumar Ganesh2011-06-201-1/+1
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / /
| | * | | | | | | | | am c6f14410: Merge "Remove CHAR LIMIT from string to fix build." into gingerb...Jaikumar Ganesh2011-06-201-1/+1
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / /
| | | * | | | | | | | Merge "Remove CHAR LIMIT from string to fix build." into gingerbreadJaikumar Ganesh2011-06-201-1/+1
| | | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / /
| | | | * | | | | | | Remove CHAR LIMIT from string to fix build.Jaikumar Ganesh2011-06-201-1/+1
* | | | | | | | | | | Iterate on data usage chart UI.Jeff Sharkey2011-06-2327-212/+597