summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* am 0d4f6046: Remove unnecessary Android code from hitTestForLayerJohn Reck2012-06-072-32/+0
|\
| * Remove unnecessary Android code from hitTestForLayerJohn Reck2012-06-062-32/+0
* | Reconcile with jb-releaseThe Android Open Source Project2012-06-070-0/+0
|\ \
| * \ merge in jb-release history after reset to jb-devThe Android Automerger2012-06-060-0/+0
| |\ \ | | |/ | |/|
| | * Reduce base layer false clip size to avoid rounding issuesChris Craik2012-06-052-1/+6
| | * merge in jb-release history after reset to jb-devThe Android Automerger2012-06-050-0/+0
| | |\
| | | * merge in jb-release history after reset to jb-devThe Android Automerger2012-06-030-0/+0
| | | |\
| | | | * merge in jb-release history after reset to jb-devThe Android Automerger2012-05-310-0/+0
| | | | |\
* | | | | \ am 7da43ef8: Merge "Fix fake bold for fallback fonts." into jb-devVictoria Lease2012-06-053-2/+16
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "Fix fake bold for fallback fonts." into jb-devVictoria Lease2012-06-053-2/+16
| |\ \ \ \ \
| | * | | | | Fix fake bold for fallback fonts.Victoria Lease2012-05-313-2/+16
| | | |_|/ / | | |/| | |
* | | | | | am d3fa9c80: Reduce base layer false clip size to avoid rounding issuesChris Craik2012-06-052-1/+6
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Reduce base layer false clip size to avoid rounding issuesChris Craik2012-06-052-1/+6
| | |/ / / | |/| | |
* | | | | am 988183e3: Size change on the base surface invalidates the larger of the ne...Chris Craik2012-06-041-8/+18
|\ \ \ \ \ | |/ / / /
| * | | | Size change on the base surface invalidates the larger of the new/old dimensionsChris Craik2012-06-041-8/+18
| | |/ / | |/| |
* | | | am 06100d01: Merge "Disable clipping on the base surface" into jb-devChris Craik2012-06-022-11/+14
|\ \ \ \ | |/ / /
| * | | Merge "Disable clipping on the base surface" into jb-devChris Craik2012-06-022-11/+14
| |\ \ \
| | * | | Disable clipping on the base surfaceChris Craik2012-06-012-11/+14
* | | | | am 6b850721: Fixed mistake in how label was being mistakenly set into name.George Mount2012-06-011-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | Fixed mistake in how label was being mistakenly set into name.George Mount2012-06-011-1/+1
* | | | | am 678de4ac: Fix document.createTouchList crash.Ben Murdoch2012-06-016-10/+60
|\ \ \ \ \ | |/ / / /
| * | | | Fix document.createTouchList crash.Ben Murdoch2012-06-016-10/+60
| |/ / /
* | | | am b5d3edac: Merge "Invalidate webview content on setBackgroundColor" into jb...Chris Craik2012-05-311-0/+7
|\ \ \ \ | |/ / /
| * | | Merge "Invalidate webview content on setBackgroundColor" into jb-devChris Craik2012-05-311-0/+7
| |\ \ \
| | * | | Invalidate webview content on setBackgroundColorChris Craik2012-05-311-0/+7
* | | | | am effdd108: Don\'t allow merging within an animated layerChris Craik2012-05-312-7/+12
|\ \ \ \ \ | |/ / / /
| * | | | Don't allow merging within an animated layerChris Craik2012-05-312-7/+12
| |/ / /
* | | | am 150a26fa: Fix animation in single surface modeTeng-Hui Zhu2012-05-314-27/+27
|\ \ \ \ | |/ / /
| * | | Fix animation in single surface modeTeng-Hui Zhu2012-05-314-27/+27
| |/ /
* | | am 6f60c96b: Merge "Don\'t override X-Requested-With if it is already set" in...John Reck2012-05-301-1/+1
|\ \ \ | |/ /
| * | Merge "Don't override X-Requested-With if it is already set" into jb-devJohn Reck2012-05-301-1/+1
| |\ \
| | * | Don't override X-Requested-With if it is already setJohn Reck2012-05-301-1/+1
* | | | am db590796: Merge "Minimize tearing for fixed element in single surface mode...Teng-Hui Zhu2012-05-306-12/+28
|\ \ \ \ | |/ / /
| * | | Merge "Minimize tearing for fixed element in single surface mode" into jb-devTeng-Hui Zhu2012-05-306-12/+28
| |\ \ \
| | * | | Minimize tearing for fixed element in single surface modeTeng-Hui Zhu2012-05-306-12/+28
* | | | | am e4d0c197: Merge "Draw entire layer tree in capturePicture()" into jb-devChris Craik2012-05-302-2/+11
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Draw entire layer tree in capturePicture()" into jb-devChris Craik2012-05-302-2/+11
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Draw entire layer tree in capturePicture()Chris Craik2012-05-302-2/+11
| | |/ /
* | | | Reconcile with jb-releaseThe Android Open Source Project2012-05-300-0/+0
|\ \ \ \ | | |_|/ | |/| |
| * | | merge in jb-release history after reset to jb-devThe Android Automerger2012-05-300-0/+0
| |\ \ \
* | \ \ \ am 658c3ec9: Merge "Consider frame offset for text snap rectangle." into jb-devGeorge Mount2012-05-302-19/+13
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Merge "Consider frame offset for text snap rectangle." into jb-devGeorge Mount2012-05-302-19/+13
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Consider frame offset for text snap rectangle.George Mount2012-05-292-19/+13
| | | |/ | | |/|
* | | | am 4a0b0816: Merge "Don\'t use setupPaintFill for drawBitmap" into jb-devJohn Reck2012-05-293-2/+15
|\ \ \ \ | |/ / /
| * | | Merge "Don't use setupPaintFill for drawBitmap" into jb-devJohn Reck2012-05-293-2/+15
| |\ \ \
| | * | | Don't use setupPaintFill for drawBitmapJohn Reck2012-05-293-2/+15
| | |/ /
* | | | am 86c18a99: Fix for wrong positioningNicolas Roard2012-05-291-1/+1
|\ \ \ \ | |/ / /
| * | | Fix for wrong positioningNicolas Roard2012-05-291-1/+1
* | | | am bc9eaa14: Merge "Reduce UI-thread computation" into jb-devChris Craik2012-05-297-40/+24
|\ \ \ \ | |/ / /
| * | | Merge "Reduce UI-thread computation" into jb-devChris Craik2012-05-297-40/+24
| |\ \ \