summaryrefslogtreecommitdiffstats
path: root/include/androidfw
Commit message (Expand)AuthorAgeFilesLines
* 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 aee7225e: Merge "Process base APK" into lmp-mr1-devAdam Lesinski2015-01-201-1/+1
|\ \ | |/
| * Process base APKAdam Lesinski2015-01-161-1/+1
* | am 9568307c: am 43a4a8c7: Fix redundant file backupsChristopher Tate2015-01-151-1/+1
|\ \ | |/
| * Fix redundant file backupsChristopher Tate2015-01-141-1/+1
* | 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
| |\
| * \ resolved conflicts for merge of 6c585756 to lmp-dev-plus-aospDan Albert2014-09-081-10/+10
| |\ \
| | * | Use char16_t for char things.Dan Albert2014-09-081-10/+10
* | | | 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
|/ / /
* | | Fix backwards compat problem with AAPT public attrsAdam Lesinski2014-09-181-0/+2
|/ /
* | Stamp platform version code into app ApksAdam Lesinski2014-08-271-1/+1
* | Introduce anydpi density resource qualifierAdam Lesinski2014-08-251-0/+1
* | AAPT: Fix regression generating dynamic ref table for shared librariesAdam Lesinski2014-08-201-0/+3
* | AAPT support for feature splitsAdam Lesinski2014-08-041-0/+2
* | Allow for appending of resources to an AssetManager.Martin Kosiba2014-07-171-0/+1
* | Support multiple resource tables with same packageAdam Lesinski2014-06-183-13/+222
* | am 642421aa: am 5c31e487: Merge "Introduce new UI_MODE_TYPE_WATCH and qualifi...John Spurlock2014-04-041-0/+1
|\ \
| * \ am 5c31e487: Merge "Introduce new UI_MODE_TYPE_WATCH and qualifier." into klp...John Spurlock2014-04-041-0/+1
| |\ \ | | |/ | |/|
| | * Introduce new UI_MODE_TYPE_WATCH and qualifier.John Spurlock2014-04-041-0/+1
* | | Shared library resource supportAdam Lesinski2014-03-252-5/+83
* | | resolved conflicts for merge of 92860a74 to masterNarayan Kamath2014-03-101-25/+44
|\ \ \ | |/ /
| * | LP64: Make 9 patches architecture agnostic.Narayan Kamath2014-03-101-25/+44
| * | Extended locales in AAPT / AssetManager.Narayan Kamath2014-02-141-14/+27
| * | AssetManager support for 3 letter lang/country codes.Narayan Kamath2014-02-141-4/+84
| * | Fix build.Dianne Hackborn2014-02-121-2/+2
| * | Use size_t* in AssetManager::createIdmapColin Cross2014-02-111-1/+1
* | | resolved conflicts for merge of 1cbea39f to masterNick Kralevich2014-02-122-29/+21
|\ \ \
| * \ \ resolved conflicts for merge of dd3d95f1 to klp-volantis-devNick Kralevich2014-02-122-29/+21
| |\ \ \ | | |/ /
| | * | Runtime resource overlay, iteration 2Mårten Kongstad2014-02-032-29/+21
| * | | Fix build.Dianne Hackborn2014-02-112-3/+3
| |/ /
* | | Fix build.Dianne Hackborn2014-02-112-3/+3
* | | am be49403a: am 0cd115e1: am 578087e3: Merge "New command line tool \'idmap\'"Dianne Hackborn2014-02-112-2/+31
|\ \ \ | |/ /
| * | New command line tool 'idmap'Mårten Kongstad2014-02-032-2/+31
| * | Change ResourceType cookies to int32_t.Narayan Kamath2014-01-311-7/+6
| |/
generated by cgit v1.1 at 2025-01-07 05:55:25 +0000