Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | am 75fd6068: Merge "Keep text handles in sync with native touch targets" into... | John Reck | 2011-10-27 | 3 | -4/+46 |
|\ | |||||
| * | Merge "Keep text handles in sync with native touch targets" into ics-mr1 | John Reck | 2011-10-27 | 3 | -4/+46 |
| |\ | |||||
| | * | Keep text handles in sync with native touch targets | John Reck | 2011-10-27 | 3 | -4/+46 |
* | | | am 0b8560de: Add missing save/restore calls to GraphicsContext::fillRect | Ben Murdoch | 2011-10-27 | 1 | -0/+4 |
|\ \ \ | |/ / | |||||
| * | | Add missing save/restore calls to GraphicsContext::fillRect | Ben Murdoch | 2011-10-27 | 1 | -0/+4 |
| |/ | |||||
* | | Merge "Added Y positions for complex script rendering." | claireho | 2011-10-26 | 1 | -22/+24 |
|\ \ | |||||
| * | | Added Y positions for complex script rendering. | claireho | 2011-10-21 | 1 | -22/+24 |
* | | | am 4476ae7e: Merge remote branch \'goog/ics-mr0\' into ics-mr1 | Ed Heyl | 2011-10-26 | 0 | -0/+0 |
|\ \ \ | | |/ | |/| | |||||
| * | | Merge remote branch 'goog/ics-mr0' into ics-mr1 | Ed Heyl | 2011-10-26 | 0 | -0/+0 |
| |\ \ | |||||
* | \ \ | am 1b1aeae5: (-s ours) Merge "DO NOT MERGE Adjust text selection position" in... | John Reck | 2011-10-26 | 0 | -0/+0 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge "DO NOT MERGE Adjust text selection position" into ics-mr1 | John Reck | 2011-10-25 | 3 | -3/+12 |
| |\ \ \ | |||||
| | * | | | DO NOT MERGE Adjust text selection position | John Reck | 2011-10-25 | 3 | -3/+12 |
* | | | | | am f6024a98: (-s ours) Merge "DO NOT MERGE Fix SW extras for layers" into ics... | John Reck | 2011-10-26 | 0 | -0/+0 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Merge "DO NOT MERGE Fix SW extras for layers" into ics-mr1 | John Reck | 2011-10-25 | 14 | -107/+17 |
| |\ \ \ \ | |||||
| | * | | | | DO NOT MERGE Fix SW extras for layers | John Reck | 2011-10-25 | 14 | -107/+17 |
* | | | | | | am c43f9396: Merge "Don\'t draw prefetch page if not necessary" into ics-mr1 | Chris Craik | 2011-10-26 | 4 | -23/+33 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Merge "Don't draw prefetch page if not necessary" into ics-mr1 | Chris Craik | 2011-10-25 | 4 | -23/+33 |
| |\ \ \ \ \ | |||||
| | * | | | | | Don't draw prefetch page if not necessary | Chris Craik | 2011-10-25 | 4 | -23/+33 |
| | |/ / / / | |||||
* | | | | | | am d0e47e8b: Take scale into account when greedily prefetching an entire layer | Chris Craik | 2011-10-26 | 0 | -0/+0 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Take scale into account when greedily prefetching an entire layer | Chris Craik | 2011-10-25 | 1 | -2/+2 |
* | | | | | | am affc0848: SwapLayersTextures on all layer changes | Chris Craik | 2011-10-26 | 0 | -0/+0 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | SwapLayersTextures on all layer changes | Chris Craik | 2011-10-25 | 1 | -2/+1 |
* | | | | | | am 9bcbd1be: Mark layers as ready to swap if invisible | Chris Craik | 2011-10-26 | 0 | -0/+0 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Mark layers as ready to swap if invisible | Chris Craik | 2011-10-25 | 1 | -1/+1 |
* | | | | | | am 3528cb86: Remove unnecessary log | Nicolas Roard | 2011-10-26 | 0 | -0/+0 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Remove unnecessary log | Nicolas Roard | 2011-10-25 | 1 | -1/+1 |
| | |/ / / | |/| | | | |||||
* | | | | | am c0fb399b: (-s ours) Don\'t force composited layers to be stacking contexts... | Chris Craik | 2011-10-26 | 0 | -0/+0 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Don't force composited layers to be stacking contexts - DO NOT MERGE | Chris Craik | 2011-10-25 | 1 | -1/+1 |
| |/ / / | |||||
* | | | | Rename LOGV(_IF) to ALOGV(_IF) DO NOT MERGE | Steve Block | 2011-10-25 | 13 | -84/+84 |
* | | | | Merge "Report a load error when network loads blocked." | Ben Murdoch | 2011-10-25 | 4 | -19/+26 |
|\ \ \ \ | |||||
| * | | | | Report a load error when network loads blocked. | Ben Murdoch | 2011-10-25 | 4 | -19/+26 |
* | | | | | Merge "Adjust text selection position" | John Reck | 2011-10-25 | 3 | -3/+12 |
|\ \ \ \ \ | |||||
| * | | | | | Adjust text selection position | John Reck | 2011-10-24 | 3 | -3/+12 |
* | | | | | | Reconcile with ics-mr0-release | The Android Open Source Project | 2011-10-25 | 0 | -0/+0 |
|\ \ \ \ \ \ | |||||
| * \ \ \ \ \ | merge in ics-mr0-release history after reset to ics-mr0 | The Android Automerger | 2011-10-24 | 0 | -0/+0 |
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | | | |||||
* | | | | | | | am 0d4258e7: Merge "Take scale into account when greedily prefetching an enti... | Chris Craik | 2011-10-24 | 1 | -2/+2 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | Merge "Take scale into account when greedily prefetching an entire layer" int... | Chris Craik | 2011-10-24 | 1 | -2/+2 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Take scale into account when greedily prefetching an entire layer | Chris Craik | 2011-10-24 | 1 | -2/+2 |
* | | | | | | | | am bee2599e: SwapLayersTextures on all layer changes | Chris Craik | 2011-10-24 | 1 | -2/+1 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| * | | | | | | | SwapLayersTextures on all layer changes | Chris Craik | 2011-10-24 | 1 | -2/+1 |
| |/ / / / / / | |||||
* | | | | | | | Reconcile with ics-mr0-release | The Android Open Source Project | 2011-10-24 | 0 | -0/+0 |
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | |||||
| * | | | | | | merge in ics-mr0-release history after reset to ics-mr0 | The Android Automerger | 2011-10-24 | 0 | -0/+0 |
| |\ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ | am a4adfec4: Merge "Mark layers as ready to swap if invisible" into ics-mr0 | Chris Craik | 2011-10-24 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | / / / / | |_|_|/ / / / |/| | | | | | | |||||
| * | | | | | | Merge "Mark layers as ready to swap if invisible" into ics-mr0 | Chris Craik | 2011-10-24 | 1 | -1/+1 |
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | |||||
| | * | | | | | Mark layers as ready to swap if invisible | Chris Craik | 2011-10-24 | 1 | -1/+1 |
* | | | | | | | Merge "Fix SW extras for layers" | John Reck | 2011-10-24 | 14 | -107/+17 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Fix SW extras for layers | John Reck | 2011-10-24 | 14 | -107/+17 |
* | | | | | | | | am d436d4c3: Merge "Remove unnecessary log" into ics-mr0 | Bart Sears | 2011-10-24 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| / / / / / / | |/ / / / / / | |||||
| * | | | | | | Merge "Remove unnecessary log" into ics-mr0 | Bart Sears | 2011-10-24 | 1 | -1/+1 |
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | |||||
| | * | | | | | Remove unnecessary log | Nicolas Roard | 2011-10-23 | 1 | -1/+1 |