summaryrefslogtreecommitdiffstats
path: root/include
Commit message (Expand)AuthorAgeFilesLines
* Add -round and -notround qualifier to android runtime/aaptAdam Lesinski2015-05-151-0/+19
* Improve keying for theme caches, rebase system theme on config changeAlan Viverette2015-05-061-0/+1
* Add API for obtaining changing configurations bitmask from ThemeAlan Viverette2015-05-051-0/+7
* am 7b09e7a9: am 44d7989a: am 571c5a26: Merge "Fix UB in ResourceTable::string...Dan Albert2015-04-151-1/+4
|\
| * Merge "Fix UB in ResourceTable::stringToInt."Dan Albert2015-04-141-1/+4
| |\
| | * Fix UB in ResourceTable::stringToInt.Dan Albert2015-04-081-1/+4
* | | am e24d36b7: am 1f799a6b: am d9f32b16: Merge "Ensure alignment of Res_png_9pa...Dan Albert2015-04-091-1/+1
|\ \ \ | |/ /
| * | Ensure alignment of Res_png_9patch.Dan Albert2015-04-091-1/+1
| |/
* | Merge "AAPT2"Adam Lesinski2015-04-031-1/+5
|\ \
| * | AAPT2Adam Lesinski2015-04-021-1/+5
* | | ImageFormat: add PRIVATE formatZhijun He2015-03-301-0/+1
* | | Add payload-size preflight stage to full transport backupChristopher Tate2015-03-261-1/+4
|/ /
* | Output modified bcp47 tag in ResTable_config::toString()Adam Lesinski2015-03-161-0/+6
* | Add DEPTH image formats, support in ImageReaderEino-Ville Talvala2015-03-091-0/+42
* | am 3523e4fc: am efe085ff: Merge "Handle bad ninepatch data." into lmp-mr1-devLeon Scroggins III2015-01-271-3/+3
|\ \ | |/
| * am 3523e4fc: am efe085ff: Merge "Handle bad ninepatch data." into lmp-mr1-devLeon Scroggins III2015-01-271-3/+3
| |\
| | * Handle bad ninepatch data.Leon Scroggins III2015-01-271-3/+3
* | | am d9bd0886: am aee7225e: Merge "Process base APK" into lmp-mr1-dev automerge...Adam Lesinski2015-01-201-1/+1
|\ \ \ | |/ /
| * | am aee7225e: Merge "Process base APK" into lmp-mr1-devAdam Lesinski2015-01-201-1/+1
| |\ \ | | |/
| | * Process base APKAdam Lesinski2015-01-161-1/+1
* | | Move CanvasJohn Reck2015-01-201-161/+0
* | | am 49138184: am 9568307c: am 43a4a8c7: Fix redundant file backupsChristopher Tate2015-01-151-1/+1
|\ \ \ | |/ /
| * | am 9568307c: am 43a4a8c7: Fix redundant file backupsChristopher Tate2015-01-151-1/+1
| |\ \ | | |/
| | * Fix redundant file backupsChristopher Tate2015-01-141-1/+1
* | | Make DisplayListRenderer inherit from Canvas, merge JNITom Hudson2015-01-051-3/+11
* | | Make SkiaCanvas creation call ref() on SkCanvas.Leon Scroggins III2014-12-171-0/+10
|/ /
* | am 740acf21: am c7801877: Merge "Fix issue where non-resource attributes woul...Adam Lesinski2014-12-111-3/+8
|\ \ | |/
| * Fix issue where non-resource attributes would cause obtainStyleAttributes to ...Adam Lesinski2014-12-101-3/+8
* | Merge commit '0953ab27' into manualmergeAdam Lesinski2014-12-051-0/+3
|\ \ | |/
| * AAPT: Move private attrs to new type for frameworkAdam Lesinski2014-12-031-0/+3
* | am 503071ae: am a2b5067a: Merge "RRO: prevent duplicate system overlays"Adam Lesinski2014-12-041-0/+2
|\ \
| * \ Merge "RRO: prevent duplicate system overlays"Adam Lesinski2014-12-031-0/+2
| |\ \
| | * | RRO: prevent duplicate system overlaysMÃ¥rten Kongstad2014-11-071-0/+2
* | | | Merge commit '06d8b7b8' into manualmergeAdam Lesinski2014-11-171-0/+201
|\ \ \ \ | | |_|/ | |/| |
| * | | Implement back-tracking when searching for attributes in XML or resource bagAdam Lesinski2014-11-041-0/+201
* | | | am f89a2fda: Merge "Frameworks/base: Fix two warnings in cmds"Andreas Gampe2014-11-081-3/+1
|\ \ \ \ | | |/ / | |/| |
| * | | Frameworks/base: Fix two warnings in cmdsAndreas Gampe2014-11-081-3/+1
* | | | resolved conflicts for merge of 487ae9b8 to lmp-mr1-dev-plus-aospAndreas Gampe2014-11-071-2/+2
|\ \ \ \ | |/ / / | | / / | |/ / |/| |
| * | Frameworks/base: Wall Werror in libs/androidfwAndreas Gampe2014-11-071-2/+2
| |/
| * am 8bdb265f: am 19f9d54f: Merge "Fix backwards compat problem with AAPT publi...Adam Lesinski2014-09-191-0/+2
| |\
| * \ am d3d6ecdb: am 52e5e359: Merge "USB string descriptors are not UTF8, so it i...Mike Lockwood2014-09-191-0/+3
| |\ \
| * \ \ am a38e59b1: am 683872af: Merge "Clean entire arg block when setting process ...Jeff Brown2014-09-121-3/+1
| |\ \ \
| * \ \ \ resolved conflicts for merge of 6c585756 to lmp-dev-plus-aospDan Albert2014-09-081-10/+10
| |\ \ \ \
| | * \ \ \ Merge "Use char16_t for char things."Dan Albert2014-09-091-10/+10
| | |\ \ \ \
| | | * | | | Use char16_t for char things.Dan Albert2014-09-081-10/+10
| | * | | | | Disable compilation based on vold.decrypt. [frameworks/base]Brian Carlstrom2014-07-311-0/+1
| | * | | | | Move from dalvik.vm.image-dex2oat-flags to dalvik.vm.dex2oat-filter [framewor...Brian Carlstrom2014-07-311-0/+4
* | | | | | | Merge "Fix issues that will be present in C++11" into lmp-mr1-devAdam Lesinski2014-11-031-12/+23
|\ \ \ \ \ \ \
| * | | | | | | Fix issues that will be present in C++11Adam Lesinski2014-11-031-12/+23
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Distinguish unspecified and explicit null values in resourcesAlan Viverette2014-10-291-1/+10
|/ / / / / /