summaryrefslogtreecommitdiffstats
path: root/graphics
Commit message (Expand)AuthorAgeFilesLines
* am d05c7d26: am bcf76242: Merge "Move FLATTENED_PATTERN to inner class."Ian Rogers2014-05-141-2/+14
|\
| * am bcf76242: Merge "Move FLATTENED_PATTERN to inner class."Ian Rogers2014-05-141-2/+14
| |\
| | * Move FLATTENED_PATTERN to inner class.Ian Rogers2014-05-141-2/+14
| * | am fc603ca6: am abf701e6: Merge "Eliminate mHasAlpha" into klp-devJohn Reck2014-03-211-15/+3
| |\ \
| * \ \ am 87e9e744: am 92a32832: DO NOT MERGE - Fix Javadoc build break.Leon Scroggins III2014-03-071-1/+1
| |\ \ \
| * \ \ \ Merge "resolved conflicts for merge of 8d3281f5 to klp-dev-plus-aosp" into kl...Leon Scroggins III2014-03-072-12/+45
| |\ \ \ \
| | * \ \ \ resolved conflicts for merge of 8d3281f5 to klp-dev-plus-aospLeon Scroggins III2014-03-062-12/+45
| | |\ \ \ \
| * | \ \ \ \ am b90fc64b: am f44a3f1e: Merge "Use long for pointers in EmojiFactory and Pd...Narayan Kamath2014-03-071-7/+7
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| * | | | | | am 16e9362e: am 8fced317: Merge "Move RenderScript from graphics/ to new fw/b...Tim Murray2014-03-0763-23697/+0
| |\ \ \ \ \ \
| * \ \ \ \ \ \ am 8df3ea66: am b4cf2a2a: Merge "Convert Java/JNI to 64-bit, part 2."Tim Murray2014-03-0730-484/+490
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ am 72d637e2: am e22e268e: Merge changes If93a5d78,I1957f7acTim Murray2014-03-074-485/+480
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ am bccee732: am 61eb6b55: Merge "Use Object + type in place of specific array"Tim Murray2014-03-073-195/+97
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ am 69914882: am e559d7ee: Merge "Utility API for creating types."Tim Murray2014-03-071-0/+75
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ am 271c3b74: am b1c1518e: Merge "Remove old hidden API."Tim Murray2014-03-071-8/+0
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ am 9bad32c3: am aea3b581: Merge "Remove hidden API setSurfaceTexture."Tim Murray2014-03-071-13/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | am 38f407cb: Merge "RenderScript bicubic resize intrinsic [DO NOT MERGE]" int...Jason Sams2014-04-161-0/+112
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | RenderScript bicubic resize intrinsic [DO NOT MERGE]Jason Sams2014-04-161-0/+112
* | | | | | | | | | | | | | am ecaea7e6: Merge "Force refresh of stateful when a child drawable is change...Craig Stout2014-03-311-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | Force refresh of stateful when a child drawable is changed.Craig Stout2014-03-271-0/+1
* | | | | | | | | | | | | | am aff40e25: am fc603ca6: am abf701e6: Merge "Eliminate mHasAlpha" into klp-devJohn Reck2014-03-211-15/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | am fc603ca6: am abf701e6: Merge "Eliminate mHasAlpha" into klp-devJohn Reck2014-03-211-15/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | |
| | * | | | | | | | | | | | am abf701e6: Merge "Eliminate mHasAlpha" into klp-devJohn Reck2014-03-211-15/+3
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | Eliminate mHasAlphaJohn Reck2014-03-211-15/+3
* | | | | | | | | | | | | | | am 889a1ddd: Fix JavaDocBen Murdoch2014-03-171-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / /
| * | | | | | | | | | | | | | Fix JavaDocBen Murdoch2014-03-171-1/+1
* | | | | | | | | | | | | | | am 01252217: Merge "Fix javadoc." into klp-modular-devTorne (Richard Coles)2014-03-171-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / /
| * | | | | | | | | | | | | | Fix javadoc.Torne (Richard Coles)2014-03-171-1/+1
* | | | | | | | | | | | | | | am f8d8777d: Update framework to use M33 Skia. DO NOT MERGELeon Scroggins III2014-03-172-12/+45
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / /
| * | | | | | | | | | | | | | Update framework to use M33 Skia. DO NOT MERGELeon Scroggins III2014-03-172-12/+45
| * | | | | | | | | | | | | | Force merge of remaining KLP changes to fix build.Jason Sams2014-03-131-3/+19
| * | | | | | | | | | | | | | Fix build issues from bad mergeJason Sams2014-03-131-7/+8
| * | | | | | | | | | | | | | resolved conflicts for merge of 780d57b8 to klp-modular-devJason Sams2014-03-132-4/+15
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / /
| | * | | | | | | | | | | | | am cf8573c1: Fix destruction issues relating to AllocationAdapter.Jason Sams2014-03-112-2/+2
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / /
| | | * | | | | | | | | | | | Fix destruction issues relating to AllocationAdapter.Jason Sams2014-03-102-2/+2
| * | | | | | | | | | | | | | am e14d5e90: am 5757bf89: Add hidden minor version ID for support lib workaro...Jason Sams2014-03-131-0/+14
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | | | | / / / / / / / / / / / | | |_|/ / / / / / / / / / / | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | am 5757bf89: Add hidden minor version ID for support lib workarounds.Jason Sams2014-03-111-0/+14
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / /
| | | * | | | | | | | | | | Add hidden minor version ID for support lib workarounds.Jason Sams2014-03-101-0/+14
| | * | | | | | | | | | | | am ff7256e7: Fix destruction issues relating to AllocationAdapter.Jason Sams2014-03-112-13/+41
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / | | | | | | | | | | | | | / | | | |_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | |
| | | * | | | | | | | | | Fix destruction issues relating to AllocationAdapter.Jason Sams2014-03-102-13/+41
| | * | | | | | | | | | | am 92a32832: DO NOT MERGE - Fix Javadoc build break.Leon Scroggins III2014-03-061-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / | | | | | | | | | | | | / | | | |_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | |
| | | * | | | | | | | | DO NOT MERGE - Fix Javadoc build break.Leon Scroggins III2014-03-061-1/+1
| | * | | | | | | | | | am ee008d42: Merge "Update framework to use M33 Skia. DO NOT MERGE" into klp-devLeon Scroggins III2014-03-062-12/+45
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / /
| | | * | | | | | | | | Update framework to use M33 Skia. DO NOT MERGELeon Scroggins III2014-03-062-12/+45
* | | | | | | | | | | | am b90fc64b: am f44a3f1e: Merge "Use long for pointers in EmojiFactory and Pd...Narayan Kamath2014-02-111-7/+7
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | |
| * | | | | | | | | | | Merge "Use long for pointers in EmojiFactory and PdfDocument"Narayan Kamath2014-02-111-7/+7
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | |
| | * | | | | | | | | | Use long for pointers in EmojiFactory and PdfDocumentAshok Bhat2014-01-311-7/+7
* | | | | | | | | | | | am 16e9362e: am 8fced317: Merge "Move RenderScript from graphics/ to new fw/b...Tim Murray2014-02-0363-23697/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | Move RenderScript from graphics/ to new fw/base subdirectory rs.Tim Murray2014-01-3163-23697/+0
* | | | | | | | | | | | am 8df3ea66: am b4cf2a2a: Merge "Convert Java/JNI to 64-bit, part 2."Tim Murray2014-02-0330-484/+490
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | |
| * | | | | | | | | | | am b4cf2a2a: Merge "Convert Java/JNI to 64-bit, part 2."Tim Murray2014-02-0330-484/+490
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | | | | | | | | | | | / | | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | |