summaryrefslogtreecommitdiffstats
path: root/libs
Commit message (Expand)AuthorAgeFilesLines
* hwui: 64-bit compile issueMark Salyzyn2014-06-101-1/+1
* am b1c76a1a: Merge "Tessellate on worker threads" into lmp-preview-devChris Craik2014-06-1026-213/+867
|\
| * Merge "Tessellate on worker threads" into lmp-preview-devChris Craik2014-06-1026-213/+867
| |\
| | * Tessellate on worker threadsChris Craik2014-06-1026-213/+867
| * | DO NOT MERGE - Creating an empty package should be succesfullAdam Lesinski2014-06-101-1/+1
| |/
* | Creating an empty package should be succesfullAdam Lesinski2014-06-091-1/+1
* | Merge changes Ie0773f85,Ie5e75505John Reck2014-06-0618-162/+391
|\ \
| * | Even FASTER damage calculations!John Reck2014-06-0417-52/+294
| * | Have all the setters return changedJohn Reck2014-06-042-110/+97
* | | am 8632b85b: Merge "Fix issues around GL on incorrect thread" into lmp-previe...Chris Craik2014-06-051-0/+5
|\ \ \ | |/ / |/| / | |/
| * Merge "Fix issues around GL on incorrect thread" into lmp-preview-devChris Craik2014-06-051-0/+5
| |\
| | * Fix issues around GL on incorrect threadChris Craik2014-06-051-0/+5
* | | Merge "Cleanup"John Reck2014-06-022-14/+11
|\ \ \
| * | | CleanupJohn Reck2014-06-022-14/+11
* | | | am feccbdc4: Merge "Add setStartValue to RNA" into lmp-preview-devJohn Reck2014-06-022-4/+3
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | Add setStartValue to RNAJohn Reck2014-06-022-4/+3
* | | am ea5af639: Merge "Re-jigger layers" into lmp-preview-devJohn Reck2014-05-308-69/+74
|\ \ \ | |/ /
| * | Re-jigger layersJohn Reck2014-05-308-69/+74
* | | resolved conflicts for merge of b68f5f09 to masterKenny Root2014-05-302-4/+5
|\ \ \
| * \ \ am 4d31c547: am ce7fa780: Merge "Fix a resource race bug in PathCache"Chris Craik2014-05-302-4/+5
| |\ \ \
| | * \ \ am ce7fa780: Merge "Fix a resource race bug in PathCache"Chris Craik2014-05-302-4/+5
| | |\ \ \
| | | * | | Fix a resource race bug in PathCacheyuyang2014-05-302-4/+5
* | | | | | Merge "Update HWUI matrix API"Derek Sollenberger2014-05-3011-56/+32
|\ \ \ \ \ \
| * | | | | | Update HWUI matrix APIDerek Sollenberger2014-05-2911-56/+32
* | | | | | | am 894bb170: Merge "Enable debug stuffs" into lmp-preview-devJohn Reck2014-05-2912-10/+453
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| * | | | | | Merge "Enable debug stuffs" into lmp-preview-devJohn Reck2014-05-2912-10/+453
| |\ \ \ \ \ \
| | * | | | | | Enable debug stuffsJohn Reck2014-05-2912-10/+453
* | | | | | | | am b5797c9e: Merge "Re-enable atlas" into lmp-preview-devJohn Reck2014-05-291-2/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | / / / / / | |_|/ / / / / |/| | | | | |
| * | | | | | Re-enable atlasJohn Reck2014-05-291-2/+1
| |/ / / / /
* | | | | | am 2d196d9f: Merge "Implement FlushCaches TODO" into lmp-preview-devJohn Reck2014-05-284-0/+24
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "Implement FlushCaches TODO" into lmp-preview-devJohn Reck2014-05-284-0/+24
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
| | * | | | Implement FlushCaches TODOJohn Reck2014-05-234-0/+24
| * | | | | Merge "DO NOT MERGE Inspect SkShader to determine hw shader." into lmp-previe...Chris Craik2014-05-2317-709/+488
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | DO NOT MERGE Inspect SkShader to determine hw shader.Leon Scroggins III2014-05-2317-709/+488
* | | | | | resolved conflicts for merge of 1f6c973b to masterJohn Reck2014-05-239-32/+130
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Bag of scheduling tweaksJohn Reck2014-05-239-32/+130
| |/ / / /
* | | | | Merge "Pass the radius as a float deeper into HWUI allowing RS to generate mo...Derek Sollenberger2014-05-234-14/+32
|\ \ \ \ \
| * | | | | Pass the radius as a float deeper into HWUI allowing RS to generate more accu...Derek Sollenberger2014-05-214-14/+32
* | | | | | Merge "Inspect SkShader to determine hw shader."Chris Craik2014-05-2317-709/+488
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Inspect SkShader to determine hw shader.Leon Scroggins III2014-05-2217-709/+488
* | | | | | Merge "Define light position (using new lighting spec) in Java"Chris Craik2014-05-2217-54/+58
|\ \ \ \ \ \
| * | | | | | Define light position (using new lighting spec) in JavaChris Craik2014-05-2117-54/+58
| | |/ / / / | |/| | | |
* | | | | | Disable shadow drawing for empty/null outlinesChris Craik2014-05-213-26/+17
|/ / / / /
* | | | | Merge "Correct viewport initialization, bounds comparison"Chris Craik2014-05-192-2/+4
|\ \ \ \ \
| * | | | | Correct viewport initialization, bounds comparisonChris Craik2014-05-152-2/+4
| |/ / / /
* | | | | am 3c769ec0: am 00fabcbe: am b1708e9b: Merge "Use alpha channel instead of re...Chris Craik2014-05-192-1/+21
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | am 00fabcbe: am b1708e9b: Merge "Use alpha channel instead of red in drawCach...Chris Craik2014-05-192-1/+21
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | am b1708e9b: Merge "Use alpha channel instead of red in drawCachedGlyphBitmap"Chris Craik2014-05-192-1/+21
| | |\ \ \ | | | | |/ | | | |/|
| | | * | Use alpha channel instead of red in drawCachedGlyphBitmapDigish Pandya2014-05-152-1/+21
| * | | | am 2c125876: am 8a196c06: Merge "Change InputMessage.motion.pointerSize to a ...Narayan Kamath2014-05-161-2/+2
| |\ \ \ \ | | |/ / /