summaryrefslogtreecommitdiffstats
path: root/tools/aapt
Commit message (Collapse)AuthorAgeFilesLines
* am afbf8afa: Merge change I564b5b00 into eclair-mr2Doug Zongker2009-10-133-8/+22
|\ | | | | | | | | | | | | Merge commit 'afbf8afa858a78b66c19f11cfda030e913b34085' into eclair-mr2-plus-aosp * commit 'afbf8afa858a78b66c19f11cfda030e913b34085': add "junk path" -k option to aapt
| * add "junk path" -k option to aaptDoug Zongker2009-10-133-8/+22
| | | | | | | | | | | | | | | | | | | | | | Adds a "junk path" option to aapt so that you can do: aapt add -k archive.zip path/to/some.file and have the file stored in the zip under the name "some.file" (without the path). Needed so that we can use 'aapt add' in place of 'zip -j' when building jar files, which will lead to smaller incremental OTAs.
* | am 20b39471: Merge change 26933 into eclairRaphael2009-09-241-0/+4
|\ \ | |/ | | | | | | | | | | Merge commit '20b394719daa218be7ff767fad024504f12e937b' into eclair-plus-aosp * commit '20b394719daa218be7ff767fad024504f12e937b': AAPT: Ignore visual source safe files in resources
| * AAPT: Ignore visual source safe files in resourcesRaphael2009-09-241-0/+4
| | | | | | | | BUG 1895888
* | am f1871e27: Merge change 26009 into eclairSuchi Amalapurapu2009-09-201-2/+3
|\ \ | |/ | | | | | | | | | | Merge commit 'f1871e273e1bf49d72a7f2ef51a4ef377d8f3112' into eclair-plus-aosp * commit 'f1871e273e1bf49d72a7f2ef51a4ef377d8f3112': Fix issue with printing gles version in aapt dump badging option
| * Fix issue with printing gles version in aapt dump badging optionSuchi Amalapurapu2009-09-201-2/+3
| | | | | | | | | | | | If the name attribute for uses-feature or uses-permission is empty the error value is still empty indicating error and preventing the else part from being checked as it should be.
* | am 7fc39b26: Merge change 25238 into eclairDianne Hackborn2009-09-152-1/+57
|\ \ | |/ | | | | | | | | | | Merge commit '7fc39b26fc4ec9df7d147ff34ebba90556cdb4da' into eclair-plus-aosp * commit '7fc39b26fc4ec9df7d147ff34ebba90556cdb4da': Implement issue #1780928: Need support hiding nav keys.
| * Implement issue #1780928: Need support hiding nav keys.Dianne Hackborn2009-09-152-1/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | This implements support for devices whose hardware can hide their navigation keys. It works much like the existing keyboardHidden configuration, and for compatibility uses the same configuration change bit. Also add FLAG_TURN_ON_SCREEN for windows, which has the system cause the screen to be turned on when the window is displayed. Great fun when used with FLAG_SHOW_WHEN_LOCKED! Change-Id: I0b867f19af85cfd8786a14cea194b34f7bdd9b7a
* | merge from open-source masterJean-Baptiste Queru2009-09-041-2/+2
|\ \
| * \ merge from donutJean-Baptiste Queru2009-09-031-0/+5
| |\ \
| | * | donut snapshotJean-Baptiste Queru2009-08-311-0/+5
| | | |
| * | | Fix %p vs %s typo in aapt messageKenny Root2009-09-011-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When trying to print an xmltree or xmlstrings from aapt, the error message if the resource didn't exist erroneously printed a pointer instead of a string. Change-Id: I317bbbdc1200e0f10922e80a36e41a22b2d50d0d
* | | | am e8f605ff: Merge change 23761 into eclairRobert Greenwalt2009-09-031-1/+1
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | Merge commit 'e8f605ff44664d0ecc9a5a24886176ef447db2a9' into eclair-plus-aosp * commit 'e8f605ff44664d0ecc9a5a24886176ef447db2a9': Fix compilation of add-resource tag.
| * | | Fix compilation of add-resource tag.Robert Greenwalt2009-09-021-1/+1
| | | | | | | | | | | | | | | | It used the wrong tag-type to find the end of itself.
* | | | am 66c70e13: Merge change 23529 into eclairEric Fischer2009-09-022-3/+7
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | Merge commit '66c70e13d9f39cf82df8542fe53f2049d3f2062e' into eclair-plus-aosp * commit '66c70e13d9f39cf82df8542fe53f2049d3f2062e': Make it an error to use a bare apostrophe in aapt, and adjust warnings/errors.
| * | | Make it an error to use a bare apostrophe in aapt, and adjust warnings/errors.Eric Fischer2009-09-012-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | merge from open-source masterJean-Baptiste Queru2009-09-011-1/+1
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | Fix bitmask in aapt's StringPool length constructionKenny Root2009-08-211-1/+1
| |/ | | | | | | | | | | | | | | | | | | The StringPool indicates the length of a string with a 16-bit integer. If the length of the string is greater than 0x7FFF, it splits it into two 16-bit integers with the first one having the high bit set. The length calculation has a small bug that masks off the 19 bits instead of the first 15 bits as intended.
| * donut snapshotJean-Baptiste Queru2009-07-292-53/+137
| |
| * donut snapshotJean-Baptiste Queru2009-07-2110-68/+634
| |
| * donut snapshotJean-Baptiste Queru2009-05-201-1/+1
| |
| * AI 144950: Manual integration of 144342 and 144547 from donutburger to cupcake.Robert Greenwalt2009-04-072-4/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | Fix bag (string-array, etc) behavior with overlays. We used to replace elements in the default with elements from the overlay. This change causes us to empty the array first so if the overlay array is smaller we don't end up with elements from the default array showing through at the end of the final result. Ex: [A,B,C] default with [D] overlay should give [D] but used to give [D,B,C] BUG=1754390 Automated import of CL 144950
| * AI 144308: aapt extensions: required sdk version, dependent software ↵Suchi Amalapurapu2009-04-021-69/+142
| | | | | | | | | | | | | | | | | | | | libraries, gadgets Add new attributes for sdk version, software libs and gadgets BUG = 1730924 BUG=1730924 Automated import of CL 144308
* | Fix replacement-after-add of resource files in overlay.Robert Greenwalt2009-08-311-19/+45
| | | | | | | | | | | | | | | | | | | | Aapt was adding/removing elements from a list an continuing to use a stale copy for future indexes. This could cause incorrect subsequent processing. Add an en resource and modify an es, for example. Adding the en would cause the base fileset's es version to be moved in the list. Using the old index we'd then attempt to remove the old es version with the wrong index and then add the new es version generating a "duplicate file" error. bug: 2090015
* | applications are at level 2Joe Onorato2009-08-301-1/+1
| |
* | Add a flag (-G) to aapt to have it output the classes that shouldn't be ↵Joe Onorato2009-08-307-4/+271
| | | | | | | | obfuscated by ProGuard.
* | Add platform infrastructure for features.Dianne Hackborn2009-08-271-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This introduces a new mechanism to define features associated with a platform, query the current device for the available features, and enforce that apps requiring features that aren't available can't be installed. Also now allows uses-library to specify that a library is optional, so the lack of such a library will not prevent the app from being installed (but if it does exist it will be correctly linked into the app). Change-Id: I5b369b46cfa0b3d37c9e08fd14ef1098a978e67b
* | Fix issue #2084148: Define the format for the auto focus preview for barcode ↵Dianne Hackborn2009-08-271-0/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | scanning Add new manifest/aapt support for specifying device features an application requires. The aapt badging now returns these (as well as uses-permission since I need to look for those anyway); if an app doesn't explicitly request the camera feature but does request the permission, then aapt will say that it has requested both the basic camera feature as well as the autofocus feature. Here's what you put in your manifest to say you need a camera but don't need autofocus: <uses-permission android:name="android.permission.CAMERA" /> <uses-feature android:name="android.hardware.camera" /> <uses-feature android:name="android.hardware.camera.autofocus" android:required="false" /> Here's what will be seen from aapt: uses-permission:'android.permission.CAMERA' uses-feature:'android.hardware.camera' uses-feature-not-required:'android.hardware.camera.autofocus' Change-Id: I4dd19cee0486cc54771f5bf14fc9db0e892115d5
* | I am getting tired of the java doc warnings, so fix them.Dianne Hackborn2009-08-241-10/+51
| | | | | | | | Change-Id: I2205eebae419eaf4a0992c9f5b7cd807eb843fe1
* | Add aapt extensions to dump badging to print more info about activities, ↵Suchi Amalapurapu2009-08-181-62/+130
| | | | | | | | | | | | | | | | receivers and services Fix issue with checking end tags. Earlier some boolean variables were being set once a new tag is detected at the same level which causes some incorrect values to be overwritten. we should be doing this when we detect the end tag.
* | am 75c49842: Add maxSdkVersion information in dump badging optionSuchi Amalapurapu2009-08-181-0/+5
|\ \ | | | | | | | | | | | | | | | | | | Merge commit '75c498426a17b47d445711bb9e36794b05876a56' into eclair * commit '75c498426a17b47d445711bb9e36794b05876a56': Add maxSdkVersion information in dump badging option
| * | Add maxSdkVersion information in dump badging optionSuchi Amalapurapu2009-08-141-0/+5
| | |
* | | aapt now attempts to process all assets even if some are malformed.Daniel Sandler2009-08-171-6/+8
| | | | | | | | | | | | | | | | | | Previously aapt would bail out on the first broken image, making it difficult to compile a comprehensive list of broken images. Now it will pre- and post-process all of them and report any and all errors (before exiting with an error code if any errors were encountered). Bug: 2055485
* | | Fix aapt to be able to add configs from overlays.Dianne Hackborn2009-08-152-0/+13
| | | | | | | | | | | | | | | Fixes a bug where any new configurations introduced in an overlay would be half-way ignored (enough to result in a broken .apk).
* | | Allow overlays to add resources.Dianne Hackborn2009-08-133-11/+75
| | |
* | | am 9fc20b0e: Merge change 8126 into donutAndroid (Google) Code Review2009-07-212-52/+130
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit '9fc20b0e381b5fe00b7049ef357c839cd05a33bf' * commit '9fc20b0e381b5fe00b7049ef357c839cd05a33bf': First pass at reworking screen density/size APIs.
| * | First pass at reworking screen density/size APIs.Dianne Hackborn2009-07-212-52/+130
| | | | | | | | | | | | | | | | | | | | | | | | This changes the names of the directories in aapt, to what you see in the list of DpiTest resources. Also adds a new "long" configuration for wide screens, which the platform sets appropriate, and introduces a new kind of resizeability for not large but significantly larger than normal screens which may have compatibility issues.
* | | am aad0fcc9: Merge change 7783 into donutAndroid (Google) Code Review2009-07-191-1/+7
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit 'aad0fcc9619eb72c18a6afff48ebc9d4011f0f54' * commit 'aad0fcc9619eb72c18a6afff48ebc9d4011f0f54': Add "nodpi" density, and expose a bunch of density-related APIs.
| * | Add "nodpi" density, and expose a bunch of density-related APIs.Dianne Hackborn2009-07-171-1/+7
| | | | | | | | | | | | | | | Also update the DpiTest app to use nodpi images, and try to have a mode where it turns off compatibility though it's not quite working.
* | | Format aapt warnings the same way as other compiler warningsMarco Nelissen2009-07-136-15/+15
| | | | | | | | | | | | ('warning: ' instead of 'WARNING: ' or 'WARNING ')
* | | am 72eb0aca: Merge change 5483 into donutAndroid (Google) Code Review2009-06-293-1/+91
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit '72eb0acad5cffc57ce5006f6deab29ee259e461e' * commit '72eb0acad5cffc57ce5006f6deab29ee259e461e': Expand support for different screen sizes.
| * | Expand support for different screen sizes.Dianne Hackborn2009-06-263-1/+91
| | | | | | | | | | | | | | | | | | | | | | | | | | | Applications can now declare that they support small, normal, or large screens. Resource selection can also be done based on these sizes. By default, pre-Donut apps are false for small and large, and Donut or later apps are assumed to support all sizes. In either case they can use <supports-screens> in their manifest to declare what they actually support.
* | | am 1585bd24: Merge change 4828 into donutAndroid (Google) Code Review2009-06-193-5/+32
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit '1585bd24c10d16351f89e32dddbfa799f18db6bd' * commit '1585bd24c10d16351f89e32dddbfa799f18db6bd': Report densities in badging, debugging for nine patch bug.
| * | Report densities in badging, debugging for nine patch bug.Dianne Hackborn2009-06-193-5/+32
| | | | | | | | | | | | | | | | | | | | | The aapt tool now reports all available densities like it already did for locales. Also this includes more resource data output, which I was using to examine bug #1867049 (which at this point I am unable to reproduce).
* | | am 684a2edb: Merge change 3577 into donutAndroid (Google) Code Review2009-06-102-10/+18
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit '684a2edbe192a2a76684c5d6855773196d2e1a2e' * commit '684a2edbe192a2a76684c5d6855773196d2e1a2e': Make aapt Error out when an overlay adds a string.
| * | Merge change 3577 into donutAndroid (Google) Code Review2009-06-102-10/+18
| |\ \ | | | | | | | | | | | | | | | | * changes: Make aapt Error out when an overlay adds a string.
| | * | Make aapt Error out when an overlay adds a string.Robert Greenwalt2009-06-092-10/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Final added check (I think) for 1585775 - not letting overlays add resources. modified: ResourceTable.cpp modified: ResourceTable.h
* | | | am fa5c7e1d: Catch when a file resource (non values) added in an overlay.Robert Greenwalt2009-06-081-14/+17
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | Merge commit 'fa5c7e1dfede7e26260789dd2de5175497e9659b' * commit 'fa5c7e1dfede7e26260789dd2de5175497e9659b': Catch when a file resource (non values) added in an overlay.
| * | | Catch when a file resource (non values) added in an overlay.Robert Greenwalt2009-06-081-14/+17
| |/ / | | | | | | | | | | | | | | | | | | File resources are assigned resource id's and if an overlay adds one it renumbers things and breaks compatability. Used to segfault if you tried before, but now catches it and lets you know what file caused the problem.
* | | am 1aa8170e: Add per-named-item overlay ability in res xml.Robert Greenwalt2009-06-052-5/+17
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit '1aa8170e6a448afad86e5d62927d3b8ca4cd9707' * commit '1aa8170e6a448afad86e5d62927d3b8ca4cd9707': Add per-named-item overlay ability in res xml.
generated by cgit v1.1 at 2025-11-07 09:55:32 +0000