summaryrefslogtreecommitdiffstats
path: root/core/jni
Commit message (Expand)AuthorAgeFilesLines
* Merge "resolved conflicts for merge of 7545accf to master"Elliott Hughes2015-03-102-6/+8
|\
| * resolved conflicts for merge of 7545accf to masterElliott Hughes2015-03-102-6/+8
| |\
| | * am 63d43949: Merge "Use the icu:: namespace for icu4c API."Elliott Hughes2015-03-092-5/+7
| | |\
| | | * Use the icu:: namespace for icu4c API.Elliott Hughes2015-03-072-5/+7
* | | | Merge "Rename and simplify DisplayList Canvas classes"Chris Craik2015-03-103-54/+54
|\ \ \ \ | |/ / / |/| | |
| * | | Rename and simplify DisplayList Canvas classesChris Craik2015-03-093-54/+54
* | | | Add DEPTH image formats, support in ImageReaderEino-Ville Talvala2015-03-091-0/+94
|/ / /
* | | am ea3d53f5: am 773bcfa7: am e59b7ce2: Merge "Add JIT system properties"Mathieu Chartier2015-03-081-0/+10
|\ \ \ | |/ /
| * | am e59b7ce2: Merge "Add JIT system properties"Mathieu Chartier2015-03-061-0/+10
| |\ \ | | |/
| | * Add JIT system propertiesMathieu Chartier2015-03-051-0/+10
* | | Merge "Revert "Revert "Remove references to SkPorterDuff as it is deprecated."""Chris Craik2015-03-064-16/+33
|\ \ \
| * | | Revert "Revert "Remove references to SkPorterDuff as it is deprecated.""Chris Craik2015-03-064-16/+33
* | | | Merge "Revert "Remove references to SkPorterDuff as it is deprecated.""Chris Craik2015-03-064-33/+16
|\ \ \ \ | |/ / /
| * | | Revert "Remove references to SkPorterDuff as it is deprecated."Chris Craik2015-03-064-33/+16
* | | | Cleanup Bitmap JNI attempt #2John Reck2015-03-058-39/+16
* | | | emove uncessary include for SkPorterDuff.h (Part 2)Derek Sollenberger2015-03-051-1/+0
* | | | Merge "Add JNI StaticLayout.Builder"Raph Levien2015-03-051-51/+91
|\ \ \ \
| * | | | Add JNI StaticLayout.BuilderRaph Levien2015-03-051-51/+91
* | | | | Merge "Revert "Cleanup Bitmap JNI""Chad Jones2015-03-058-16/+39
|\ \ \ \ \
| * | | | | Revert "Cleanup Bitmap JNI"Chad Jones2015-03-058-16/+39
* | | | | | Merge "Cleanup Bitmap JNI"John Reck2015-03-058-39/+16
|\ \ \ \ \ \ | |/ / / / / | | | / / / | |_|/ / / |/| | | |
| * | | | Cleanup Bitmap JNIJohn Reck2015-03-058-39/+16
* | | | | Remove references to SkPorterDuff as it is deprecated.Derek Sollenberger2015-03-054-16/+33
|/ / / /
* | | | Add missing paramater to AudioPort jni initialization.David Stevens2015-03-021-0/+1
|/ / /
* | | Add fingerprint settings support to the frameworkJim Miller2015-02-271-30/+29
* | | am bbef7cf3: am 012c3b72: am a891d08d: Merge "jni: Add paranoia regarding and...Mark Salyzyn2015-02-271-0/+4
|\ \ \ | |/ /
| * | am a891d08d: Merge "jni: Add paranoia regarding android_logger_list_read"Mark Salyzyn2015-02-271-0/+4
| |\ \ | | |/
| | * jni: Add paranoia regarding android_logger_list_readMark Salyzyn2015-02-261-0/+4
* | | don't reference (deprecated) kIgnore_SkAlphaTypeMike Reed2015-02-272-3/+6
* | | Merge "camera2: Fix local variable names in rgb->ycbcr conversion."Ruben Brunk2015-02-261-9/+9
|\ \ \
| * | | camera2: Fix local variable names in rgb->ycbcr conversion.Ruben Brunk2015-02-101-9/+9
* | | | Merge "Glop mesh reorg, support for drawBitmapMesh"Chris Craik2015-02-261-6/+0
|\ \ \ \
| * | | | Glop mesh reorg, support for drawBitmapMeshChris Craik2015-02-261-6/+0
* | | | | am 72e7217d: am b7121d70: am b78cce6f: Merge "Update autogenerated gl functio...Dan Albert2015-02-253-4/+9
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | am b78cce6f: Merge "Update autogenerated gl functions."Dan Albert2015-02-253-4/+9
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Merge "Update autogenerated gl functions."Dan Albert2015-02-253-4/+9
| | |\ \ \
| | | * | | Update autogenerated gl functions.Dan Albert2015-02-233-4/+9
* | | | | | am f7b68049: am 533758c1: am 0d8b97a4: Merge "jni: switch to ANDROID_LOG_* mo...Mark Salyzyn2015-02-251-1/+1
|\ \ \ \ \ \ | |/ / / / / | | | | / / | |_|_|/ / |/| | | |
| * | | | am 0d8b97a4: Merge "jni: switch to ANDROID_LOG_* mode flags"Mark Salyzyn2015-02-251-1/+1
| |\ \ \ \ | | |/ / /
| | * | | jni: switch to ANDROID_LOG_* mode flagsMark Salyzyn2015-02-251-1/+1
| | |/ /
* | | | Merge "Glop layer mesh rendering"Chris Craik2015-02-201-1/+1
|\ \ \ \
| * | | | Glop layer mesh renderingChris Craik2015-02-191-1/+1
* | | | | Initial attempt at jank-tracking stat collectionJohn Reck2015-02-202-12/+20
|/ / / /
* | | | Fingerprint: Adjust to HAL2 spec.Sasha Levitskiy2015-02-131-7/+10
* | | | Merge "Intern strings used in Sensor information."destradaa2015-02-121-9/+53
|\ \ \ \
| * | | | Intern strings used in Sensor information.destradaa2015-02-101-9/+53
| | |_|/ | |/| |
* | | | am f5d30463: am 4fa3a80b: am a5f301c7: Merge "Legacy: Only set user surface d...Eino-Ville Talvala2015-02-121-9/+3
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | am f5d30463: am 4fa3a80b: am a5f301c7: Merge "Legacy: Only set user surface d...Eino-Ville Talvala2015-02-121-9/+3
| |\ \
| | * | Legacy: Only set user surface dimensions on output surfacesEino-Ville Talvala2015-02-111-9/+3
| | * | Check that bitmap's size does not exceed 32 bits. DO NOT MERGELeon Scroggins III2015-02-101-1/+6