summaryrefslogtreecommitdiffstats
path: root/tools/aapt
Commit message (Collapse)AuthorAgeFilesLines
* 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
* | Fix enum referenceKenny Root2010-02-181-8/+8
|/ | | | | | | | Was using argument that is set default to NULL as a shortcut to an enum's value. Change it to reference to class directly to avoid a null pointer dereference. Change-Id: I16b8ee15af4f095f027113131d574b70768994b0
* Dump original-package entries.Jeff Hamilton2010-02-121-0/+9
| | | | Change-Id: I29b20811847555ff9858ef47cca69c8b992b24ea
* Introduce special UI modes for night and car usage.Tobias Haamel2010-02-114-4/+118
| | | | | | | | | | | | | | | | | | The device mode is now called ui mode. Furthermore is the order of precedence for the resources now in such a way that the ui mode needs to be specified after the orientation and before the density. The ui mode can be set, like it is done for the locale, as follows: IActivityManager am = ActivityManagerNative.getDefault(); Configuration config = am.getConfiguration(); config.uiMode = Configuration.UI_MODE_TYPE_CAR | Configuration.UI_MODE_NIGHT_ANY; am.updateConfiguration(config); To allow users to disable the car mode and set the night mode the IUiModeManager interface is used. The automatic night mode switching will be added in a separate change.
* Add --auto-add-overlay option to aapt.Xavier Ducrohet2010-02-044-6/+16
| | | | | | | This option allows resources only present in overlays to be added automatically instead of being declared through <add-resource> Change-Id: Iff782311056f6a045193e57d204f7d3413e11b26
* Add the --rename-manifest-package option to aapt.Jeff Hamilton2010-02-016-8/+91
| | | | | | | It allows you to force override the manifest package listed in the AndroidManifest.xml when creating an APK file. Change-Id: I7eac7943c4e56610b65728ae54773a273634fd9d
* am 6efe03b1: am 6f9e2c64: Merge "Find layout classes in all "layout-*" ↵Ying Wang2010-01-271-3/+9
|\ | | | | | | | | | | | | | | | | dirs." into eclair Merge commit '6efe03b19e0734361b262f9a0be4d225088d7f9e' * commit '6efe03b19e0734361b262f9a0be4d225088d7f9e': Find layout classes in all "layout-*" dirs.
| * am 6f9e2c64: Merge "Find layout classes in all "layout-*" dirs." into eclairYing Wang2010-01-211-3/+9
| |\ | | | | | | | | | | | | | | | | | | Merge commit '6f9e2c648c0588a2eedef2746c9750ed9c6945be' into eclair-plus-aosp * commit '6f9e2c648c0588a2eedef2746c9750ed9c6945be': Find layout classes in all "layout-*" dirs.
| | * Find layout classes in all "layout-*" dirs.Ying Wang2010-01-201-3/+9
| | | | | | | | | | | | | | | Before this CL, the generated keep flags for layout classes are incomplete, such as layout classes in res/layout-port/ and res/layout-land and so on.
* | | am 3c05f1fb: am b5fb50a1: Merge "Add instrumentation as a source tag for ↵Ying Wang2010-01-221-36/+44
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | proguard keep options." into eclair Merge commit '3c05f1fbac2ce35483f61dbd5d5bfb6341da6d9c' * commit '3c05f1fbac2ce35483f61dbd5d5bfb6341da6d9c': Add instrumentation as a source tag for proguard keep options.
| * | am b5fb50a1: Merge "Add instrumentation as a source tag for proguard keep ↵Ying Wang2010-01-191-36/+44
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | options." into eclair Merge commit 'b5fb50a133c6fc7fc93d6241912dd9ec24de6ace' into eclair-plus-aosp * commit 'b5fb50a133c6fc7fc93d6241912dd9ec24de6ace': Add instrumentation as a source tag for proguard keep options.
| | * Add instrumentation as a source tag for proguard keep options.Ying Wang2010-01-131-36/+44
| | |
* | | am b4f41119: am a1d08886: Merge "Only output proguard keep for nonempty ↵Ying Wang2010-01-121-23/+25
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | attribute name in the AndroidManifest.xml." into eclair Merge commit 'b4f41119044e5ec7f7b76ed4ac02b5cfbaeb474d' * commit 'b4f41119044e5ec7f7b76ed4ac02b5cfbaeb474d': Only output proguard keep for nonempty attribute name in the AndroidManifest.xml.
| * | am a1d08886: Merge "Only output proguard keep for nonempty attribute name in ↵Ying Wang2010-01-121-23/+25
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | the AndroidManifest.xml." into eclair Merge commit 'a1d08886ec8549878ad16c19754a3239706fb61b' into eclair-plus-aosp * commit 'a1d08886ec8549878ad16c19754a3239706fb61b': Only output proguard keep for nonempty attribute name in the AndroidManifest.xml.
| | * Only output proguard keep for nonempty attribute name in the ↵Ying Wang2010-01-121-23/+25
| | | | | | | | | | | | | | | | | | | | | AndroidManifest.xml. Before this change, aapt generates proguard keep flags like "-keep class com.android.somepackage.", which proguard doesn't recognize.
* | | am ce56857e: am cb2d50d0: Fix issue #2357259: aapt tool prints ↵Dianne Hackborn2010-01-071-1/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | "uses-configuation:" Merge commit 'ce56857ef72538c197afd91b9f30dc868d2667d9' * commit 'ce56857ef72538c197afd91b9f30dc868d2667d9': Fix issue #2357259: aapt tool prints "uses-configuation:"
| * | am cb2d50d0: Fix issue #2357259: aapt tool prints "uses-configuation:"Dianne Hackborn2010-01-061-1/+1
| |\ \ | | |/ | | | | | | | | | | | | | | | Merge commit 'cb2d50d0d6e2e37ae02b014999da23ecd32038b8' into eclair-plus-aosp * commit 'cb2d50d0d6e2e37ae02b014999da23ecd32038b8': Fix issue #2357259: aapt tool prints "uses-configuation:"
| | * Fix issue #2357259: aapt tool prints "uses-configuation:"Dianne Hackborn2010-01-061-1/+1
| | | | | | | | | | | | Change-Id: Id3ea3a86bd4d385441b05fcbe85b8ab62c35afff
| * | am ce307f88: Merge change Ie4cdb5a3 into eclairXavier Ducrohet2009-12-093-6/+25
| |\ \ | | |/ | | | | | | | | | | | | | | | Merge commit 'ce307f889b509143899a2221359219fbc91b618c' into eclair-plus-aosp * commit 'ce307f889b509143899a2221359219fbc91b618c': Add --custom-package to aapt
generated by cgit v1.1 at 2025-01-14 16:32:36 +0000