summaryrefslogtreecommitdiffstats
path: root/core
Commit message (Expand)AuthorAgeFilesLines
* Merge "resolved conflicts for merge of ca2b552d to master"Jeff Brown2011-06-034-0/+30
|\
| * resolved conflicts for merge of ca2b552d to masterJeff Brown2011-06-034-0/+30
| |\
| | * am c8812761: am e1718de6: Merge "Add a preference panel for mouse speed." int...Jeff Brown2011-06-024-0/+30
| | |\
| | | * am e1718de6: Merge "Add a preference panel for mouse speed." into honeycomb-mr2Jeff Brown2011-06-024-0/+30
| | | |\
| | | | * Add a preference panel for mouse speed.Jeff Brown2011-06-024-0/+30
* | | | | Merge "Prevent WebKit updates in loadViewState case"John Reck2011-06-032-26/+66
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Prevent WebKit updates in loadViewState caseJohn Reck2011-06-032-26/+66
* | | | | Merge "resolved conflicts for merge of cc20b4e3 to master"Dianne Hackborn2011-06-035-6/+54
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | resolved conflicts for merge of cc20b4e3 to masterDianne Hackborn2011-06-035-6/+54
| |\ \ \ \ | | |/ / /
| | * | | am a5f88510: am 2969b511: Merge "Add new supports-screen API to set maximum a...Dianne Hackborn2011-06-015-6/+54
| | |\ \ \ | | | |/ /
| | | * | am 2969b511: Merge "Add new supports-screen API to set maximum allowed size."...Dianne Hackborn2011-06-015-6/+54
| | | |\ \ | | | | |/
| | | | * Add new supports-screen API to set maximum allowed size.Dianne Hackborn2011-06-015-6/+54
* | | | | Merge "Initial support for view state serialization"John Reck2011-06-032-61/+190
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Initial support for view state serializationJohn Reck2011-06-032-61/+190
* | | | | am 3a80c504: am 8b9a2b6c: am e6676351: Work around OpenFeint bug.Dianne Hackborn2011-06-034-8/+40
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | am 8b9a2b6c: am e6676351: Work around OpenFeint bug.Dianne Hackborn2011-06-014-8/+40
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | am e6676351: Work around OpenFeint bug.Dianne Hackborn2011-06-014-8/+40
| | |\ \ \ | | | | |/ | | | |/|
| | | * | Work around OpenFeint bug.Dianne Hackborn2011-06-014-8/+40
* | | | | Merge "Fix default TextView gravity"Fabrice Di Meglio2011-06-031-1/+1
|\ \ \ \ \
| * | | | | Fix default TextView gravityFabrice Di Meglio2011-06-031-1/+1
* | | | | | am b30dda6b: am 036c40f4: am fa8ee177: Merge "Framework: bugfix for menu sele...Adam Powell2011-06-031-0/+1
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | am 036c40f4: am fa8ee177: Merge "Framework: bugfix for menu selector not show...Adam Powell2011-06-011-0/+1
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | am fa8ee177: Merge "Framework: bugfix for menu selector not showing up proper...Adam Powell2011-06-011-0/+1
| | |\ \ \ \ | | | | |/ / | | | |/| |
| | | * | | Merge "Framework: bugfix for menu selector not showing up properly." into hon...Adam Powell2011-06-011-0/+1
| | | |\ \ \
| | | | * | | Framework: bugfix for menu selector not showing up properly.Justin Koh2011-06-011-0/+1
* | | | | | | am c11f6c3e: am 7cae137e: am 79841acb: Merge "Compatibility mode never needed...Dianne Hackborn2011-06-031-0/+3
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am 7cae137e: am 79841acb: Merge "Compatibility mode never needed for normal s...Dianne Hackborn2011-06-011-0/+3
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | am 79841acb: Merge "Compatibility mode never needed for normal size screens."...Dianne Hackborn2011-06-011-0/+3
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | Merge "Compatibility mode never needed for normal size screens." into honeyco...Dianne Hackborn2011-06-011-0/+3
| | | |\ \ \ \
| | | | * | | | Compatibility mode never needed for normal size screens.Dianne Hackborn2011-06-011-0/+3
* | | | | | | | resolved conflicts for merge of b9e2f68b to masterDianne Hackborn2011-06-031-7/+21
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am 13e2bef4: am 80cf4e79: Merge "Fix issue #4500511: Holo effect background d...Dianne Hackborn2011-06-011-7/+21
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | am 80cf4e79: Merge "Fix issue #4500511: Holo effect background doesn\'t reach...Dianne Hackborn2011-06-011-7/+21
| | |\ \ \ \ \ \ | | | |/ / / / /
| | | * | | | | Merge "Fix issue #4500511: Holo effect background doesn't reach top of screen...Dianne Hackborn2011-06-011-7/+21
| | | |\ \ \ \ \ | | | | |/ / / / | | | | | / / / | | | | |/ / / | | | |/| | |
| | | | * | | Fix issue #4500511: Holo effect background doesn't reach top of screen anymoreDianne Hackborn2011-06-011-7/+21
* | | | | | | am d19fbe34: am ca234a07: am 8656ba12: Merge "Fix bug 4501658 - adjust toast ...Adam Powell2011-06-036-0/+0
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am ca234a07: am 8656ba12: Merge "Fix bug 4501658 - adjust toast frame padding...Adam Powell2011-06-016-0/+0
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | am 8656ba12: Merge "Fix bug 4501658 - adjust toast frame padding" into honeyc...Adam Powell2011-06-016-0/+0
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | Merge "Fix bug 4501658 - adjust toast frame padding" into honeycomb-mr2Adam Powell2011-06-016-0/+0
| | | |\ \ \ \ | | | | |/ / / | | | |/| | |
| | | | * | | Fix bug 4501658 - adjust toast frame paddingAdam Powell2011-05-316-0/+0
* | | | | | | Merge "Response to code review for GridLayout:"Philip Milne2011-06-033-251/+484
|\ \ \ \ \ \ \
| * | | | | | | Response to code review for GridLayout:Philip Milne2011-06-033-251/+484
* | | | | | | | am c691d7f9: am b8d10931: am fd206560: Merge "Forgot this file." into honeyco...Dianne Hackborn2011-06-031-0/+20
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | am b8d10931: am fd206560: Merge "Forgot this file." into honeycomb-mr2Dianne Hackborn2011-05-311-0/+20
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | * | | | | | am fd206560: Merge "Forgot this file." into honeycomb-mr2Dianne Hackborn2011-05-311-0/+20
| | |\ \ \ \ \ \ | | | | |/ / / / | | | |/| | | |
| | | * | | | | Merge "Forgot this file." into honeycomb-mr2Dianne Hackborn2011-05-311-0/+20
| | | |\ \ \ \ \
| | | | * | | | | Forgot this file.Dianne Hackborn2011-05-311-0/+20
* | | | | | | | | am 7322e557: am a4cfcf10: am 75d6b3c2: Merge "Fix issue #4502672: Wrong xml r...Dianne Hackborn2011-06-037-22/+43
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | am a4cfcf10: am 75d6b3c2: Merge "Fix issue #4502672: Wrong xml resources used...Dianne Hackborn2011-05-317-22/+43
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | am 75d6b3c2: Merge "Fix issue #4502672: Wrong xml resources used for homescre...Dianne Hackborn2011-05-317-22/+43
| | |\ \ \ \ \ \ \ | | | |/ / / / / /