408 Commits

Author SHA1 Message Date
Kenny Root
30cee478b7 am 5cd6fcd5: am e6c0e993: Merge change I129483f8 into eclair-mr2
Merge commit '5cd6fcd518d47d1974a10fccf3c3d5431a83307a'

* commit '5cd6fcd518d47d1974a10fccf3c3d5431a83307a':
  Optional use of UTF-8 strings in resource bundles
2009-12-10 07:06:45 -08:00
Xavier Ducrohet
9af0c6facb am ce307f88: Merge change Ie4cdb5a3 into eclair
Merge commit 'ce307f889b509143899a2221359219fbc91b618c' into eclair-plus-aosp

* commit 'ce307f889b509143899a2221359219fbc91b618c':
  Add --custom-package to aapt
2009-12-09 18:25:28 -08:00
Kenny Root
5cd6fcd518 am e6c0e993: Merge change I129483f8 into eclair-mr2
Merge commit 'e6c0e99334bc2f47e5d36db253ac8f166047c03b' into eclair-mr2-plus-aosp

* commit 'e6c0e99334bc2f47e5d36db253ac8f166047c03b':
  Optional use of UTF-8 strings in resource bundles
2009-12-09 15:51:21 -08:00
Kenny Root
19138468ca Optional use of UTF-8 strings in resource bundles
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
2009-12-07 15:14:15 -08:00
Kenny Root
88721afe2f Fix bitmask in aapt's StringPool length construction
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.
2009-12-04 13:40:54 -08:00
Xavier Ducrohet
63459ad555 Add --custom-package to aapt
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
2009-11-30 18:05:10 -08:00
Dianne Hackborn
4b815942d1 am fe11d1a7: am 43e9eb28: am 9ddb7df8: Fix build.
Merge commit 'fe11d1a7a5480737c9331531592d4c70f374198e'

* commit 'fe11d1a7a5480737c9331531592d4c70f374198e':
  Fix build.
2009-11-17 07:37:47 -08:00
Xavier Ducrohet
fc42f828c8 am 1bd7261d: am 1ddc0077: am 19e420c5: Merge change Iae493184 into eclair
Merge commit '1bd7261d2b595552ac852ca8ed8a5e184bd10b44'

* commit '1bd7261d2b595552ac852ca8ed8a5e184bd10b44':
  Minor fix for the parent style computation in the layoutlib.
2009-11-17 07:30:18 -08:00
Dianne Hackborn
fe11d1a7a5 am 43e9eb28: am 9ddb7df8: Fix build.
Merge commit '43e9eb28ab9a246472149384567f505434f492a3' into eclair-mr2-plus-aosp

* commit '43e9eb28ab9a246472149384567f505434f492a3':
  Fix build.
2009-11-16 20:04:59 -08:00
Dianne Hackborn
24c9c9db9f am 9ddb7df8: Fix build.
Merge commit '9ddb7df88a62a131519264f75f5d6616ee11b6e6' into eclair-plus-aosp

* commit '9ddb7df88a62a131519264f75f5d6616ee11b6e6':
  Fix build.
2009-11-16 18:05:34 -08:00
Dianne Hackborn
9ddb7df88a Fix build.
Change-Id: I70c86738e2894d7f8c51034aea8fda1585a6fcb3
2009-11-16 17:59:32 -08:00
Xavier Ducrohet
1bd7261d2b am 1ddc0077: am 19e420c5: Merge change Iae493184 into eclair
Merge commit '1ddc0077ac0c26a9dc74875791bfea3f34a8cc7b' into eclair-mr2-plus-aosp

* commit '1ddc0077ac0c26a9dc74875791bfea3f34a8cc7b':
  Minor fix for the parent style computation in the layoutlib.
2009-11-16 14:40:22 -08:00
Xavier Ducrohet
a4cf232df8 am 19e420c5: Merge change Iae493184 into eclair
Merge commit '19e420c52dbe42e5b4b8b3580a5e7908cebec89d' into eclair-plus-aosp

* commit '19e420c52dbe42e5b4b8b3580a5e7908cebec89d':
  Minor fix for the parent style computation in the layoutlib.
2009-11-16 11:27:03 -08:00
Xavier Ducrohet
0da2676ea8 Minor fix for the parent style computation in the layoutlib.
This is an SDK change only.

Change-Id: Iae493184ae76b2e21200dd6bb48795ff74f79ab3
2009-11-15 16:15:33 -08:00
Jean-Baptiste Queru
478de466ce merge from eclair 2009-11-15 12:06:23 -08:00
Xavier Ducrohet
600627c312 am 85a612d0: am b2d7c60f: am ae210437: Merge change I7082e366 into eclair
Merge commit '85a612d03eded507c8981716277a1f4b5526ea22'

* commit '85a612d03eded507c8981716277a1f4b5526ea22':
  Properly implement Paint.breakText for layoutlib.
2009-11-13 15:55:07 -08:00
Xavier Ducrohet
85a612d03e am b2d7c60f: am ae210437: Merge change I7082e366 into eclair
Merge commit 'b2d7c60f125e243d915fae037b30f54110f1b237' into eclair-mr2-plus-aosp

* commit 'b2d7c60f125e243d915fae037b30f54110f1b237':
  Properly implement Paint.breakText for layoutlib.
2009-11-13 15:51:09 -08:00
Xavier Ducrohet
a855b27ea3 am ae210437: Merge change I7082e366 into eclair
Merge commit 'ae2104371d84570011dbb8c1621832a132ed4584' into eclair-plus-aosp

* commit 'ae2104371d84570011dbb8c1621832a132ed4584':
  Properly implement Paint.breakText for layoutlib.
2009-11-13 15:46:46 -08:00
Xavier Ducrohet
76410f1eb3 Properly implement Paint.breakText for layoutlib.
BUG 2260400

Change-Id: I7082e366b65da0b5de2a6dbb547f66e05e0b78e0
2009-11-13 14:10:20 -08:00
Jean-Baptiste Queru
9db3d07b96 eclair snapshot 2009-11-13 13:53:39 -08:00
Marco Nelissen
430785f66d am eac4222f: am 949ffa3d: am 11cff8cd: Merge change Ie211adae into eclair
Merge commit 'eac4222f7f30bf1df14b223cf62e594914dd32d4'

* commit 'eac4222f7f30bf1df14b223cf62e594914dd32d4':
  Add a way for wallpapers to know the delta between virtual screens.
2009-11-09 19:42:13 -08:00
Marco Nelissen
eac4222f7f am 949ffa3d: am 11cff8cd: Merge change Ie211adae into eclair
Merge commit '949ffa3da5231772425c3bde50caeab6c4d08ec5' into eclair-mr2-plus-aosp

* commit '949ffa3da5231772425c3bde50caeab6c4d08ec5':
  Add a way for wallpapers to know the delta between virtual screens.
2009-11-09 19:38:31 -08:00
Marco Nelissen
47fc5e2a43 am 11cff8cd: Merge change Ie211adae into eclair
Merge commit '11cff8cd30f03b5adb137e985532543da5e960c4' into eclair-plus-aosp

* commit '11cff8cd30f03b5adb137e985532543da5e960c4':
  Add a way for wallpapers to know the delta between virtual screens.
2009-11-09 19:34:14 -08:00
Marco Nelissen
bf6956b1d9 Add a way for wallpapers to know the delta between virtual screens. 2009-11-09 17:39:33 -08:00
Xavier Ducrohet
75cec67e3a am 3969e50a: am aa10b9fb: am e6ab011b: Merge change Ib12bcb7f into eclair
Merge commit '3969e50a2872014e459b802e2e654b901eecc574'

* commit '3969e50a2872014e459b802e2e654b901eecc574':
  Support for fallback fonts in layoutlib.
2009-11-09 17:04:10 -08:00
Xavier Ducrohet
3969e50a28 am aa10b9fb: am e6ab011b: Merge change Ib12bcb7f into eclair
Merge commit 'aa10b9fb52db88e3cc9045019f42fa83e9da9868' into eclair-mr2-plus-aosp

* commit 'aa10b9fb52db88e3cc9045019f42fa83e9da9868':
  Support for fallback fonts in layoutlib.
2009-11-09 17:00:33 -08:00
Xavier Ducrohet
d9d0528f30 am e6ab011b: Merge change Ib12bcb7f into eclair
Merge commit 'e6ab011b8b8aa6c461e64cabb9b25d890d68edb1' into eclair-plus-aosp

* commit 'e6ab011b8b8aa6c461e64cabb9b25d890d68edb1':
  Support for fallback fonts in layoutlib.
2009-11-09 16:56:56 -08:00
Xavier Ducrohet
9a4593ffcc Support for fallback fonts in layoutlib.
BUG 2041229

Change-Id: Ib12bcb7f6d8f0e4c2b51871f8129ecf51fa938ee
2009-11-09 14:55:08 -08:00
Dirk Dougherty
51bde0577c am 5b40ead8: am 0d55daff: am 5fc71e67: am 00e44ef2: Merge change I54545dfd into eclair-sdk
Merge commit '5b40ead81bdd350c3f4a585d851d91e5bec0c5c6'

* commit '5b40ead81bdd350c3f4a585d851d91e5bec0c5c6':
  doc change: fix broken R.styleable formatting (caused by missing periods). Adjust table markup.
2009-11-04 14:42:29 -08:00
Dirk Dougherty
5b40ead81b am 0d55daff: am 5fc71e67: am 00e44ef2: Merge change I54545dfd into eclair-sdk
Merge commit '0d55daffc31c123dcf83f6db85f8198854ddc564' into eclair-mr2-plus-aosp

* commit '0d55daffc31c123dcf83f6db85f8198854ddc564':
  doc change: fix broken R.styleable formatting (caused by missing periods). Adjust table markup.
2009-11-04 14:32:34 -08:00
Dirk Dougherty
16c7f4474e am 5fc71e67: am 00e44ef2: Merge change I54545dfd into eclair-sdk
Merge commit '5fc71e67498ed64ad2d41c23471b008f93cb580e' into eclair-plus-aosp

* commit '5fc71e67498ed64ad2d41c23471b008f93cb580e':
  doc change: fix broken R.styleable formatting (caused by missing periods). Adjust table markup.
2009-11-04 14:20:55 -08:00
Dirk Dougherty
5fc71e6749 am 00e44ef2: Merge change I54545dfd into eclair-sdk
Merge commit '00e44ef21777f32b67a8d51ee375cd290a3fb2d4' into eclair

* commit '00e44ef21777f32b67a8d51ee375cd290a3fb2d4':
  doc change: fix broken R.styleable formatting (caused by missing periods). Adjust table markup.
2009-11-04 14:12:29 -08:00
Dirk Dougherty
59ad275e93 doc change: fix broken R.styleable formatting (caused by missing periods). Adjust table markup.
Bug: 2230588
Change-Id: I54545dfd9d26acef567e586cfc916f6b883a4de7
2009-11-03 15:33:37 -08:00
Brett Chabot
29e278ec7f am 8e59b032: am 4899daa0: am c54e0ce9: Merge change Ia86f2849 into eclair
Merge commit '8e59b032c34b1b9fe42235ce59c5daaba59ee30c'

* commit '8e59b032c34b1b9fe42235ce59c5daaba59ee30c':
  Fix layoutlib tests so they pas when run from Eclipse workbench.
2009-11-03 11:54:36 -08:00
Brett Chabot
8e59b032c3 am 4899daa0: am c54e0ce9: Merge change Ia86f2849 into eclair
Merge commit '4899daa0c8e747cd3c0ecf1c6ceeec022f6c7524' into eclair-mr2-plus-aosp

* commit '4899daa0c8e747cd3c0ecf1c6ceeec022f6c7524':
  Fix layoutlib tests so they pas when run from Eclipse workbench.
2009-11-03 11:44:48 -08:00
Brett Chabot
15ff8ed31f am c54e0ce9: Merge change Ia86f2849 into eclair
Merge commit 'c54e0ce964f4d38089def7ecee850a659f84bbe5' into eclair-plus-aosp

* commit 'c54e0ce964f4d38089def7ecee850a659f84bbe5':
  Fix layoutlib tests so they pas when run from Eclipse workbench.
2009-11-03 11:34:58 -08:00
Brett Chabot
a86f28494c Fix layoutlib tests so they pas when run from Eclipse workbench.
Bug 2222616
2009-11-03 10:31:31 -08:00
Dianne Hackborn
68ce35ec9a am 8368e510: am c6bead14: am 7580493b: Implement feature #2117336: Create event communication APIs for live wallpaper
Merge commit '8368e510a90ab30a9f850144f5adabb0455d26f9'

* commit '8368e510a90ab30a9f850144f5adabb0455d26f9':
  Implement feature #2117336: Create event communication APIs for live wallpaper
2009-10-22 20:42:10 -07:00
Dianne Hackborn
8368e510a9 am c6bead14: am 7580493b: Implement feature #2117336: Create event 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
2009-10-22 20:32:09 -07:00
Dianne Hackborn
53dee9654f am 7580493b: Implement feature #2117336: Create event communication APIs for live wallpaper
Merge commit '7580493b014a2c7ea883cd291255798dc72ebbff' into eclair-plus-aosp

* commit '7580493b014a2c7ea883cd291255798dc72ebbff':
  Implement feature #2117336: Create event communication APIs for live wallpaper
2009-10-22 20:21:29 -07:00
Dianne Hackborn
7580493b01 Implement feature #2117336: Create event communication APIs for live wallpaper
Note: currently only implements an async version (no result), and not yet
actually tested.

Change-Id: Id47ed045a4b0eb309ea8c58daf41a0e03eff1d3a
2009-10-22 20:10:53 -07:00
Doug Zongker
16b696af61 am 617262d8: Merge change I37c4157d into eclair
Merge commit '617262d8f57362536ddc00a070c1c0994741de44' into eclair-plus-aosp

* commit '617262d8f57362536ddc00a070c1c0994741de44':
  add "junk path" -k option to aapt (DO NOT MERGE)
2009-10-20 13:36:06 -07:00
Doug Zongker
37c4157d7c add "junk path" -k option to aapt (DO NOT MERGE)
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.)
2009-10-19 17:04:21 -07:00
Doug Zongker
98d233606a am b80d1d0c: am afbf8afa: Merge change I564b5b00 into eclair-mr2
Merge commit 'b80d1d0cc8b75b9e51c94169892f1d03cdcd788a'

* commit 'b80d1d0cc8b75b9e51c94169892f1d03cdcd788a':
  add "junk path" -k option to aapt
2009-10-13 17:10:01 -07:00
Doug Zongker
b80d1d0cc8 am afbf8afa: Merge change I564b5b00 into eclair-mr2
Merge commit 'afbf8afa858a78b66c19f11cfda030e913b34085' into eclair-mr2-plus-aosp

* commit 'afbf8afa858a78b66c19f11cfda030e913b34085':
  add "junk path" -k option to aapt
2009-10-13 13:47:54 -07:00
Doug Zongker
dbe7a68cc1 add "junk path" -k option to aapt
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.
2009-10-13 13:33:31 -07:00
Xavier Ducrohet
84436a245c am 4ab1b3a2: am 88fb78d2: am 5f9d4bae: layout lib tests cleanup
Merge commit '4ab1b3a292216620cbf7cb6f424e6a159f138dd1'

* commit '4ab1b3a292216620cbf7cb6f424e6a159f138dd1':
  layout lib tests cleanup
2009-10-12 11:47:14 -07:00
Xavier Ducrohet
a8ace6cbff am 66ce0f07: am c7bade2a: am 0a9d46b7: Add a test to make sure the replaced classes in layoutlib are correct.
Merge commit '66ce0f07fcb79b97dc52aa0a1c5fce1565f4f090'

* commit '66ce0f07fcb79b97dc52aa0a1c5fce1565f4f090':
  Add a test to make sure the replaced classes in layoutlib are correct.
2009-10-12 11:47:04 -07:00
Xavier Ducrohet
54f84d80ba am 3557d5bc: am 9cf2bbb0: am 841a8eea: Merge change I24895c35 into eclair
Merge commit '3557d5bc9eb8ac33641430ca52d8e2121d0f1a4b'

* commit '3557d5bc9eb8ac33641430ca52d8e2121d0f1a4b':
  Reimplement all the method of Paint for layoutlib
2009-10-12 11:40:11 -07:00
Xavier Ducrohet
e229e1e801 am 636d9cd6: am 5becdc32: am a970bf52: Merge change I34f51342 into eclair
Merge commit '636d9cd63b77a87e6cb627a90cc8f37e81bedb14'

* commit '636d9cd63b77a87e6cb627a90cc8f37e81bedb14':
  Fix the layoutlib test to run from adt-tests.
2009-10-12 11:34:11 -07:00