summaryrefslogtreecommitdiffstats
path: root/tools/aapt
Commit message (Collapse)AuthorAgeFilesLines
* Add "tv" density for 720p screens.Dianne Hackborn2011-05-271-0/+5
| | | | Change-Id: I028969b007f2fceea66947d77a2ae31ef1d1a630
* Add "television" mode.Dianne Hackborn2011-05-231-0/+5
| | | | Change-Id: Ida1fdb61b036a8b489dbeda196fb4bc82e651b2b
* Add new "-swNNNdp" resource qualifier.Dianne Hackborn2011-05-193-45/+111
| | | | Change-Id: I0101e88ca9d8d44138bdcaf571f24b0352f4f6ce
* DO NOT MERGE. Integrate add new screen width/height in "dp" configs.Dianne Hackborn2011-05-123-12/+137
| | | | | | | | | | | | | | | | You can now specify resource configuration variants "wNNNdp" and "hNNNdp". These are the minimum screen width/height in "dp" units. This allows you to do things like have your app adjust its layout based only on the about of horizontal space available. This introduces a new configuration change flag for screen size. Note that this configuration change happens each time the orientation changes. Applications often say they handle the orientation change to avoid being restarted at a screen rotation, and this will now cause them to be restarted. To address this, we assume the app can handle this new config change if its target SDK version is < ICS. Change-Id: I4acb73d82677b74092c1da9e4046a4951921f9f4
* Add notice files for aapt and aidl.Xavier Ducrohet2011-02-281-0/+190
| | | | Change-Id: I51da138475618287760043059790aba87f4c3f35
* am ce57a7f3: am 6504490c: am dff6b8e7: Merge "Add --non-constant-id to aapt."Xavier Ducrohet2011-02-283-6/+20
|\ | | | | | | | | | | | | | | | | | | | | * commit 'ce57a7f35344e76689d30f45964d1e37b78280cb': GpsLocationProvider: Clean up HAL initialization/cleanup sequence Fixed GSM encoded network initiated position request Ensuring thread-safe usage of DateFormat. Fixing infinite loop for zero duration. Fix for an infinite loop while scrolling lists. WAPPushManager, WAP Push over SMS message handler Add --non-constant-id to aapt.
| * am dff6b8e7: Merge "Add --non-constant-id to aapt."Xavier Ducrohet2011-02-283-6/+20
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'dff6b8e71dda9f5d841fa26408714aec2aef1505': GpsLocationProvider: Clean up HAL initialization/cleanup sequence Fixed GSM encoded network initiated position request Ensuring thread-safe usage of DateFormat. Fixing infinite loop for zero duration. Fix for an infinite loop while scrolling lists. WAPPushManager, WAP Push over SMS message handler Add --non-constant-id to aapt.
| | * Add --non-constant-id to aapt.Xavier Ducrohet2011-02-143-6/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This option enbables creating resource constant in the R class that are not actual constant, but simply static fields. The goal is to build library projects with these types of IDs so that the constant does not get inlined in the library code, since the ID for the library resources only are not the final values. The final resource IDs, generated from the main project and its library(ies), will have proper constant with the final values. This allows us to generate binary library bundle (a jar file and associated resources) that can be distributed. Additionally, this will let us make the library project support in Eclipse much more robust and a better user experience overall. Change-Id: Ibe2f08d68493fde658fc3f7606abf7446f312ad2
* | | am a1f5e82f: am a30063d8: am 25eb0464: Merge "Normalize output from aapt d"Dianne Hackborn2011-01-291-2/+4
|\ \ \ | |/ / | | | | | | | | | * commit 'a1f5e82f37c77af7b1d630b5bca715d1742f1234': Normalize output from aapt d
| * | am a30063d8: am 25eb0464: Merge "Normalize output from aapt d"Dianne Hackborn2011-01-291-2/+4
| |\ \ | | |/ | | | | | | | | | * commit 'a30063d80c08434ac3c7316f338c6d54110449ab': Normalize output from aapt d
| | * Merge "Normalize output from aapt d"Dianne Hackborn2011-01-291-2/+4
| | |\
| | | * 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
* | | | am e802b592: am 2107757d: am bbb5a5ce: Merge "Make ↵Dianne Hackborn2011-01-291-5/+3
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | AaptGroupEntry::getMncName accept mnc00" * commit 'e802b59280540ce24ea1db61907a0f1f22f01fad': Make AaptGroupEntry::getMncName accept mnc00
| * | | am 2107757d: am bbb5a5ce: Merge "Make AaptGroupEntry::getMncName accept mnc00"Dianne Hackborn2011-01-291-5/+3
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit '2107757dde0b3159119edcc9084fcb9a87985e88': Make AaptGroupEntry::getMncName accept mnc00
| | * | Merge "Make AaptGroupEntry::getMncName accept mnc00"Dianne Hackborn2011-01-291-5/+3
| | |\ \
| | | * | Make AaptGroupEntry::getMncName accept mnc00Johan Redestig2011-01-041-5/+3
| | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MNC 00 is a valid network code and is used by some operators, see http://en.wikipedia.org/wiki/Mobile_Network_Code. Remove the test that checks if atoi returns zero. The string is validated to contain only numbers already. Also discussed here: https://code.google.com/p/android/issues/detail?id=3657 Change-Id: I3220d7980abe4067c9e7aa4cbc10b5fd0b8c9ea7
| * | | am bcf2adeb: Merge "aapt: Allow raw "%" in unformatted string-arrays"Dianne Hackborn2011-01-231-0/+16
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit 'bcf2adeb10c41becec3baa2bcb8de9212272399a': aapt: Allow raw "%" in unformatted string-arrays
| | * | aapt: Allow raw "%" in unformatted string-arraysJosh Stone2011-01-221-0/+16
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit 15fe2cb added format checking for translatable strings, enforcing the use of positional args. This check can be disabled on <string> values with translatable="false" or formatted="false". But they didn't check for those attributes on <string-array>, so some of CM's strings fail when they're not really format strings, just because they contain percent signs. (e.g. brightness widget's "Auto/Dim/40%/100%") So now the formatted/translatable attributes are checked in string-array too, and we can restore our proper percent signs. Change-Id: I3478ab7e0b939e61fe0cec20201ac55096264080
* | | aapt: Allow raw "%" in unformatted string-arraysJosh Stone2011-01-231-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit 15fe2cb added format checking for translatable strings, enforcing the use of positional args. This check can be disabled on <string> values with translatable="false" or formatted="false". But they didn't check for those attributes on <string-array>, so some of CM's strings fail when they're not really format strings, just because they contain percent signs. (e.g. brightness widget's "Auto/Dim/40%/100%") So now the formatted/translatable attributes are checked in string-array too, and we can restore our proper percent signs. Change-Id: I3478ab7e0b939e61fe0cec20201ac55096264080
* | | Add new "animator" and "interpolator" resource directories.Dianne Hackborn2011-01-051-1/+52
| | | | | | | | | | | | | | | | | | First phase, allowing apps to move over to the new names. Change-Id: Ia16f3e2383e4a6599a0011d0464f0aacb1ce9207
* | | am 0ccc8b73: am 5441a9ff: Merge "GL texture filtering changed from AND to ↵Dan Morrill2010-12-141-2/+2
|\ \ \ | |/ / | | | | | | | | | | | | | | | OR, so rename tag name to match. (<uses-foo> == AND, <supports-foo> == OR, e.g. uses-feature vs. supports-screen)." into gingerbread * commit '0ccc8b7345eac0b507c221be47e55926cbda8957': GL texture filtering changed from AND to OR, so rename tag name to match. (<uses-foo> == AND, <supports-foo> == OR, e.g. uses-feature vs. supports-screen).
| * | am 5441a9ff: Merge "GL texture filtering changed from AND to OR, so rename ↵Dan Morrill2010-12-141-2/+2
| |\ \ | | |/ | |/| | | | | | | | | | | | | tag name to match. (<uses-foo> == AND, <supports-foo> == OR, e.g. uses-feature vs. supports-screen)." into gingerbread * commit '5441a9ff2128cf2c5088974c74b79d2d1734f755': GL texture filtering changed from AND to OR, so rename tag name to match. (<uses-foo> == AND, <supports-foo> == OR, e.g. uses-feature vs. supports-screen).
| | * 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
* | | Change assets to use 64-bit APIKenny Root2010-12-083-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The asset system and supporting libraries were using off_t instead of off64_t to access files larger than 2GB (32-bit signed). This change replaces all off_t with off64_t and lseek64. There is a new utils/Compat.h added for Mac OS compatibility. Also fixed some size-related compiler warnings. Bug: 3205336 Change-Id: I9097b3cb7a602e811fe52f245939d8975da55e9e
* | | Add knowledge of mipmap to aaptKenny Root2010-11-224-25/+60
| | | | | | | | | | | | | | | | | | | | | New mipmap drawable type that does not get filtered according to configuration. Useful for things that get built as part of the system. Change-Id: I556033d065e504079271dce79c23c90d3c387ce4
* | | am 3442611e: am 5580e44c: Merge "Support changing style parent in overlays"Jean-Baptiste Queru2010-11-061-14/+0
|\ \ \ | |/ / | | | | | | | | | * commit '3442611ee11b2987c83054fe3c7ed5521f27f052': Support changing style parent in overlays
| * | am 5580e44c: Merge "Support changing style parent in overlays"Jean-Baptiste Queru2010-11-051-14/+0
| |\ \ | | |/ | |/| | | | | | | * commit '5580e44c250944f5cd011b2682eea5cc2de9706c': Support changing style parent in overlays
| | * Merge "Support changing style parent in overlays"Jean-Baptiste Queru2010-11-041-14/+0
| | |\
| | | * Support changing style parent in overlaysMartin Nordholts2010-08-171-14/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Package overlays makes it possible for vendors to tweak the look of the platform and the applications without touching any platform or application code directly. This makes package overlays an important mechanism in the Android build system. There is currently a limitation that forbids changing the parent of a style. If vendors could change the parent of e.g. ‘CalendarTheme’ from Android’s vanilla ‘Theme’ to ‘VendorTheme’, then vendor specific adjustments could be done without changing any code directly. From looking at the code it can be seen that the parent value of a style is stored temporarily in ResourceTable::Entry::mParent while overlays are gone through in buildResources(), and processed (in ResourceTable::Entry::assignResourceIds()) at first after all overlays have been handled, so there aren’t any obvious reasons why changing parent in an overlay should be forbidden. Change-Id: I5969bb8aab90df437e1967fc504cc0da79107d13
* | | | am 4da6efc8: am 46151652: Merge "fix xlarge support in aapt for gingerbread" ↵Scott Main2010-11-061-2/+2
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | into gingerbread * commit '4da6efc8a3ecfcf46a8988ad1d277ae00ed1f58c': fix xlarge support in aapt for gingerbread
| * | | 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
* | | | Fix debug statements and aapt assert.Patrick Scott2010-10-261-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | ENABLE_PSEUDOLOCALIZE seems to not exist. Change-Id: Ifef771a96938c7ff0f8b664142bb502030b8c543
* | | | Implement issue #3116702: New manifest tags for supported screen sizesDianne Hackborn2010-10-221-9/+50
| | | | | | | | | | | | | | | | | | | | | | | | Merged from GB. Change-Id: I94730b54bcacd083f77708e84c35f4932a7b9d2e
* | | | am b58af2b8: am 5c62ab0a: Merge "Adding a new <uses-gl-texture/> tag, to be ↵Dan Morrill2010-10-151-0/+9
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | used to enable apps to specify filtering based on support for OpenGL ES texture and texture compression formats." into gingerbread Merge commit 'b58af2b8b3871436942d0e2c878c906bffaa2fb0' * commit 'b58af2b8b3871436942d0e2c878c906bffaa2fb0': Adding a new <uses-gl-texture/> tag, to be used to enable apps to specify
| * | | 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
* | | | resolved conflicts for merge of 10d5b096 to masterDianne Hackborn2010-10-041-8/+10
|\ \ \ \ | | | | | | | | | | | | | | | Change-Id: Id5c6ba651f72b48f0d70ee2ca64a6c9adf5e74f7
| * \ \ \ am 407f625a: Add new API to find out whether external storage is removable.Dianne Hackborn2010-10-041-8/+10
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '407f625a9b8e356e765a5ec587c443af1f3aadb5' into gingerbread-plus-aosp * commit '407f625a9b8e356e765a5ec587c443af1f3aadb5': Add new API to find out whether external storage is removable.
| | * | | 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
* | | | | am 9c708358: am 37cedce1: Merge "Add an aapt option to allow string ↵Eric Fischer2010-09-233-5/+95
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | variations for different devices." into gingerbread Merge commit '9c70835896b6c078ac4c8b2e30cb6cfba70bb9d7' * commit '9c70835896b6c078ac4c8b2e30cb6cfba70bb9d7': Add an aapt option to allow string variations for different devices.
| * | | | am 37cedce1: Merge "Add an aapt option to allow string variations for ↵Eric Fischer2010-09-233-5/+95
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | different devices." into gingerbread Merge commit '37cedce14bc0e68e8bf27c2cecb181728226e6ed' into gingerbread-plus-aosp * commit '37cedce14bc0e68e8bf27c2cecb181728226e6ed': Add an aapt option to allow string variations for different devices.
| | * | | 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
* | | | | am fa888784: am 89fef418: Merge "Avoid pre-processing images when they ↵Xavier Ducrohet2010-09-101-1/+3
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | won\'t be used" Merge commit 'fa8887848e2877dd96e853dfcd52086f1b66c26b' * commit 'fa8887848e2877dd96e853dfcd52086f1b66c26b': Avoid pre-processing images when they won't be used
| * | | | am 89fef418: Merge "Avoid pre-processing images when they won\'t be used"Xavier Ducrohet2010-09-101-1/+3
| |\ \ \ \ | | |/ / / | |/| / / | | |/ / | | | | | | | | | | | | Merge commit '89fef4183a3c58aebbbf66e894bbdc1ae9f634e9' into gingerbread-plus-aosp * commit '89fef4183a3c58aebbbf66e894bbdc1ae9f634e9': Avoid pre-processing images when they won't be used
| | * | Avoid pre-processing images when they won't be usedAnthony Newnam2010-09-031-1/+3
| | | | | | | | | | | | | | | | Change-Id: Iffa31228ca95a2e29ccc0aa81bda0fc66922d577
| | * | Add a --debug-mode option to aapt.Xavier Ducrohet2010-08-313-2/+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: I909759caef499a91d10cc9a0902c6448c87e75ef
* | | am 31103928: am 192b56d4: Merge "Implement #2964234: Add support for ↵Dianne Hackborn2010-09-021-0/+9
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | <uses-package> element to aapt" into gingerbread Merge commit '31103928ed5b9091bcd7de74c8a49675d10c87e7' * commit '31103928ed5b9091bcd7de74c8a49675d10c87e7': Implement #2964234: Add support for <uses-package> element to aapt
| * | Implement #2964234: Add support for <uses-package> element to aaptDianne Hackborn2010-09-021-0/+9
| | | | | | | | | | | | Change-Id: Ifb381f387cab7e5a99006691e330d0e3d9d0f250
* | | am b4649ec7: am 23827557: Merge "Add a --debug-mode option to aapt." into ↵Xavier Ducrohet2010-08-313-3/+18
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | gingerbread Merge commit 'b4649ec720fa959b700a7a03c089bfdc61321d16' * commit 'b4649ec720fa959b700a7a03c089bfdc61321d16': Add a --debug-mode option to aapt.