summaryrefslogtreecommitdiffstats
path: root/tools/aapt
Commit message (Collapse)AuthorAgeFilesLines
* 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.
| * | 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
* | | am eb0e0f46: am 2e7427f3: Merge "Add LFH offset to verbose list of APK" into ↵Kenny Root2010-08-252-8/+9
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | gingerbread Merge commit 'eb0e0f465155bc9ec2c79741890fb65bd403e33a' * commit 'eb0e0f465155bc9ec2c79741890fb65bd403e33a': Add LFH offset to verbose list of APK
| * | 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
* | | am 8b569c8d: am 42f90ca5: Merge "Fix aapt dump badging to support xlarge ↵Dianne Hackborn2010-08-241-0/+9
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | screens." into gingerbread Merge commit '8b569c8d49924d849793513a5418ef0350320962' * commit '8b569c8d49924d849793513a5418ef0350320962': Fix aapt dump badging to support xlarge screens.
| * \ \ am 42f90ca5: Merge "Fix aapt dump badging to support xlarge screens." into ↵Dianne Hackborn2010-08-201-0/+9
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | gingerbread Merge commit '42f90ca54fc4c6e0bdbde7caa7d10b6090d11960' into gingerbread-plus-aosp * commit '42f90ca54fc4c6e0bdbde7caa7d10b6090d11960': Fix aapt dump badging to support xlarge screens.
| | * | Fix aapt dump badging to support xlarge screens.Dianne Hackborn2010-08-201-0/+9
| | | | | | | | | | | | | | | | Change-Id: Ieeb757cd48ad9b3f46c5e4aed9d5efaeac834049
* | | | Update aapt to find fragment references.Dianne Hackborn2010-08-201-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Add knowledge about <fragment class="..."> for layout files and update to reflect the change of the header tag from Header. Change-Id: I91e2a5f204a8e222367985383c1721030c7954d8
* | | | am 8cfd3c01: am e05184f2: Merge "Output proguard keep flags for fragment ↵Ying Wang2010-08-161-18/+48
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | classes." into gingerbread Merge commit '8cfd3c01e4582a587765588c02234527e7808ca0' * commit '8cfd3c01e4582a587765588c02234527e7808ca0': Output proguard keep flags for fragment classes.
| * | | am e05184f2: Merge "Output proguard keep flags for fragment classes." into ↵Ying Wang2010-08-131-18/+48
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | gingerbread Merge commit 'e05184f271f9882a5bf828e353aea40e0c06ff69' into gingerbread-plus-aosp * commit 'e05184f271f9882a5bf828e353aea40e0c06ff69': Output proguard keep flags for fragment classes.
| | * | 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
* | | | | am d22a1e89: am 244152bf: Merge "Change aapt\'s warning message to suggest ↵Eric Fischer2010-08-161-1/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | formatted="false", not "true"." into gingerbread Merge commit 'd22a1e896cbc7e86d57be9923d749b017b3cde79' * commit 'd22a1e896cbc7e86d57be9923d749b017b3cde79': Change aapt's warning message to suggest formatted="false", not "true".
| * | | | am 244152bf: Merge "Change aapt\'s warning message to suggest ↵Eric Fischer2010-08-131-1/+1
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | formatted="false", not "true"." into gingerbread Merge commit '244152bfb9020341953d3e541c85eb3961806378' into gingerbread-plus-aosp * commit '244152bfb9020341953d3e541c85eb3961806378': Change aapt's warning message to suggest formatted="false", not "true".
| | * | | 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
| * | | | am 7525c2cf: Merge "Add --max-res-version flag to aapt." into gingerbreadFicus Kirkpatrick2010-08-133-0/+26
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '7525c2cfbbaa5c947c029008ef490e93a50c064f' into gingerbread-plus-aosp * commit '7525c2cfbbaa5c947c029008ef490e93a50c064f': Add --max-res-version flag to aapt.
| | * | | 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
* | | | 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 gingerbread. Change-Id: I71b889540380cb10bafb40f72582d3af785ae33a
generated by cgit v1.1 at 2024-10-30 11:34:57 +0000