Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | merge in jb-mr1-release history after reset to jb-mr1-dev | The Android Automerger | 2012-08-16 | 0 | -0/+0 |
|\ | |||||
| * | merge in jb-mr1-release history after reset to jb-mr1-dev | The Android Automerger | 2012-08-15 | 0 | -0/+0 |
| |\ | |||||
| | * | merge in jb-mr1-release history after reset to jb-mr1-dev | The Android Automerger | 2012-08-14 | 0 | -0/+0 |
| | |\ | |||||
| | | * | Null check | John Reck | 2012-08-13 | 1 | -1/+1 |
| | | * | merge in jb-mr1-release history after reset to jb-mr1-dev | The Android Automerger | 2012-08-13 | 0 | -0/+0 |
| | | |\ | |||||
| | | | * | merge in jb-mr1-release history after reset to jb-mr1-dev | The Android Automerger | 2012-08-09 | 0 | -0/+0 |
| | | | |\ | |||||
| | | | | * | merge in jb-mr1-release history after reset to jb-mr1-dev | The Android Automerger | 2012-08-08 | 0 | -0/+0 |
| | | | | |\ | |||||
| | | | | | * | merge in jb-mr1-release history after reset to jb-mr1-dev | The Android Automerger | 2012-08-07 | 0 | -0/+0 |
| | | | | | |\ | |||||
| | | | | | | * | merge in jb-mr1-release history after reset to jb-mr1-dev | The Android Automerger | 2012-08-06 | 0 | -0/+0 |
| | | | | | | |\ | |||||
| | | | | | | | * | merge in jb-mr1-release history after reset to jb-mr1-dev | The Android Automerger | 2012-08-02 | 0 | -0/+0 |
| | | | | | | | |\ | |||||
| | | | | | | | | * | merge in jb-mr1-release history after reset to jb-mr1-dev | The Android Automerger | 2012-07-31 | 0 | -0/+0 |
| | | | | | | | | |\ | |||||
| | | | | | | | | | * | am 4045ec3b: am a49c3d24: Reconcile with jb-mr0-release | The Android Open Source Project | 2012-07-27 | 0 | -0/+0 |
| | | | | | | | | | |\ | |||||
| | | | | | | | | | * \ | am 62c46b3a: (-s ours) Merge "DO NOT MERGE Push everything into an R-Tree" in... | John Reck | 2012-07-27 | 0 | -0/+0 |
| | | | | | | | | | |\ \ | |||||
| | | | | | | | | | * \ \ | am b7c99a42: Fix background tiles drawing | Chris Craik | 2012-07-27 | 2 | -3/+5 |
| | | | | | | | | | |\ \ \ | |||||
| | | | | | | | | | * | | | | Push everything into an R-Tree | John Reck | 2012-07-26 | 10 | -541/+233 |
* | | | | | | | | | | | | | | Merge "Correctly handle preserve-3d layer ordering" into jb-mr1-dev | Chris Craik | 2012-08-15 | 4 | -47/+86 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | Correctly handle preserve-3d layer ordering | Chris Craik | 2012-08-15 | 4 | -47/+86 |
* | | | | | | | | | | | | | | | Merge "Use content size for scroll width calculation." into jb-mr1-dev | George Mount | 2012-08-15 | 1 | -1/+4 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Use content size for scroll width calculation. | George Mount | 2012-08-14 | 1 | -1/+4 |
| | |/ / / / / / / / / / / / | |/| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | Move text allocations to LinearAllocator | John Reck | 2012-08-14 | 3 | -17/+34 |
* | | | | | | | | | | | | | | Memory usage improvements | John Reck | 2012-08-14 | 2 | -10/+49 |
|/ / / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | am a78a0374: (-s ours) am 465864a6: DO NOT MERGE Null check | John Reck | 2012-08-13 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | am 465864a6: DO NOT MERGE Null check | John Reck | 2012-08-13 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | DO NOT MERGE Null check | John Reck | 2012-08-13 | 1 | -1/+1 |
* | | | | | | | | | | | | | | | Merge "Null check" into jb-mr1-dev | John Reck | 2012-08-13 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Null check | John Reck | 2012-08-13 | 1 | -1/+1 |
| | |_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | Merge "Improve in-canvas pure color checking" into jb-mr1-dev | Chris Craik | 2012-08-13 | 2 | -35/+49 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Improve in-canvas pure color checking | Chris Craik | 2012-08-10 | 2 | -35/+49 |
* | | | | | | | | | | | | | | Merge "Clear mOperationState when calling popState" into jb-mr1-dev | John Reck | 2012-08-10 | 2 | -7/+14 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | Clear mOperationState when calling popState | John Reck | 2012-08-10 | 2 | -7/+14 |
* | | | | | | | | | | | | | | | am f5bd5114: (-s ours) Reconcile with jb-mr0-release - do not merge | The Android Open Source Project | 2012-08-10 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / |/| | / / / / / / / / / / / / | | |/ / / / / / / / / / / / | |/| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Reconcile with jb-mr0-release - do not merge | The Android Open Source Project | 2012-08-10 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ | merge in jb-mr0-release history after reset to jb-dev | The Android Automerger | 2012-08-09 | 0 | -0/+0 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / | | |/| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | Merge "Paint with requested size instead of layer size" into jb-mr1-dev | Chris Craik | 2012-08-10 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Paint with requested size instead of layer size | Chris Craik | 2012-08-09 | 1 | -1/+1 |
| | |_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | am 4bab8233: (-s ours) am 28c43cfa: DO NOT MERGE Fix memory leak | John Reck | 2012-08-09 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |/| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | am 28c43cfa: DO NOT MERGE Fix memory leak | John Reck | 2012-08-09 | 1 | -0/+6 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / | | |/| | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | DO NOT MERGE Fix memory leak | John Reck | 2012-08-09 | 1 | -0/+6 |
* | | | | | | | | | | | | | | Merge "Clip out opaque regions to avoid double painting" into jb-mr1-dev | Chris Craik | 2012-08-09 | 3 | -4/+154 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Clip out opaque regions to avoid double painting | Chris Craik | 2012-08-08 | 3 | -4/+154 |
| | |_|/ / / / / / / / / / | |/| | | | | | | | | | | | |||||
* | | | | | | | | | | | | | Fix memory leak | John Reck | 2012-08-08 | 1 | -0/+6 |
|/ / / / / / / / / / / / | |||||
* | | | | | | | | | | | | Merge "Reset cached opacity on shader swap" into jb-mr1-dev | Chris Craik | 2012-08-07 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | Reset cached opacity on shader swap | Chris Craik | 2012-08-07 | 1 | -0/+1 |
* | | | | | | | | | | | | | Add extra null check | John Reck | 2012-08-07 | 1 | -0/+2 |
| |_|_|_|/ / / / / / / / |/| | | | | | | | | | | | |||||
* | | | | | | | | | | | | Remove usages of getCanvas | John Reck | 2012-08-06 | 31 | -161/+162 |
| |_|_|_|/ / / / / / / |/| | | | | | | | | | | |||||
* | | | | | | | | | | | am dd5962d2: am 47387cc7: Merge "Fix browser rendering issue: pure color tile... | John Reck | 2012-08-02 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | | | |||||
| * | | | | | | | | | | am 47387cc7: Merge "Fix browser rendering issue: pure color tiles are rendere... | John Reck | 2012-08-02 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ | Merge "Fix browser rendering issue: pure color tiles are rendered black" | John Reck | 2012-08-02 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | | Fix browser rendering issue: pure color tiles are rendered black | Yuyang Du | 2012-08-01 | 1 | -1/+1 |
| | |/ / / / / / / / / / | |||||
* | | | | | | | | | | | | DO NOT MERGE. Allow numeric entry fields to have placeholder text. | George Mount | 2012-08-02 | 1 | -0/+4 |
| |_|_|_|_|/ / / / / / |/| | | | | | | | | | |