summaryrefslogtreecommitdiffstats
path: root/tools/aapt
Commit message (Collapse)AuthorAgeFilesLines
* GL texture filtering changed from AND to OR, so rename tag name to match.Dan Morrill2010-12-131-2/+2
| | | | | | | (<uses-foo> == AND, <supports-foo> == OR, e.g. uses-feature vs. supports-screen). Change-Id: I0f20aed7f95169d9adfc7fe128191eb6e49d116f
* fix xlarge support in aapt for gingerbreadScott Main2010-11-041-2/+2
| | | | Change-Id: I4d8872fb839a6eadc538055215d4455af328846c
* Implement issue #3116702: New manifest tags for supported screen sizes DO ↵Dianne Hackborn2010-10-211-9/+50
| | | | | | NOT MERGE Change-Id: Iabf64d86c89d387ffbfbc39f950d308a73fe17eb
* Adding a new <uses-gl-texture/> tag, to be used to enable apps to specifyDan Morrill2010-10-131-0/+9
| | | | | | | filtering based on support for OpenGL ES texture and texture compression formats. Change-Id: I993209a673579b296007ae2ba830d0275770dd11
* Avoid pre-processing images when they won't be usedAnthony Newnam2010-10-061-1/+3
| | | | Change-Id: I24db3645c399f66dc7cc0e85909ce34b68ff829e
* Add new API to find out whether external storage is removable.Dianne Hackborn2010-10-041-8/+10
| | | | | | | | This is implemented based on whether we are using the "nosdcard" product. Needed to tweak aapt to allow use of the product attribute with other resource definition tags besides strings. Change-Id: I49922d23b52a34183a8e2f4d2515adaf1fc9149a
* Add an aapt option to allow string variations for different devices.Eric Fischer2010-09-233-5/+95
| | | | | | | | | | | | | | | | | | | | The --product option to aapt is a comma-separated list of characteristics of the device being built for. For example, --product nosdcard,grayscale for a device with no SD card and a grayscale screen. Strings can specify a product="characteristic" option to cause that version of the string to be used only for that type of device. All such strings should also specify, at the end of the block, product="default", which will be used if none of the variations match. For example: <string name="choose" product="bw">Choose black or white</string> <string name="choose" product="grayscale">Choose a shade of gray</string> <string name="choose" product="default">Choose a color</string> The default characteristic will also be used when no --product option is specified. Change-Id: Ie6c1505599e02e15b7818e8be6ec47bc6ce71aaa
* Implement #2964234: Add support for <uses-package> element to aaptDianne Hackborn2010-09-021-0/+9
| | | | Change-Id: Ifb381f387cab7e5a99006691e330d0e3d9d0f250
* Add a --debug-mode option to aapt.Xavier Ducrohet2010-08-313-3/+18
| | | | | | | | | | | When passed (with no needed parameters) to the aapt command line, aapt will insert debuggable=true in the application node of the manifest automatically. This is to be used by the SDK tools to make true "debug" builds that require no code/file change. Change-Id: I6f0a7af7b7d51f26bb0ec012e6f142a6060b8618
* Merge "Add LFH offset to verbose list of APK" into gingerbreadKenny Root2010-08-252-8/+9
|\
| * Add LFH offset to verbose list of APKKenny Root2010-08-252-8/+9
| | | | | | | | | | | | | | | | | | The Local File Header (LFH) offset is printed in debugging cases when the platform is inspecting APKs. This adds the LFH offset field to the list of contents of an APK, so that it can be checked easily against the Central Directory (CD). Change-Id: I08f9a13256bfe6563c1a963c4f0289789b2e7857
* | Fix linux 64 buildBrian Carlstrom2010-08-241-1/+1
|/ | | | | | git cherry-pick -e 49416bc658e37a0f4ae4f2b7b8582dd1606fba0f Change-Id: I37a689acea8aeb5d6ac92ee56b077bafe4fba170
* Fix aapt dump badging to support xlarge screens.Dianne Hackborn2010-08-201-0/+9
| | | | Change-Id: Ieeb757cd48ad9b3f46c5e4aed9d5efaeac834049
* Merge "Output proguard keep flags for fragment classes." into gingerbreadYing Wang2010-08-131-18/+48
|\
| * Output proguard keep flags for fragment classes.Ying Wang2010-08-131-18/+48
| | | | | | | | | | Change-Id: I28c10fbf18b91f8ba3dfc2575cd41215f65f11ec Bug: 2916847
* | Merge "Change aapt's warning message to suggest formatted="false", not ↵Eric Fischer2010-08-131-1/+1
|\ \ | | | | | | | | | "true"." into gingerbread
| * | 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 --max-res-version flag to aapt.Ficus Kirkpatrick2010-08-133-0/+26
|/ | | | | | | | | | aapt will ignore any versioned resource directories over the specified version (if used). e.g. --max-res-version=6 will cause layout-land-v7 to be ignored. Merged from froyo. Change-Id: Ia4eabae535b95b75d18b0c83135d44ed9a95b9eb
* am 6b22d81a: As Donut (API=4) devices and earlier do not have a Bluetooth ↵Dan Morrill2010-06-171-1/+1
|\ | | | | | | | | | | | | | | | | API, .apk files that have minSdkLevel (or targetSdkLevel) set to 4 or lower should not be presumed to require Bluetooth just because they take the permission. Merge commit '6b22d81aa35d9a9b32670995c002e92588b2fe09' into gingerbread * commit '6b22d81aa35d9a9b32670995c002e92588b2fe09': As Donut (API=4) devices and earlier do not have a Bluetooth API, .apk files
| * As Donut (API=4) devices and earlier do not have a Bluetooth API, .apk filesDan Morrill2010-06-151-1/+1
| | | | | | | | | | | | | | that have minSdkLevel (or targetSdkLevel) set to 4 or lower should not be presumed to require Bluetooth just because they take the permission. Change-Id: Ia629e9ef0425a577e4e14f9b348f5aa2b39c1e74
* | am 9d71860e: Merge "The aapt and aidl tools are prebuilt when we\'re doing ↵Joe Onorato2010-06-151-0/+4
|\ \ | |/ | | | | | | | | | | | | | | an apps-only build, so don\'t try to build them." into froyo Merge commit '9d71860e8cbaf16ddae3cd5d06ede8e6cfc7675a' into gingerbread * commit '9d71860e8cbaf16ddae3cd5d06ede8e6cfc7675a': The aapt and aidl tools are prebuilt when we're doing an apps-only build, so don't try to build them.
| * The aapt and aidl tools are prebuilt when we're doing an apps-only build, so ↵Joe Onorato2010-06-101-0/+4
| | | | | | | | | | | | don't try to build them. Change-Id: I9896b11a9b90cbbbe2170243c8bdbc40231dfbff
* | am 5474902f: Merge "xhdpi" into froyoDianne Hackborn2010-06-061-0/+5
|\ \ | |/ | | | | | | | | | | Merge commit '5474902fe9fe72c825855c4a77f99a581a9f6594' into kraken * commit '5474902fe9fe72c825855c4a77f99a581a9f6594': xhdpi
| * xhdpiDianne Hackborn2010-06-041-0/+5
| | | | | | | | | | | | This is only a tool (aapt) change, and does not impact any current code. Change-Id: I562063f612af919eaadba8ac4868a95ff41ac840
* | Add error checking for translatable stringsKenny Root2010-06-033-9/+139
| | | | | | | | | | | | | | | | | | 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
* | am f7ebcfec: am e17b4e71: Merge "Adding the backward-compatible filtering ↵Dan Morrill2010-05-041-12/+180
|\ \ | |/ | | | | | | | | | | | | | | heuristics for the new device features definitions added in FroYo." into froyo Merge commit 'f7ebcfeccbd4433be5252857a854a6b565bf3fb9' into kraken * commit 'f7ebcfeccbd4433be5252857a854a6b565bf3fb9': Adding the backward-compatible filtering heuristics for the new device
| * Adding the backward-compatible filtering heuristics for the new deviceDan Morrill2010-05-041-12/+180
| | | | | | | | | | | | features definitions added in FroYo. Change-Id: I5024e45c62813fe2fd2ff4d222df816a86a94f86
* | New xlarge screen size.Dianne Hackborn2010-04-281-0/+5
|/ | | | | | | | | | | | | Not complete, only for experimentation at this point. This includes a reworking of how screen size configurations are matched, so that if you are on a larger screen we can select configurations for smaller screens if there aren't any exactly matching the current screen. The screen size at which we switch to xlarge has been arbitrarily chosen; the compatibility behavior has not yet been defined. Change-Id: I1a33b3818eeb51a68fb72397568c39ab040a07f5
* Fix aapt to build in Windows SDK under LinuxRaphael2010-04-231-6/+6
| | | | (Merge master Change Ic4a7b9e4)
* Use correct API version for UTF-8 checkingKenny Root2010-03-243-6/+7
| | | | | | | | Use the constant for checking the API version in aapt instead of a bare number. Bug: 2541326 Change-Id: Ice7af7b393363a00f1832dd84753b8138d057fb4
* Make aapt warning conciseKenny Root2010-03-181-1/+2
| | | | | | | | The previous warning made it seem like it could be using the value specified on the command line, but, in fact, it would ignore the command line value if it were already specified in the AndroidManifest.xml Change-Id: I15e8161e094f17412680d25d3b7b810474eb4a31
* Fix minSdkVersion scanning to not throw warningsKenny Root2010-03-184-34/+51
| | | | | | | | | | | | | | For the UTF8/UTF16 switch code, we needed to know what was the minSdkVersion specified as early as possible. Unfortunately, this threw warnings when the SDK was compiling since we always set this field in the Bundle. This splits out the field used by the initial AndroidManifest.xml scan to a separate one that we won't attempt to re-insert into the AndroidManifest.xml This also switches the logic to better reflect the preference of UTF-8 over UTF-16; previously UTF-16 was the default. Change-Id: Ia81f6b21047043ebb711eb24c2c3718534979ef6
* Give an 9-patch error on too many rows and columnsKenny Root2010-03-121-8/+18
| | | | | | | | | When you have too many rows and columns, there are not enough colors in the 9-patch private metadata to represent them. Instead of crashing aapt, this change gives the user an error message telling them why it's invalid. Change-Id: I5e7bd59472a3a2eafa7cbc263792458cce2b5594
* Revert "Dedupe resource config pointers"Kenny Root2010-03-102-186/+2
| | | | This reverts commit 7b467d8b44c00d14590c021928b6a9ad5a36348e.
* Dedupe resource config pointersKenny Root2010-03-092-2/+186
| | | | | | | | | When there are two configs in a StringPool that would match a string ID only keep the more generic entry to save some space. This means that if you have both "es" and "es_US" translations that have the same translation, the string entry would be removed from the "es_US" config. Change-Id: I4d619942d35ddb477e2eabe4437b7f02697c24de
* Add ability for some manifest attributes to reference resources.Dianne Hackborn2010-03-094-101/+188
| | | | | | | | | | | This loosens our restriction on many manifest attributes requiring literal string values, to allow various ones to use values from resources. This is only allowed if the resource value does not change from configuration changes, and the restriction is still in place for attributes that are core to security (requesting permissions) or market operation (used libraries and features etc). Change-Id: I4da02f6a5196cb6a7dbcff9ac25403904c42c2c8
* Merge "Change an aapt "warning" from "*** " to "**** " (from three to four ↵Ed Heyl2010-03-051-1/+1
|\ | | | | | | stars). "*** " (three stars and a space) is the 'magic make error string'; so this change makes it easier to find the real issues/errors in build logs. Besides, other aapt messages are "**** "."
| * Change an aapt "warning" from "*** " to "**** " (from three to four stars).Ed Heyl2010-03-051-1/+1
| | | | | | | | | | "*** " (three stars and a space) is the 'magic make error string'; so this change makes it easier to find the real issues/errors in build logs. Besides, other aapt messages are "**** ".
* | Merge "Fix potential aapt crash when processing overlay."Xavier Ducrohet2010-03-051-11/+18
|\ \
| * | Fix potential aapt crash when processing overlay.Xavier Ducrohet2010-03-051-11/+18
| |/ | | | | | | | | | | | | | | | | | | If an overlay has a type of resources that's not defined in the main res pool, then aapt would crash. This dynamically create new ResourceTypeSet when needed when processing the overlays Change-Id: I67bc3622281bde73cf42f37a0983798d3f658ce2
* | Refactor car mode.Dianne Hackborn2010-03-051-1/+6
|/ | | | | | | | | | | | | | | | | | Extract all UI behavior from dock observer and ACTION_DOCK_EVENT. Also introduce a desk type to go along with the car type all through the resource system, since we now need to have corresponding high-level broadcasts for desk dock mode. As part of that I also reworked some of the logic for switching modes to all funnel through a single update() call that looks all of the current state to decide what to do next, and fixed various locking issues. In addition I found there were bugs in the configuration change handling causing us to only switch into the car mode config and then never get out of it. Unfortunately now that we are actually changing the configuration for each mode change, the transitions between them are really crummy as we restart all kinds of activities. :(
* Fix issue #2485441: SettingsBackupAgent crashed system serverDianne Hackborn2010-03-031-44/+46
| | | | | Need to take care of fixing up backupAdjust as well as reporting it to ProGuard.
* Fix issue #2482423: Settings is broken due to dead-code strippingDianne Hackborn2010-03-021-15/+58
| | | | | Take care of more custom classes in layouts, and also scan through preference XMLs.
* Fix issue #2448075: aapt doesn't fix up activity-alias ↵Dianne Hackborn2010-03-016-10/+97
| | | | | | | | | | | | | | android:targetActivity links And related: - The aapt tool now sets a resource configurations sdk level to match any configs that have been set (for example if you specify density your sdk level will be at least 4). - New option to modify the targetPackage attribute of instrumentation. - Clean up of aapt options help. - Fix of UI type values to leave 0 for "unspecified". - Make the UI mode config APIs public.
* Create own reference for minSdkVersion in aaptKenny Root2010-02-241-3/+3
| | | | | | | Fix bug where applications defining a minSdkVersion were experiencing transient errors from memory corruption in aapt. Change-Id: I839d5eda7388baac6133e735fa59f9799ca2822d
* Scan for android namespace in manifestKenny Root2010-02-241-2/+2
| | | | | | | | android:minSdkVersion wasn't being correctly scanned because the namespace was incorrect. This fixes that problem so packages aren't generated as UTF-8 when minSdkVersion is less than 7. Change-Id: I8f45d47ea886915da6a4770f6e111e6085d61bee
* Use UTF-8 strings to avoid duplicate caching, part 1Kenny Root2010-02-231-2/+6
| | | | | | | | | | | | StringBlock instances containing UTF-8 strings use a cache to convert into UTF-16, but using that cache and then using a JNI call to NewString causes the UTF-8 string as well as two copies of the UTF-16 string to be held in memory. Getting the UTF-8 string directly from the StringPool eliminates one copy of the UTF-16 string being held in memory. This is part 1. Part 2 will include ResXMLParser optimizations. Change-Id: Ibd4509a485db746d59cd4b9501f544877139276c
* Use direct reference to enum in AaptAssetsKenny Root2010-02-191-6/+6
| | | | | | | The second argument to the getNavHiddenName can be NULL, so use a direct reference to the class to get the enum values instead of the argument. Change-Id: I0444572c23cb4de9e7da15a8310a49cf4619bb15
* Merge "Change buf size holding integer in ResourceTable"Kenny Root2010-02-181-1/+1
|\
| * Change buf size holding integer in ResourceTableKenny Root2010-02-181-1/+1
| | | | | | | | | | | | | | A 32-bit integer can be 10 characters long plus a byte for \0 at the end. Change-Id: I58040fe6e1674e78bcc6e07463ff36fb26e280f4
generated by cgit v1.1 at 2025-03-14 03:15:24 +0000