summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | * | add "junk path" -k option to aaptDoug Zongker2009-10-133-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.
* | | am 4ab1b3a2: am 88fb78d2: am 5f9d4bae: layout lib tests cleanupXavier Ducrohet2009-10-125-320/+17
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit '4ab1b3a292216620cbf7cb6f424e6a159f138dd1' * commit '4ab1b3a292216620cbf7cb6f424e6a159f138dd1': layout lib tests cleanup
| * | am 88fb78d2: am 5f9d4bae: layout lib tests cleanupXavier Ducrohet2009-10-065-320/+17
| |\ \ | | |/ | | | | | | | | | | | | | | | Merge commit '88fb78d2091764e1265976bdb7027f7785f0b33b' into eclair-mr2-plus-aosp * commit '88fb78d2091764e1265976bdb7027f7785f0b33b': layout lib tests cleanup
| | * layout lib tests cleanupXavier Ducrohet2009-10-065-320/+17
| | | | | | | | | | | | | | | | | | | | | | | | - Move test files to their own package for easy binary inclusion in adt-test - fix some tests and remove obsolete ones. Change-Id: I5b967f29074fdad74073f9b37d903eabe8dc29e6
* | | am 66ce0f07: am c7bade2a: am 0a9d46b7: Add a test to make sure the replaced ↵Xavier Ducrohet2009-10-122-6/+146
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | classes in layoutlib are correct. Merge commit '66ce0f07fcb79b97dc52aa0a1c5fce1565f4f090' * commit '66ce0f07fcb79b97dc52aa0a1c5fce1565f4f090': Add a test to make sure the replaced classes in layoutlib are correct.
| * | am c7bade2a: am 0a9d46b7: Add a test to make sure the replaced classes in ↵Xavier Ducrohet2009-10-062-6/+146
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | layoutlib are correct. Merge commit 'c7bade2a910d3fd34275440d1cc8bb9c0c9a989a' into eclair-mr2-plus-aosp * commit 'c7bade2a910d3fd34275440d1cc8bb9c0c9a989a': Add a test to make sure the replaced classes in layoutlib are correct.
| | * Add a test to make sure the replaced classes in layoutlib are correct.Xavier Ducrohet2009-10-062-6/+146
| | | | | | | | | | | | Change-Id: I9641635153c12e2c0a23583f7d094767533fc683
* | | am 3557d5bc: am 9cf2bbb0: am 841a8eea: Merge change I24895c35 into eclairXavier Ducrohet2009-10-121-69/+294
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit '3557d5bc9eb8ac33641430ca52d8e2121d0f1a4b' * commit '3557d5bc9eb8ac33641430ca52d8e2121d0f1a4b': Reimplement all the method of Paint for layoutlib
| * | am 9cf2bbb0: am 841a8eea: Merge change I24895c35 into eclairXavier Ducrohet2009-10-061-69/+294
| |\ \ | | |/ | | | | | | | | | | | | | | | Merge commit '9cf2bbb08c0eb66bcfa45a03d4b21cac78be8e99' into eclair-mr2-plus-aosp * commit '9cf2bbb08c0eb66bcfa45a03d4b21cac78be8e99': Reimplement all the method of Paint for layoutlib
| | * Reimplement all the method of Paint for layoutlibXavier Ducrohet2009-10-051-69/+294
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There were a few missing methods that should have been reimplmented (because they were native). Others have been added just to be sure so that we can test whether methods are missing or not (test coming soon). Change-Id: I24895c353e38545e9b1abe28d41224fdc78cadb1
* | | am 636d9cd6: am 5becdc32: am a970bf52: Merge change I34f51342 into eclairXavier Ducrohet2009-10-126-67/+53
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit '636d9cd63b77a87e6cb627a90cc8f37e81bedb14' * commit '636d9cd63b77a87e6cb627a90cc8f37e81bedb14': Fix the layoutlib test to run from adt-tests.
| * | am 5becdc32: am a970bf52: Merge change I34f51342 into eclairXavier Ducrohet2009-10-056-67/+53
| |\ \ | | |/ | | | | | | | | | | | | | | | Merge commit '5becdc32c899f1e8031f5a694c064cb559a8fc88' into eclair-mr2-plus-aosp * commit '5becdc32c899f1e8031f5a694c064cb559a8fc88': Fix the layoutlib test to run from adt-tests.
| | * Fix the layoutlib test to run from adt-tests.Xavier Ducrohet2009-10-056-67/+53
| | | | | | | | | | | | Change-Id: I34f513429593dce9f781ed8a08c4664a5d6f9aa8
* | | am 5903a83d: am 864cbf5f: am 71060f29: Merge change I8874a405 into eclairXavier Ducrohet2009-10-123-38/+86
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit '5903a83df1ebca83ce1e9a05f11a21701db48692' * commit '5903a83df1ebca83ce1e9a05f11a21701db48692': Refactor class/method names used by layoutlib_create.
| * | am 864cbf5f: am 71060f29: Merge change I8874a405 into eclairXavier Ducrohet2009-10-053-38/+86
| |\ \ | | |/ | | | | | | | | | | | | | | | Merge commit '864cbf5f9396f35eafd90ad58911b5d280d8eab8' into eclair-mr2-plus-aosp * commit '864cbf5f9396f35eafd90ad58911b5d280d8eab8': Refactor class/method names used by layoutlib_create.
| | * Refactor class/method names used by layoutlib_create.Xavier Ducrohet2009-10-053-38/+86
| | | | | | | | | | | | | | | | | | | | | Information about classes and methods that are replaced, renamed, removed into CreateInfo, so that it can be used by the tests. Change-Id: I8874a40503249416621aa90b2ca02dcaf30ecd57
* | | am 25c70dd9: am 279ba943: Merge change I7c7b1596 into eclairXavier Ducrohet2009-09-291-1/+2
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit '25c70dd9a13a0ff631e4d3911fceaea863ec2586' * commit '25c70dd9a13a0ff631e4d3911fceaea863ec2586': Fix a warning output.
| * | am 279ba943: Merge change I7c7b1596 into eclairXavier Ducrohet2009-09-281-1/+2
| |\ \ | | |/ | | | | | | | | | | | | | | | Merge commit '279ba943553ec2368d14e1b3c8a88c36bf17785d' into eclair-plus-aosp * commit '279ba943553ec2368d14e1b3c8a88c36bf17785d': Fix a warning output.
| | * Fix a warning output.Xavier Ducrohet2009-09-281-1/+2
| | | | | | | | | | | | | | | | | | This was introduced by the dpi work. Change-Id: I7c7b1596085f70532b8279139c287a2a58f57046
* | | am 04165371: am 20b39471: Merge change 26933 into eclairRaphael2009-09-251-0/+4
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit '041653714524b37972169071e7569d2432ae8747' * commit '041653714524b37972169071e7569d2432ae8747': AAPT: Ignore visual source safe files in resources
| * | am 20b39471: Merge change 26933 into eclairRaphael2009-09-241-0/+4
| |\ \ | | |/ | | | | | | | | | | | | | | | Merge commit '20b394719daa218be7ff767fad024504f12e937b' into eclair-plus-aosp * commit '20b394719daa218be7ff767fad024504f12e937b': AAPT: Ignore visual source safe files in resources
| | * AAPT: Ignore visual source safe files in resourcesRaphael2009-09-241-0/+4
| | | | | | | | | | | | BUG 1895888