summaryrefslogtreecommitdiffstats
path: root/core/jni/android
Commit message (Expand)AuthorAgeFilesLines
* am ebd616e8: am 134631b9: am 90242fe5: Merge "Switch to the new Skia PDF gene...Svetoslav2013-11-071-34/+110
|\
| * am 134631b9: am 90242fe5: Merge "Switch to the new Skia PDF generation APIs."...Svetoslav2013-11-071-34/+110
| |\
| | * Switch to the new Skia PDF generation APIs.Svetoslav2013-11-071-34/+110
* | | am dd3776d6: am 30a3ef6c: am c89eaf91: Merge "Fix for Typeface.create(Typefac...Victoria Lease2013-11-061-2/+14
|\ \ \ | |/ /
| * | am 30a3ef6c: am c89eaf91: Merge "Fix for Typeface.create(Typeface, style) sem...Victoria Lease2013-11-061-2/+14
| |\ \ | | |/
| | * Fix for Typeface.create(Typeface, style) semantics changed in KKRaph Levien2013-11-061-2/+14
* | | am ed82a648: am 54b7e3e8: am a80d6424: Merge "Implement language-specific GSU...Victoria Lease2013-10-211-1/+2
|\ \ \ | |/ /
| * | am 54b7e3e8: am a80d6424: Merge "Implement language-specific GSUB processing"...Victoria Lease2013-10-211-1/+2
| |\ \ | | |/
| | * Implement language-specific GSUB processingRaph Levien2013-10-081-1/+2
* | | am 9f13a608: am 2ec939ba: am cf4c7bdd: Merge "Fix whitespace issues after cas...Elliott Hughes2013-10-181-3/+3
|\ \ \ | |/ /
| * | am 2ec939ba: am cf4c7bdd: Merge "Fix whitespace issues after casts."Elliott Hughes2013-10-181-3/+3
| |\ \
| | * | Fix whitespace issues after casts.Mathieu Chartier2013-10-181-3/+3
| * | | am 4a5b3f0a: am ac6e036a: Merge "Remove dependency on jniGetNonMovableArrayEl...Elliott Hughes2013-10-181-6/+21
| |\ \ \ | | |/ / | | | / | | |/ | |/|
| | * Remove dependency on jniGetNonMovableArrayElements.Mathieu Chartier2013-10-181-6/+21
| | * Forward compatibility fixChris Craik2013-08-271-0/+6
* | | Remove dependency on jniGetNonMovableArrayElements.Mathieu Chartier2013-10-181-6/+21
* | | am 25c4e987: am 97b707d5: am 80a058b3: Merge "Do not attempt to decode NULL ...Leon Scroggins III2013-10-081-0/+3
|\ \ \ | |/ /
| * | Merge "Do not attempt to decode NULL SkData." into klp-devLeon Scroggins III2013-10-081-0/+3
| |\ \
| | * | Do not attempt to decode NULL SkData.Leon Scroggins III2013-10-071-0/+3
* | | | am e8200873: am 0d5a719d: am b088c9e0: Merge "reset mShapingPaint\'s SkTypefa...Victoria Lease2013-10-041-0/+1
|\ \ \ \ | |/ / /
| * | | reset mShapingPaint's SkTypeface before we use itVictoria Lease2013-10-041-0/+1
| |/ /
* | | am fad41c8f: am 5db1f5aa: Merge "Fix Java API error where requesting another ...Derek Sollenberger2013-09-241-1/+7
|\ \ \ | |/ /
| * | Fix Java API error where requesting another style for a provided family failsDerek Sollenberger2013-09-231-1/+7
* | | am c0e1ae01: am facc08c7: Merge "Move PdfDocument to android.graphics.pdf" in...Svetoslav2013-09-201-15/+12
|\ \ \ | |/ /
| * | Merge "Move PdfDocument to android.graphics.pdf" into klp-devSvetoslav2013-09-201-15/+12
| |\ \
| | * | Move PdfDocument to android.graphics.pdfSvetoslav2013-09-191-15/+12
* | | | am 2360ada9: am 57989c0e: Merge "Skip writing zeroes to java allocated memory...Leon Scroggins III2013-09-201-1/+9
|\ \ \ \ | |/ / /
| * | | Merge "Skip writing zeroes to java allocated memory." into klp-devLeon Scroggins III2013-09-191-1/+9
| |\ \ \
| | * | | Skip writing zeroes to java allocated memory.Leon Scroggins III2013-09-191-1/+9
| | |/ /
* | | | am 23b7bc1b: am a2c6209f: Merge "Update SkTypeface::CreateFromName to handle ...Derek Sollenberger2013-09-201-5/+7
|\ \ \ \ | |/ / /
| * | | Update SkTypeface::CreateFromName to handle NULL if familyName does not matchDerek Sollenberger2013-09-191-5/+7
| |/ /
* | | am 2e4e9889: am 3490228e: Merge "Use a native buffer for decoding images." in...Leon Scroggins III2013-09-184-215/+36
|\ \ \ | |/ /
| * | Use a native buffer for decoding images.Leon Scroggins III2013-09-184-215/+36
* | | am 3b8a7a04: am b693ef60: Merge "Do not allocate so much memory on the stack....Leon Scroggins III2013-09-161-11/+20
|\ \ \ | |/ /
| * | Do not allocate so much memory on the stack.Leon Scroggins III2013-09-121-11/+20
* | | am 47869404: am 2cad64c0: Merge "Surface: Change OutOfResourcesException to b...Igor Murashkin2013-09-111-1/+1
|\ \ \ | |/ /
| * | Merge "Surface: Change OutOfResourcesException to be a runtime exception" int...Igor Murashkin2013-09-111-1/+1
| |\ \
| | * | Surface: Change OutOfResourcesException to be a runtime exceptionIgor Murashkin2013-09-091-1/+1
* | | | am a180fd6d: am 68fbe16b: Merge "Avoid ref-ing AndroidPixelRefs that wrap oth...Chris Craik2013-09-111-2/+10
|\ \ \ \ | |/ / /
| * | | Merge "Avoid ref-ing AndroidPixelRefs that wrap others in globalRef/Unref" in...Chris Craik2013-09-111-2/+10
| |\ \ \ | | |/ / | |/| |
| | * | Avoid ref-ing AndroidPixelRefs that wrap others in globalRef/UnrefChris Craik2013-09-101-2/+10
* | | | am 47e6c4be: am 932e59fc: Merge "Create a pixelref wrapper for reused bitmaps...Chris Craik2013-09-093-7/+55
|\ \ \ \ | |/ / /
| * | | Merge "Create a pixelref wrapper for reused bitmaps" into klp-devChris Craik2013-09-093-7/+55
| |\ \ \ | | |/ /
| | * | Create a pixelref wrapper for reused bitmapsChris Craik2013-09-093-7/+55
* | | | am a818f0fa: am 91c8111d: Merge "Register jni objs in CreateJavaOutputStreamA...Leon Scroggins III2013-09-091-66/+59
|\ \ \ \ | |/ / /
| * | | Register jni objs in CreateJavaOutputStreamAdaptorLeon Scroggins III2013-09-061-66/+59
| |/ /
* | | am 22f36b1a: am 4c92f7ce: Merge "Revert workaround for Skia bug now that Skia...Derek Sollenberger2013-09-041-2/+0
|\ \ \ | |/ /
| * | Revert workaround for Skia bug now that Skia has been fixed.Derek Sollenberger2013-09-041-2/+0
* | | am 050129b4: am 3f8da091: Merge "Change name back to CreateJavaInputStreamAda...Leon Scroggins III2013-09-034-20/+19
|\ \ \ | |/ /
| * | Change name back to CreateJavaInputStreamAdaptor.Leon Scroggins III2013-09-034-20/+19