summaryrefslogtreecommitdiffstats
path: root/tools/aapt
Commit message (Expand)AuthorAgeFilesLines
* AAPT emits error for res with no 'default' productAdam Lesinski2013-10-041-4/+65
* Add badging of Payment appsAdam Lesinski2013-09-271-11/+142
* Add support for dumping new badgingAdam Lesinski2013-09-271-3/+68
* Added support for supports-input manifest elementMichael Wright2013-09-051-50/+87
* Transition API changes from API council recommendationsChet Haase2013-09-041-26/+1
* am 9516ed45: am cfc23ac6: Merge "Add support for MNC=00"Wink Saville2013-07-301-0/+3
|\
| * Add support for MNC=00Mattias Petersson2013-07-261-0/+3
| * am bd1730de: Merge "Document the \'aapt dump strings\' command"Christopher Tate2013-04-291-0/+1
| |\
* | | Move input library code to frameworks/native.Jeff Brown2013-07-011-6/+5
* | | Switch to shared libpng/libz dependency.Stephen Hines2013-06-261-3/+5
* | | Merge "aapt: move qsort_r_compat here as it is sole client"Dima Zavin2013-05-084-2/+132
|\ \ \
| * | | aapt: move qsort_r_compat here as it is sole clientDima Zavin2013-05-074-2/+132
* | | | libutils clean-upMathias Agopian2013-05-077-3/+296
|/ / /
* | | Merge commit 'b3f66877' into afdmergeJeff Sharkey2013-04-291-0/+1
|\ \ \ | | |/ | |/|
| * | Document the 'aapt dump strings' commandMÃ¥rten Kongstad2013-04-291-0/+1
| * | am ba1992f8: Merge "Remove doSingleCrunch call DO NOT MERGE" into jb-mr1-aah-devJustin Koh2013-01-161-19/+0
| |\ \
| | * | Remove doSingleCrunch call DO NOT MERGEJustin Koh2013-01-161-19/+0
* | | | Merge "Allow compiling aapt for the device"Bjorn Bringert2013-04-294-6/+167
|\ \ \ \
| * | | | Allow compiling aapt for the deviceBjorn Bringert2013-04-264-6/+167
* | | | | am eb6403e9: resolved conflicts for merge of bfdd2566 to jb-mr2-dev-plus-aospJeff Brown2013-04-261-59/+55
|\ \ \ \ \ | |/ / / / |/| | | / | | |_|/ | |/| |
| * | | Generate SDK docs for v7 support library packages.Jeff Brown2013-04-261-59/+55
* | | | First draft of Scenes & Transitions featureChet Haase2013-04-181-0/+51
|/ / /
* | | Revert "Make --non-constant-id generates non final IDs for styleable."Xavier Ducrohet2013-04-131-12/+5
* | | Make --non-constant-id generates non final IDs for styleable.Xavier Ducrohet2013-04-121-5/+12
* | | Add liblogYing Wang2013-04-091-2/+2
* | | aapt: add support for optional uses-permissionNick Kralevich2013-04-031-0/+8
* | | Fix typo.Dianne Hackborn2013-02-251-1/+1
* | | Implement issue #6646859: 4K!!!! 4K!!!! 4K!!!!Dianne Hackborn2013-02-121-0/+5
* | | resolved conflicts for merge of c71c678e to masterXavier Ducrohet2013-01-151-1/+7
|\ \ \ | |/ /
| * | am a4e10cc7: am 6080cc5f: resolved conflicts for merge of dd52dfed to jb-mr1....Xavier Ducrohet2013-01-151-0/+19
| |\ \ | | |/
| | * am 6080cc5f: resolved conflicts for merge of dd52dfed to jb-mr1.1-ub-devXavier Ducrohet2013-01-151-0/+19
| | |\
| | | * resolved conflicts for merge of dd52dfed to jb-mr1.1-ub-devXavier Ducrohet2013-01-151-0/+19
| | | |\
| | | | * Fix the single crunch command to return the right error code.Xavier Ducrohet2013-01-151-1/+5
| | | | * Add single crunch command to aapt. do not merge.Xavier Ducrohet2013-01-024-8/+62
| | | |/
| | * | am 5f958e9b: am 67b38c44: Cache resource ID lookups in aaptChristopher Tate2012-11-294-5/+148
| | |\ \ | | | |/
| | | * Cache resource ID lookups in aaptChristopher Tate2012-11-284-5/+148
| | | * Fix writing text version of styleable IDs. do not merge.Xavier Ducrohet2012-09-261-1/+1
| | |/
* | | Add single crunch command to aapt.Xavier Ducrohet2013-01-024-8/+62
|/ /
* | Cache resource ID lookups in aaptChristopher Tate2012-11-274-5/+148
* | am 253f7635: am fb34490f: Merge "Fix writing text version of styleable IDs."Xavier Ducrohet2012-09-261-1/+1
|\ \ | |/ |/|
| * am fb34490f: Merge "Fix writing text version of styleable IDs."Xavier Ducrohet2012-09-261-1/+1
| |\
| | * Fix writing text version of styleable IDs.Xavier Ducrohet2012-09-261-1/+1
* | | am 79c95c3b: am 5de96035: am 31820a35: Merge "Add --output-text-symbols optio...Xavier Ducrohet2012-09-173-14/+205
|\ \ \ | |/ /
| * | am 31820a35: Merge "Add --output-text-symbols option to aapt."Xavier Ducrohet2012-09-173-14/+205
| |\ \ | | |/
| | * Add --output-text-symbols option to aapt.Xavier Ducrohet2012-09-113-14/+205
* | | am 8a67598e: am cc9747ed: am d7252571: Merge "Add --error-on-failed-insert op...Xavier Ducrohet2012-09-173-19/+60
|\ \ \ | |/ /
| * | am d7252571: Merge "Add --error-on-failed-insert option to aapt."Xavier Ducrohet2012-09-173-19/+60
| |\ \ | | |/
| | * Add --error-on-failed-insert option to aapt.Xavier Ducrohet2012-09-113-19/+60
* | | am 61d09810: am 3150feef: am bfe1ab82: Merge "Fix aapt to get expat header fi...Elliott Hughes2012-09-092-2/+1
|\ \ \ | |/ /
| * | am bfe1ab82: Merge "Fix aapt to get expat header files from the approved loca...Elliott Hughes2012-09-092-2/+1
| |\ \ | | |/