summaryrefslogtreecommitdiffstats
path: root/graphics/java
Commit message (Expand)AuthorAgeFilesLines
* 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 abf701e6: Merge "Eliminate mHasAlpha" into klp-devJohn Reck2014-03-211-15/+3
| |\ \
| | * | Eliminate mHasAlphaJohn Reck2014-03-211-15/+3
| * | | 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 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 87e9e744: am 92a32832: DO NOT MERGE - Fix Javadoc build break.Leon Scroggins III2014-03-071-1/+1
|\ \ \ \ | |/ / /
| * | | 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
* | | | 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 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-03-071-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-03-0761-21999/+0
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Move RenderScript from graphics/ to new fw/base subdirectory rs.Tim Murray2014-01-3161-21999/+0
* | | | | | am 8df3ea66: am b4cf2a2a: Merge "Convert Java/JNI to 64-bit, part 2."Tim Murray2014-03-0729-289/+297
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Convert Java/JNI to 64-bit, part 2.Tim Murray2014-01-3129-289/+297
* | | | | | am 72d637e2: am e22e268e: Merge changes If93a5d78,I1957f7acTim Murray2014-03-072-130/+133
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Convert Java/JNI to 64-bit, part 1.Tim Murray2014-01-311-115/+115
| * | | | | Add long/double read support.Jason Sams2014-01-312-18/+21
* | | | | | am bccee732: am 61eb6b55: Merge "Use Object + type in place of specific array"Tim Murray2014-03-072-67/+25
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Use Object + type in place of specific arrayJason Sams2014-01-312-67/+25
* | | | | | am 69914882: am e559d7ee: Merge "Utility API for creating types."Tim Murray2014-03-071-0/+75
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Utility API for creating types.Jason Sams2014-01-311-0/+75
* | | | | | am 271c3b74: am b1c1518e: Merge "Remove old hidden API."Tim Murray2014-03-071-8/+0
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Remove old hidden API.Jason Sams2014-01-311-8/+0
* | | | | | am 9bad32c3: am aea3b581: Merge "Remove hidden API setSurfaceTexture."Tim Murray2014-03-071-13/+5
|\ \ \ \ \ \ | |/ / / / / | | | / / / | |_|/ / / |/| | | |
| * | | | Remove hidden API setSurfaceTexture.Jason Sams2014-01-311-13/+5
| |/ / /
* | | | am 7be33110: am d4ccffd3: Merge "AArch64: Use long for pointers in graphics/I...Narayan Kamath2014-01-291-7/+7
|\ \ \ \ | |/ / /
| * | | Merge "AArch64: Use long for pointers in graphics/Interpolator"Narayan Kamath2014-01-291-7/+7
| |\ \ \
| | * | | AArch64: Use long for pointers in graphics/InterpolatorAshok Bhat2014-01-161-7/+7
* | | | | am 74db9ddb: am 887b1ca8: Merge "AArch64: Use long for pointers in SurfaceTex...Narayan Kamath2014-01-291-3/+3
|\ \ \ \ \ | |/ / / /
| * | | | Merge "AArch64: Use long for pointers in SurfaceTexture"Narayan Kamath2014-01-291-3/+3
| |\ \ \ \
| | * | | | AArch64: Use long for pointers in SurfaceTextureAshok Bhat2014-01-161-3/+3
| | |/ / /
* | | | | am 23abbfbb: am 154614ab: Merge "AArch64: Use long for pointers in graphics/C...Narayan Kamath2014-01-281-5/+5
|\ \ \ \ \ | |/ / / /
| * | | | AArch64: Use long for pointers in graphics/CameraAshok Bhat2014-01-281-5/+5
* | | | | am aa9ba887: am 6e09eb4c: Merge "AArch64: Make graphics classes 64-bit compat...Narayan Kamath2014-01-2841-395/+423
|\ \ \ \ \ | |/ / / /
| * | | | AArch64: Make graphics classes 64-bit compatibleAshok Bhat2014-01-2841-395/+423
| |/ / /
* | | | am caea42fd: am 98002dfb: Merge "AArch64: Use long for pointers in graphics/P...Narayan Kamath2014-01-161-10/+10
|\ \ \ \ | |/ / /
| * | | Merge "AArch64: Use long for pointers in graphics/PathMeasure"Narayan Kamath2014-01-161-10/+10
| |\ \ \
| | * | | AArch64: Use long for pointers in graphics/PathMeasureAshok Bhat2014-01-131-10/+10
* | | | | am 8796ab7f: am bb35356d: Merge changes Id54087dd,I946325e4,I2a2b2e68Narayan Kamath2014-01-162-13/+13
|\ \ \ \ \ | |/ / / /