summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Collapse)AuthorAgeFilesLines
* resolved conflicts for merge of ad2fa35d to masterTom Taylor2009-12-222-2/+2
|\ | | | | | | Change-Id: Ia4362cd48ac0689b91003943a4cd9660da72ff90
| * am d4a4729c: Update imports to android-commonTom Taylor2009-12-212-2/+2
| |\ | | | | | | | | | | | | | | | | | | Merge commit 'd4a4729c0cac582a2dcec7c8cfb316b81885a0f0' into eclair-mr2-plus-aosp * commit 'd4a4729c0cac582a2dcec7c8cfb316b81885a0f0': Update imports to android-common
| | * Update imports to android-commonTom Taylor2009-12-212-2/+2
| | | | | | | | | | | | | | | Several files were moved to android-common. Update all the references to import those files from the new location.
* | | am 451c850f: am 15f1bfb0: Merge change I70d0bddb into eclair-mr2Kenny Root2009-12-142-9/+17
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit '451c850fd60aca5372810a5413636fda25d93438' * commit '451c850fd60aca5372810a5413636fda25d93438': Revise aapt options for UTF8/16 encoding
| * | am 15f1bfb0: Merge change I70d0bddb into eclair-mr2Kenny Root2009-12-142-9/+17
| |\ \ | | |/ | | | | | | | | | | | | | | | Merge commit '15f1bfb0d29915ed1790b22a00fd7032f035ddb0' into eclair-mr2-plus-aosp * commit '15f1bfb0d29915ed1790b22a00fd7032f035ddb0': Revise aapt options for UTF8/16 encoding
| | * Merge change I70d0bddb into eclair-mr2Android (Google) Code Review2009-12-142-9/+17
| | |\ | | | | | | | | | | | | | | | | * changes: Revise aapt options for UTF8/16 encoding
| | | * Revise aapt options for UTF8/16 encodingKenny Root2009-12-112-9/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove option to force UTF-8 encoding which could corrupt packages meant for systems before API level 7. Added switch to allow encoding for UTF-16 which will allow API 7 and later to encode resources in UTF-16. Change-Id: I70d0bddb0dfd12dcbd08c95f613dcfe896ae680b
* | | | am 092de0a9: am a7d461e0: am 62d4395b: Merge change I6dc8a694 into eclairXavier Ducrohet2009-12-131-0/+3
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | Merge commit '092de0a989dc3e81a957938670fb147f34afaa36' * commit '092de0a989dc3e81a957938670fb147f34afaa36': Layoutlib: Add a constant for default density value.
| * | | am a7d461e0: am 62d4395b: Merge change I6dc8a694 into eclairXavier Ducrohet2009-12-131-0/+3
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | Merge commit 'a7d461e09adf716c2148b45a5d94f5b8cb37f9ba' into eclair-mr2-plus-aosp * commit 'a7d461e09adf716c2148b45a5d94f5b8cb37f9ba': Layoutlib: Add a constant for default density value.
| | * | am 62d4395b: Merge change I6dc8a694 into eclairXavier Ducrohet2009-12-131-0/+3
| | |\ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | Merge commit '62d4395bdb3114b9a75e46140456bc54fd13a3e7' into eclair-mr2 * commit '62d4395bdb3114b9a75e46140456bc54fd13a3e7': Layoutlib: Add a constant for default density value.
| | | * Layoutlib: Add a constant for default density value.Xavier Ducrohet2009-12-111-0/+3
| | | | | | | | | | | | | | | | Change-Id: I6dc8a694bbdae2385d4e877ea04a6b4325a5719e
* | | | am cdbf5746: am b5ef7ee1: Default to UTF8 resources when packaging with aaptKenny Root2009-12-112-3/+37
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | Merge commit 'cdbf5746fcbee26bed74090e22aff761d1b4da3b' * commit 'cdbf5746fcbee26bed74090e22aff761d1b4da3b': Default to UTF8 resources when packaging with aapt
| * | | am b5ef7ee1: Default to UTF8 resources when packaging with aaptKenny Root2009-12-102-3/+37
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | Merge commit 'b5ef7ee1644b099498ddd29c1d051e7ee26ccfd3' into eclair-mr2-plus-aosp * commit 'b5ef7ee1644b099498ddd29c1d051e7ee26ccfd3': Default to UTF8 resources when packaging with aapt
| | * | Default to UTF8 resources when packaging with aaptKenny Root2009-12-102-3/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change makes it so with API level 7 and above all resources will be packaged in UTF-8 format. Any minSdkVersion level that is named will also have resources packaged in UTF-8, because it is assumed that previous releases will only be rebuilt with their proper integer number and only future releases will temporarily have names. Change-Id: If5d1ee5e48fbaf31798816b068ac44b14a93121b
* | | | am 926d1a22: am a5a8cc13: resolved conflicts for merge of ce307f88 to eclair-mr2Jean-Baptiste Queru2009-12-103-6/+25
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | Merge commit '926d1a22007d94ef2b29ec979ab6038fa8d9e40e' * commit '926d1a22007d94ef2b29ec979ab6038fa8d9e40e': Add --custom-package to aapt
| * | | am a5a8cc13: resolved conflicts for merge of ce307f88 to eclair-mr2Jean-Baptiste Queru2009-12-103-6/+25
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | Merge commit 'a5a8cc13d3f906650a1eb17e20e1b26d68b78453' into eclair-mr2-plus-aosp * commit 'a5a8cc13d3f906650a1eb17e20e1b26d68b78453': Add --custom-package to aapt
| | * | resolved conflicts for merge of ce307f88 to eclair-mr2Jean-Baptiste Queru2009-12-103-6/+25
| | |\ \ | | | |/
| | | * Add --custom-package to aaptXavier Ducrohet2009-11-303-6/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is needed to add library support to the SDK. The goal is to have libraries and main project use the same package for the R/Manifest classes to that they can share code and resources. BUG 2293994 Change-Id: Ie4cdb5a3bdabe1760a91316fd8969e4f53344bf9
* | | | am 5cd6fcd5: am e6c0e993: Merge change I129483f8 into eclair-mr2Kenny Root2009-12-1010-23/+90
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | Merge commit '5cd6fcd518d47d1974a10fccf3c3d5431a83307a' * commit '5cd6fcd518d47d1974a10fccf3c3d5431a83307a': Optional use of UTF-8 strings in resource bundles
| * | | am e6c0e993: Merge change I129483f8 into eclair-mr2Kenny Root2009-12-0910-23/+90
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | Merge commit 'e6c0e99334bc2f47e5d36db253ac8f166047c03b' into eclair-mr2-plus-aosp * commit 'e6c0e99334bc2f47e5d36db253ac8f166047c03b': Optional use of UTF-8 strings in resource bundles
| | * | Optional use of UTF-8 strings in resource bundlesKenny Root2009-12-0710-23/+90
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allows the use of UTF-8 for packing resources instead of the default of UTF-16 for Java. When strings are extracted from the ResStringPool, they are converted to UTF-16 and the result is cached for subsequent calls. When using aapt to package, add in the "-8" switch to pack the resources using UTF-8. This will result in the value, key, and type strings as well as the compiled XML string values taking significantly less space in the final application package in most scenarios. Change-Id: I129483f8b3d3b1c5869dced05cb525e494a6c83a
| | * | Fix bitmask in aapt's StringPool length constructionKenny Root2009-12-041-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.
* | | am fe11d1a7: am 43e9eb28: am 9ddb7df8: Fix build.Dianne Hackborn2009-11-171-6/+6
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit 'fe11d1a7a5480737c9331531592d4c70f374198e' * commit 'fe11d1a7a5480737c9331531592d4c70f374198e': Fix build.
| * | am 43e9eb28: am 9ddb7df8: Fix build.Dianne Hackborn2009-11-161-6/+6
| |\ \ | | |/ | | | | | | | | | | | | | | | Merge commit '43e9eb28ab9a246472149384567f505434f492a3' into eclair-mr2-plus-aosp * commit '43e9eb28ab9a246472149384567f505434f492a3': Fix build.
| | * Fix build.Dianne Hackborn2009-11-161-6/+6
| | | | | | | | | | | | Change-Id: I70c86738e2894d7f8c51034aea8fda1585a6fcb3
* | | am 1bd7261d: am 1ddc0077: am 19e420c5: Merge change Iae493184 into eclairXavier Ducrohet2009-11-171-8/+11
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit '1bd7261d2b595552ac852ca8ed8a5e184bd10b44' * commit '1bd7261d2b595552ac852ca8ed8a5e184bd10b44': Minor fix for the parent style computation in the layoutlib.
| * | am 1ddc0077: am 19e420c5: Merge change Iae493184 into eclairXavier Ducrohet2009-11-161-8/+11
| |\ \ | | |/ | | | | | | | | | | | | | | | Merge commit '1ddc0077ac0c26a9dc74875791bfea3f34a8cc7b' into eclair-mr2-plus-aosp * commit '1ddc0077ac0c26a9dc74875791bfea3f34a8cc7b': Minor fix for the parent style computation in the layoutlib.
| | * Minor fix for the parent style computation in the layoutlib.Xavier Ducrohet2009-11-151-8/+11
| | | | | | | | | | | | | | | | | | This is an SDK change only. Change-Id: Iae493184ae76b2e21200dd6bb48795ff74f79ab3
* | | am 85a612d0: am b2d7c60f: am ae210437: Merge change I7082e366 into eclairXavier Ducrohet2009-11-131-2/+12
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit '85a612d03eded507c8981716277a1f4b5526ea22' * commit '85a612d03eded507c8981716277a1f4b5526ea22': Properly implement Paint.breakText for layoutlib.
| * | am b2d7c60f: am ae210437: Merge change I7082e366 into eclairXavier Ducrohet2009-11-131-2/+12
| |\ \ | | |/ | | | | | | | | | | | | | | | Merge commit 'b2d7c60f125e243d915fae037b30f54110f1b237' into eclair-mr2-plus-aosp * commit 'b2d7c60f125e243d915fae037b30f54110f1b237': Properly implement Paint.breakText for layoutlib.
| | * Properly implement Paint.breakText for layoutlib.Xavier Ducrohet2009-11-131-2/+12
| | | | | | | | | | | | | | | | | | BUG 2260400 Change-Id: I7082e366b65da0b5de2a6dbb547f66e05e0b78e0
* | | am eac4222f: am 949ffa3d: am 11cff8cd: Merge change Ie211adae into eclairMarco Nelissen2009-11-091-2/+4
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit 'eac4222f7f30bf1df14b223cf62e594914dd32d4' * commit 'eac4222f7f30bf1df14b223cf62e594914dd32d4': Add a way for wallpapers to know the delta between virtual screens.
| * | am 949ffa3d: am 11cff8cd: Merge change Ie211adae into eclairMarco Nelissen2009-11-091-2/+4
| |\ \ | | |/ | | | | | | | | | | | | | | | Merge commit '949ffa3da5231772425c3bde50caeab6c4d08ec5' into eclair-mr2-plus-aosp * commit '949ffa3da5231772425c3bde50caeab6c4d08ec5': Add a way for wallpapers to know the delta between virtual screens.
| | * Add a way for wallpapers to know the delta between virtual screens.Marco Nelissen2009-11-091-2/+4
| | |
* | | am 3969e50a: am aa10b9fb: am e6ab011b: Merge change Ib12bcb7f into eclairXavier Ducrohet2009-11-094-120/+333
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit '3969e50a2872014e459b802e2e654b901eecc574' * commit '3969e50a2872014e459b802e2e654b901eecc574': Support for fallback fonts in layoutlib.
| * | am aa10b9fb: am e6ab011b: Merge change Ib12bcb7f into eclairXavier Ducrohet2009-11-094-120/+333
| |\ \ | | |/ | | | | | | | | | | | | | | | Merge commit 'aa10b9fb52db88e3cc9045019f42fa83e9da9868' into eclair-mr2-plus-aosp * commit 'aa10b9fb52db88e3cc9045019f42fa83e9da9868': Support for fallback fonts in layoutlib.
| | * Support for fallback fonts in layoutlib.Xavier Ducrohet2009-11-094-120/+333
| | | | | | | | | | | | | | | | | | BUG 2041229 Change-Id: Ib12bcb7f6d8f0e4c2b51871f8129ecf51fa938ee
* | | am 5b40ead8: am 0d55daff: am 5fc71e67: am 00e44ef2: Merge change I54545dfd ↵Dirk Dougherty2009-11-042-9/+9
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | into eclair-sdk Merge commit '5b40ead81bdd350c3f4a585d851d91e5bec0c5c6' * commit '5b40ead81bdd350c3f4a585d851d91e5bec0c5c6': doc change: fix broken R.styleable formatting (caused by missing periods). Adjust table markup.
| * | am 0d55daff: am 5fc71e67: am 00e44ef2: Merge change I54545dfd into eclair-sdkDirk Dougherty2009-11-042-9/+9
| |\ \ | | |/ | | | | | | | | | | | | | | | Merge commit '0d55daffc31c123dcf83f6db85f8198854ddc564' into eclair-mr2-plus-aosp * commit '0d55daffc31c123dcf83f6db85f8198854ddc564': doc change: fix broken R.styleable formatting (caused by missing periods). Adjust table markup.
| | * am 00e44ef2: Merge change I54545dfd into eclair-sdkDirk Dougherty2009-11-042-9/+9
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '00e44ef21777f32b67a8d51ee375cd290a3fb2d4' into eclair * commit '00e44ef21777f32b67a8d51ee375cd290a3fb2d4': doc change: fix broken R.styleable formatting (caused by missing periods). Adjust table markup.
| | | * doc change: fix broken R.styleable formatting (caused by missing periods). ↵Dirk Dougherty2009-11-032-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Adjust table markup. Bug: 2230588 Change-Id: I54545dfd9d26acef567e586cfc916f6b883a4de7
* | | | am 8e59b032: am 4899daa0: am c54e0ce9: Merge change Ia86f2849 into eclairBrett Chabot2009-11-032-2/+2
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | Merge commit '8e59b032c34b1b9fe42235ce59c5daaba59ee30c' * commit '8e59b032c34b1b9fe42235ce59c5daaba59ee30c': Fix layoutlib tests so they pas when run from Eclipse workbench.
| * | | am 4899daa0: am c54e0ce9: Merge change Ia86f2849 into eclairBrett Chabot2009-11-032-2/+2
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | Merge commit '4899daa0c8e747cd3c0ecf1c6ceeec022f6c7524' into eclair-mr2-plus-aosp * commit '4899daa0c8e747cd3c0ecf1c6ceeec022f6c7524': Fix layoutlib tests so they pas when run from Eclipse workbench.
| | * | Fix layoutlib tests so they pas when run from Eclipse workbench.Brett Chabot2009-11-032-2/+2
| | | | | | | | | | | | | | | | Bug 2222616
* | | | am 8368e510: am c6bead14: am 7580493b: Implement feature #2117336: Create ↵Dianne Hackborn2009-10-221-0/+19
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | event communication APIs for live wallpaper Merge commit '8368e510a90ab30a9f850144f5adabb0455d26f9' * commit '8368e510a90ab30a9f850144f5adabb0455d26f9': Implement feature #2117336: Create event communication APIs for live wallpaper
| * | | am c6bead14: am 7580493b: Implement feature #2117336: Create event ↵Dianne Hackborn2009-10-221-0/+19
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | communication APIs for live wallpaper Merge commit 'c6bead14fe6fe70bcfd8802ee9f0259476a074ce' into eclair-mr2-plus-aosp * commit 'c6bead14fe6fe70bcfd8802ee9f0259476a074ce': Implement feature #2117336: Create event communication APIs for live wallpaper
| | * | Implement feature #2117336: Create event communication APIs for live wallpaperDianne Hackborn2009-10-221-0/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Note: currently only implements an async version (no result), and not yet actually tested. Change-Id: Id47ed045a4b0eb309ea8c58daf41a0e03eff1d3a
| | * | add "junk path" -k option to aapt (DO NOT MERGE)Doug Zongker2009-10-193-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. (This is a cherry-pick of a change already submitted to eclair-mr2; the change was approved for mr1.)
* | | am b80d1d0c: am afbf8afa: Merge change I564b5b00 into eclair-mr2Doug Zongker2009-10-133-8/+22
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit 'b80d1d0cc8b75b9e51c94169892f1d03cdcd788a' * commit 'b80d1d0cc8b75b9e51c94169892f1d03cdcd788a': add "junk path" -k option to aapt
| * | 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
generated by cgit v1.1 at 2025-02-10 01:32:10 +0000