summaryrefslogtreecommitdiffstats
path: root/tools/aapt/XMLNode.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Normalize output from aapt d xmltree"Jean-Baptiste Queru2012-08-081-1/+2
|\
| * Normalize output from aapt d xmltreeShachar Shemesh2012-07-081-1/+2
| | | | | | | | | | | | | | | | | | | | When using aapt dump xmltree to dump an XML which has a content element with newlines, the output contains a newline. This makes it very difficult, sometimes impossible, to understand what is part of the content, and what is the meta-data. We now pass XML content through the same normalizer used for other tags. Change-Id: I327321520fac563eb32aecaf796f2473866697fc
| * Move the automatic namespace outside of the res namespace. do not merge.Xavier Ducrohet2012-02-231-1/+1
| | | | | | | | | | | | (cherry picked from commit d9fe8018ffbf94f18a840005e688ad1d712f0225) Change-Id: I48ca78d5fccc75392b3f1cf9525890e5145293c4
| * Fix for issue 9656 - custom xml attributes in Android Libraries. do not merge.inazaruk2012-02-231-3/+9
| | | | | | | | | | | | | | | | | | | | | | | | Added support for predefined namespace http://schemas.android.com/apk/res/auto that aapt tool recognizes and treats as namespace with package name taken from current application's AndroidManifest.xml, //manifest/package attribute. Signed-off-by: inazaruk <ievgenii.nazaruk@gmail.com> (cherry picked from commit e348909c1966c3d192841cc131a32be6ed90da18) Change-Id: I4bff836c42a309bac36e5d1ce1899131b3c4c194
* | Remove dead code in StringPool.Jeff Brown2012-03-161-1/+1
| | | | | | | | | | | | | | The sorted string pool option was no longer used. Neither were strings with associated identifiers. Change-Id: Ic5f6368637fbeedfda873d63f4ad0f3ea9d0d603
* | Move the automatic namespace outside of the res namespace.Xavier Ducrohet2012-02-231-1/+1
| | | | | | | | Change-Id: I107ee94af0a13f008ef4a8844a9038b84f97a247
* | am 63e43ba5: Merge "Fix for issue 9656 - custom xml attributes in Android ↵Jean-Baptiste Queru2012-02-231-3/+9
|\ \ | |/ |/| | | | | | | | | Libraries" * commit '63e43ba56a95708c229eec539a544967f1bbb7d7': Fix for issue 9656 - custom xml attributes in Android Libraries
| * Merge "Fix for issue 9656 - custom xml attributes in Android Libraries"Jean-Baptiste Queru2012-02-231-3/+9
| |\
| | * Fix for issue 9656 - custom xml attributes in Android Librariesinazaruk2011-05-281-3/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added support for predefined namespace http://schemas.android.com/apk/res/auto that aapt tool recognizes and treats as namespace with package name taken from current application's AndroidManifest.xml, //manifest/package attribute. Signed-off-by: inazaruk <ievgenii.nazaruk@gmail.com> Change-Id: I4b24a7265511e416cc7e02b5bb8a08ef32b598eb
| | * Normalize output of XMLtree contentShachar Shemesh2011-04-111-1/+2
| |/ | | | | | | | | | | | | | | Make the output from aapt dump xmltree normalized, so that it is unambigously displayed regardless of the content of the strings. Previous patch left out handling of XML element content. Change-Id: Ib8016996c769f3dde7a87f7ecbdf850333f2426a
* | Make aapt ignore tools-related data.Xavier Ducrohet2012-02-061-31/+46
|/ | | | | | | | | | | | | This patchset introduces a new standard namespace http://schemas.android.com/tools which will be used for tools specific XML attributes. Any attributes using this namespace will not be compiled into the binary XML file. The namespace node is also not written at all, and its string is not collected to ensure that there is no impact on the devices. (cherry picked from commit a5d5e9d906583ebeb590ca200ca9840302a5cd1a) Change-Id: I62937b8bc34c07ac544930aa8eadd7797e0179d5
* Normalize output from aapt dShachar Shemesh2011-01-041-2/+4
| | | | | | | Make the output from aapt dump --values resources and aapt dump xmltree normalized, so that it is unambigously displayed regardless of the content of the strings. Change-Id: Ia3bff36c4ee1e9a44f474534e154830948beabdf
* Change aapt's warning message to suggest formatted="false", not "true".Eric Fischer2010-08-131-1/+1
| | | | | | True is the default and specifying it won't suppress the warning. Change-Id: I8ecc919b4059bf3321e781649cb46dd2d3807592
* Add error checking for translatable stringsKenny Root2010-06-031-1/+111
| | | | | | | | | Translatable strings that have multiple substitutions should use positional String.format() substitutions. This change makes it an error not to use that format on translatable strings that have more than one substitution in its text. Change-Id: I3a19707f3804aa24e8568dc1653a11576cac5916
* Add the --rename-manifest-package option to aapt.Jeff Hamilton2010-02-011-0/+13
| | | | | | | It allows you to force override the manifest package listed in the AndroidManifest.xml when creating an APK file. Change-Id: I7eac7943c4e56610b65728ae54773a273634fd9d
* Optional use of UTF-8 strings in resource bundlesKenny Root2009-12-071-1/+2
| | | | | | | | | | | | | | | Allows the use of UTF-8 for packing resources instead of the default of UTF-16 for Java. When strings are extracted from the ResStringPool, they are converted to UTF-16 and the result is cached for subsequent calls. When using aapt to package, add in the "-8" switch to pack the resources using UTF-8. This will result in the value, key, and type strings as well as the compiled XML string values taking significantly less space in the final application package in most scenarios. Change-Id: I129483f8b3d3b1c5869dced05cb525e494a6c83a
* Make it an error to use a bare apostrophe in aapt, and adjust warnings/errors.Eric Fischer2009-09-011-1/+6
| | | | | | | | | | | | | | | | | | In practice, no one ever writes an apostrophe in an aapt string with the intent of using it to quote whitespace -- they always mean to include a literal apostrophe in the string and then are surprised when they find the apostrophe missing. Make this an error so that it is discovered right away instead of waiting until late in QA or after the strings have already been sent for translation. (And fix a recently-introduced string that has exactly this problem.) Silence the warning about an empty span in a string, since this seems to annoy people instead of finding any real problems. Make the error about having a translated string with no base string into a warning, since this is a big pain when making changes to an application that has already had some translations done, and the dead translations should be removed by a later translation import anyway.
* Format aapt warnings the same way as other compiler warningsMarco Nelissen2009-07-131-1/+1
| | | | ('warning: ' instead of 'WARNING: ' or 'WARNING ')
* Implement compatibility support for WRITE_SDCARD permission.Dianne Hackborn2009-05-151-0/+61
| | | | | | | | | | | Now old applications will automatically be granted it. Also renamed it from SDCARD_WRITE to WRITE_SDCARD to be consistent with our other permissions, and re-arranged how we do targetSdkVersion to actually be usuable for this kind of stuff. Note that right now this results in basically all apps being given the WRITE_SDCARD permission, because their targetSdkVersion is not set. I will be dealing with that in a future change.
* AI 147028: Fix up aapt so it runs cleanly under the valgrind leak checker.Marco Nelissen2009-04-201-0/+1
| | | | Automated import of CL 147028
* auto import from //depot/cupcake/@135843The Android Open Source Project2009-03-031-0/+1295
|
* auto import from //depot/cupcake/@135843The Android Open Source Project2009-03-031-1295/+0
|
* auto import from //branches/cupcake/...@130745The Android Open Source Project2009-02-101-2/+2
|
* Code drop from //branches/cupcake/...@124589The Android Open Source Project2008-12-171-7/+23
|
* Initial ContributionThe Android Open Source Project2008-10-211-0/+1279