Commit Graph

231 Commits

Author SHA1 Message Date
Kenny Root
451c850fd6 am 15f1bfb0: Merge change I70d0bddb into eclair-mr2
Merge commit '15f1bfb0d29915ed1790b22a00fd7032f035ddb0' into eclair-mr2-plus-aosp

* commit '15f1bfb0d29915ed1790b22a00fd7032f035ddb0':
  Revise aapt options for UTF8/16 encoding
2009-12-14 16:28:03 -08:00
Android (Google) Code Review
15f1bfb0d2 Merge change I70d0bddb into eclair-mr2
* changes:
  Revise aapt options for UTF8/16 encoding
2009-12-14 16:24:32 -08:00
Xavier Ducrohet
092de0a989 am a7d461e0: am 62d4395b: Merge change I6dc8a694 into eclair
Merge commit 'a7d461e09adf716c2148b45a5d94f5b8cb37f9ba' into eclair-mr2-plus-aosp

* commit 'a7d461e09adf716c2148b45a5d94f5b8cb37f9ba':
  Layoutlib: Add a constant for default density value.
2009-12-13 12:34:01 -08:00
Xavier Ducrohet
a7d461e09a am 62d4395b: Merge change I6dc8a694 into eclair
Merge commit '62d4395bdb3114b9a75e46140456bc54fd13a3e7' into eclair-mr2

* commit '62d4395bdb3114b9a75e46140456bc54fd13a3e7':
  Layoutlib: Add a constant for default density value.
2009-12-13 12:24:17 -08:00
Kenny Root
745e17a07c Revise aapt options for UTF8/16 encoding
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
2009-12-11 19:06:21 -08:00
Xavier Ducrohet
a8ba3114e8 Layoutlib: Add a constant for default density value.
Change-Id: I6dc8a694bbdae2385d4e877ea04a6b4325a5719e
2009-12-11 14:20:54 -08:00
Kenny Root
cdbf5746fc am b5ef7ee1: Default to UTF8 resources when packaging with aapt
Merge commit 'b5ef7ee1644b099498ddd29c1d051e7ee26ccfd3' into eclair-mr2-plus-aosp

* commit 'b5ef7ee1644b099498ddd29c1d051e7ee26ccfd3':
  Default to UTF8 resources when packaging with aapt
2009-12-10 20:23:04 -08:00
Kenny Root
b5ef7ee164 Default to UTF8 resources when packaging with aapt
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
2009-12-10 20:17:33 -08:00
Jean-Baptiste Queru
926d1a2200 am a5a8cc13: resolved conflicts for merge of ce307f88 to eclair-mr2
Merge commit 'a5a8cc13d3f906650a1eb17e20e1b26d68b78453' into eclair-mr2-plus-aosp

* commit 'a5a8cc13d3f906650a1eb17e20e1b26d68b78453':
  Add --custom-package to aapt
2009-12-10 17:57:04 -08:00
Jean-Baptiste Queru
a5a8cc13d3 resolved conflicts for merge of ce307f88 to eclair-mr2 2009-12-10 17:53:27 -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
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
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
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
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
76410f1eb3 Properly implement Paint.breakText for layoutlib.
BUG 2260400

Change-Id: I7082e366b65da0b5de2a6dbb547f66e05e0b78e0
2009-11-13 14:10:20 -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
bf6956b1d9 Add a way for wallpapers to know the delta between virtual screens. 2009-11-09 17:39:33 -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
9a4593ffcc Support for fallback fonts in layoutlib.
BUG 2041229

Change-Id: Ib12bcb7f6d8f0e4c2b51871f8129ecf51fa938ee
2009-11-09 14:55:08 -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
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
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
a86f28494c Fix layoutlib tests so they pas when run from Eclipse workbench.
Bug 2222616
2009-11-03 10:31:31 -08: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
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
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
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
4ab1b3a292 am 88fb78d2: am 5f9d4bae: layout lib tests cleanup
Merge commit '88fb78d2091764e1265976bdb7027f7785f0b33b' into eclair-mr2-plus-aosp

* commit '88fb78d2091764e1265976bdb7027f7785f0b33b':
  layout lib tests cleanup
2009-10-06 15:53:05 -07:00
Xavier Ducrohet
66ce0f07fc am c7bade2a: am 0a9d46b7: Add a test to make sure the replaced classes in 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.
2009-10-06 15:52:59 -07:00
Xavier Ducrohet
5f9d4bae03 layout lib tests cleanup
- Move test files to their own package for easy binary inclusion
  in adt-test
- fix some tests and remove obsolete ones.

Change-Id: I5b967f29074fdad74073f9b37d903eabe8dc29e6
2009-10-06 15:14:09 -07:00
Xavier Ducrohet
0a9d46b7e7 Add a test to make sure the replaced classes in layoutlib are correct.
Change-Id: I9641635153c12e2c0a23583f7d094767533fc683
2009-10-06 15:13:58 -07:00
Xavier Ducrohet
3557d5bc9e am 9cf2bbb0: am 841a8eea: Merge change I24895c35 into eclair
Merge commit '9cf2bbb08c0eb66bcfa45a03d4b21cac78be8e99' into eclair-mr2-plus-aosp

* commit '9cf2bbb08c0eb66bcfa45a03d4b21cac78be8e99':
  Reimplement all the method of Paint for layoutlib
2009-10-06 10:03:17 -07:00
Xavier Ducrohet
9f751ab3fc Reimplement all the method of Paint for layoutlib
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
2009-10-05 19:10:04 -07:00
Xavier Ducrohet
636d9cd63b am 5becdc32: am a970bf52: Merge change I34f51342 into eclair
Merge commit '5becdc32c899f1e8031f5a694c064cb559a8fc88' into eclair-mr2-plus-aosp

* commit '5becdc32c899f1e8031f5a694c064cb559a8fc88':
  Fix the layoutlib test to run from adt-tests.
2009-10-05 16:09:29 -07:00
Xavier Ducrohet
5903a83df1 am 864cbf5f: am 71060f29: Merge change I8874a405 into eclair
Merge commit '864cbf5f9396f35eafd90ad58911b5d280d8eab8' into eclair-mr2-plus-aosp

* commit '864cbf5f9396f35eafd90ad58911b5d280d8eab8':
  Refactor class/method names used by layoutlib_create.
2009-10-05 16:04:45 -07:00
Xavier Ducrohet
8c739671d2 Fix the layoutlib test to run from adt-tests.
Change-Id: I34f513429593dce9f781ed8a08c4664a5d6f9aa8
2009-10-05 15:36:53 -07:00
Xavier Ducrohet
ac7391de5f Refactor class/method names used by layoutlib_create.
Information about classes and methods that are replaced, renamed, removed
into CreateInfo, so that it can be used by the tests.

Change-Id: I8874a40503249416621aa90b2ca02dcaf30ecd57
2009-10-05 14:16:09 -07:00
Xavier Ducrohet
25c70dd9a1 am 279ba943: Merge change I7c7b1596 into eclair
Merge commit '279ba943553ec2368d14e1b3c8a88c36bf17785d' into eclair-plus-aosp

* commit '279ba943553ec2368d14e1b3c8a88c36bf17785d':
  Fix a warning output.
2009-09-28 13:55:36 -07:00
Xavier Ducrohet
f18ccc13a6 Fix a warning output.
This was introduced by the dpi work.

Change-Id: I7c7b1596085f70532b8279139c287a2a58f57046
2009-09-28 12:59:33 -07:00
Raphael
0416537145 am 20b39471: Merge change 26933 into eclair
Merge commit '20b394719daa218be7ff767fad024504f12e937b' into eclair-plus-aosp

* commit '20b394719daa218be7ff767fad024504f12e937b':
  AAPT: Ignore visual source safe files in resources
2009-09-24 15:45:17 -07:00
Raphael
3cdfc042dc AAPT: Ignore visual source safe files in resources
BUG 1895888
2009-09-24 15:30:53 -07:00
Dianne Hackborn
ad8d9dfb24 am ffa42480: Fix issue #2133206: dialogs/menus should auto-dismiss when screen turns off
Merge commit 'ffa424800d0338b8b894aef2ea1e3e3344cbda7a' into eclair-plus-aosp

* commit 'ffa424800d0338b8b894aef2ea1e3e3344cbda7a':
  Fix issue #2133206: dialogs/menus should auto-dismiss when screen turns off
2009-09-23 23:28:06 -07:00
Dianne Hackborn
ffa424800d Fix issue #2133206: dialogs/menus should auto-dismiss when screen turns off
Lot of infrastructure for more things to go away when "clear system dialogs"
happens, and now do this when we turn on the lock screen.

Change-Id: I567130296fe47ce82df065ed58ef21b37416ceaf
2009-09-23 23:17:07 -07:00