summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-08-130-0/+0
|\
| * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-08-090-0/+0
| |\
| | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-08-080-0/+0
| | |\
| | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-08-070-0/+0
| | | |\
| | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-08-060-0/+0
| | | | |\
| | | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-08-020-0/+0
| | | | | |\
| | | | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-07-310-0/+0
| | | | | | |\
| | | | | | | * am 4045ec3b: am a49c3d24: Reconcile with jb-mr0-releaseThe Android Open Source Project2012-07-270-0/+0
| | | | | | | |\
| | | | | | | * \ am 62c46b3a: (-s ours) Merge "DO NOT MERGE Push everything into an R-Tree" in...John Reck2012-07-270-0/+0
| | | | | | | |\ \
| | | | | | | * \ \ am b7c99a42: Fix background tiles drawingChris Craik2012-07-272-3/+5
| | | | | | | |\ \ \
| | | | | | | * | | | Push everything into an R-TreeJohn Reck2012-07-2610-541/+233
* | | | | | | | | | | Merge "Clear mOperationState when calling popState" into jb-mr1-devJohn Reck2012-08-102-7/+14
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Clear mOperationState when calling popStateJohn Reck2012-08-102-7/+14
* | | | | | | | | | | | am f5bd5114: (-s ours) Reconcile with jb-mr0-release - do not mergeThe Android Open Source Project2012-08-100-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Reconcile with jb-mr0-release - do not mergeThe Android Open Source Project2012-08-100-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ merge in jb-mr0-release history after reset to jb-devThe Android Automerger2012-08-090-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \
* | | \ \ \ \ \ \ \ \ \ \ \ \ Merge "Paint with requested size instead of layer size" into jb-mr1-devChris Craik2012-08-101-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Paint with requested size instead of layer sizeChris Craik2012-08-091-1/+1
| | |_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | am 4bab8233: (-s ours) am 28c43cfa: DO NOT MERGE Fix memory leakJohn Reck2012-08-090-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | am 28c43cfa: DO NOT MERGE Fix memory leakJohn Reck2012-08-091-0/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / | | |/| | | | | | | | | | |
| | * | | | | | | | | | | | DO NOT MERGE Fix memory leakJohn Reck2012-08-091-0/+6
* | | | | | | | | | | | | | Merge "Clip out opaque regions to avoid double painting" into jb-mr1-devChris Craik2012-08-093-4/+154
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Clip out opaque regions to avoid double paintingChris Craik2012-08-083-4/+154
| | |_|/ / / / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Fix memory leakJohn Reck2012-08-081-0/+6
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge "Reset cached opacity on shader swap" into jb-mr1-devChris Craik2012-08-071-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Reset cached opacity on shader swapChris Craik2012-08-071-0/+1
* | | | | | | | | | | | | Add extra null checkJohn Reck2012-08-071-0/+2
| |_|_|_|/ / / / / / / / |/| | | | | | | | | | |
* | | | | | | | | | | | Remove usages of getCanvasJohn Reck2012-08-0631-161/+162
| |_|_|_|/ / / / / / / |/| | | | | | | | | |
* | | | | | | | | | | am dd5962d2: am 47387cc7: Merge "Fix browser rendering issue: pure color tile...John Reck2012-08-021-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | am 47387cc7: Merge "Fix browser rendering issue: pure color tiles are rendere...John Reck2012-08-021-1/+1
| |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge "Fix browser rendering issue: pure color tiles are rendered black"John Reck2012-08-021-1/+1
| | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | Fix browser rendering issue: pure color tiles are rendered blackYuyang Du2012-08-011-1/+1
| | |/ / / / / / / / / /
* | | | | | | | | | | | DO NOT MERGE. Allow numeric entry fields to have placeholder text.George Mount2012-08-021-0/+4
| |_|_|_|_|/ / / / / / |/| | | | | | | | | |
* | | | | | | | | | | Merge "Tweak shadow settings" into jb-mr1-devJohn Reck2012-08-011-3/+3
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Tweak shadow settingsJohn Reck2012-08-011-3/+3
* | | | | | | | | | | | Fix build by adding missing #include.Elliott Hughes2012-08-011-0/+1
|/ / / / / / / / / / /
* | | | | | | | | | | Optimize recompute bounds checksNicolas Roard2012-08-012-16/+44
* | | | | | | | | | | Fix PicturePile size adjust pathJohn Reck2012-08-011-7/+23
| |_|/ / / / / / / / |/| | | | | | | | |
* | | | | | | | | | Memory cleanupJohn Reck2012-07-312-53/+61
* | | | | | | | | | Switch GraphicsOperation to LinearAllocatorJohn Reck2012-07-319-94/+199
| |_|_|_|/ / / / / |/| | | | | | | |
* | | | | | | | | Merge "Don't use SkPicture for DrawText recording" into jb-mr1-devJohn Reck2012-07-309-124/+276
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | |
| * | | | | | | | Don't use SkPicture for DrawText recordingJohn Reck2012-07-279-124/+276
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | am a49c3d24: Reconcile with jb-mr0-releaseThe Android Open Source Project2012-07-270-0/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| / / / / / / | |/ / / / / /
| * | | | | | Reconcile with jb-mr0-releaseThe Android Open Source Project2012-07-270-0/+0
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | |
| | * | | | | merge in jb-mr0-release history after reset to jb-devThe Android Automerger2012-07-240-0/+0
| | |\ \ \ \ \ | | | |_|/ / / | | |/| | | |
* | | | | | | Merge "DO NOT MERGE Push everything into an R-Tree" into jb-mr1-devJohn Reck2012-07-2710-541/+233
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | DO NOT MERGE Push everything into an R-TreeJohn Reck2012-07-2710-541/+233
| | |_|_|_|/ | |/| | | |
* | | | | | Fix background tiles drawingChris Craik2012-07-272-3/+5
|/ / / / /
* | | | | am f35e08fe: am 0e8bb600: Null check to fix crashBart Sears2012-07-241-1/+3
|\ \ \ \ \ | |/ / / /
| * | | | am 0e8bb600: Null check to fix crashBart Sears2012-07-241-1/+3
| |\ \ \ \ | | |/ / / | | | | / | | |_|/ | |/| |
generated by cgit v1.1 at 2024-06-26 06:41:10 +0000