231 Commits

Author SHA1 Message Date
Xavier Ducrohet
cff6c8459c am ae4bd059: ADT/Layoutlib: Reimplement parts of BitmapFactory
Merge commit 'ae4bd059caa71aa4652c0f07fde7c2687169906e' into eclair-plus-aosp

* commit 'ae4bd059caa71aa4652c0f07fde7c2687169906e':
  ADT/Layoutlib: Reimplement parts of BitmapFactory
2010-01-13 17:09:52 -08:00
Xavier Ducrohet
ae4bd059ca ADT/Layoutlib: Reimplement parts of BitmapFactory
The original bitmap factory is mostly done in native and deals
with the normal android Bitmap class which has been replaced
in the layoutlib by a bitmap that is merely a wrapper around
an AWT BufferedImage.

This new BitmapFactory creates the layoutlib version of
Bitmap all in Java.

Change-Id: Ice8b5d19141a9a43f83349c159201bf85604b3b0
2010-01-13 16:43:07 -08:00
Ying Wang
b4f4111904 am a1d08886: Merge "Only output proguard keep for nonempty attribute name in the AndroidManifest.xml." into eclair
Merge commit 'a1d08886ec8549878ad16c19754a3239706fb61b' into eclair-plus-aosp

* commit 'a1d08886ec8549878ad16c19754a3239706fb61b':
  Only output proguard keep for nonempty attribute name in the AndroidManifest.xml.
2010-01-12 16:34:13 -08:00
Ying Wang
4199528aab Only output proguard keep for nonempty attribute name in the AndroidManifest.xml.
Before this change, aapt generates proguard keep flags like
"-keep class com.android.somepackage.", which proguard doesn't recognize.
2010-01-12 16:08:23 -08:00
Xavier Ducrohet
f5a84f8a7f am dfe25b0e: Merge "LayoutLib: support for custom styles." into eclair
Merge commit 'dfe25b0e0c382d04a59bb03c7f5f8689ece5395e' into eclair-plus-aosp

* commit 'dfe25b0e0c382d04a59bb03c7f5f8689ece5395e':
  LayoutLib: support for custom styles.
2010-01-11 15:28:07 -08:00
Xavier Ducrohet
9ce3b775f5 LayoutLib: support for custom styles.
Change-Id: Ic6c2ef234589f45db15024261d698066aa6e2f4e
2010-01-11 14:28:03 -08:00
Xavier Ducrohet
de0ef18151 am ce60d4b2: Merge "Move Layoutlib API library to sdk.git" into eclair
Merge commit 'ce60d4b27e17d98423fd339f61e8b746866f1f4e' into eclair-plus-aosp

* commit 'ce60d4b27e17d98423fd339f61e8b746866f1f4e':
  Move Layoutlib API library to sdk.git
2010-01-07 09:16:32 -08:00
Xavier Ducrohet
ce60d4b27e Merge "Move Layoutlib API library to sdk.git" into eclair 2010-01-07 09:08:06 -08:00
Xavier Ducrohet
82935938fa Move Layoutlib API library to sdk.git
Change-Id: I53f1c5d52447b6215ae7a6f2f1f82d0879e952ca
2010-01-07 08:57:32 -08:00
Dianne Hackborn
ce56857ef7 am cb2d50d0: Fix issue #2357259: aapt tool prints "uses-configuation:"
Merge commit 'cb2d50d0d6e2e37ae02b014999da23ecd32038b8' into eclair-plus-aosp

* commit 'cb2d50d0d6e2e37ae02b014999da23ecd32038b8':
  Fix issue #2357259: aapt tool prints "uses-configuation:"
2010-01-06 13:46:50 -08:00
Dianne Hackborn
cb2d50d0d6 Fix issue #2357259: aapt tool prints "uses-configuation:"
Change-Id: Id3ea3a86bd4d385441b05fcbe85b8ab62c35afff
2010-01-06 11:29:54 -08:00
Xavier Ducrohet
0169d78691 am 62d4395b: Merge change I6dc8a694 into eclair
Merge commit '62d4395bdb3114b9a75e46140456bc54fd13a3e7' into eclair-plus-aosp

* commit '62d4395bdb3114b9a75e46140456bc54fd13a3e7':
  Layoutlib: Add a constant for default density value.
2009-12-11 14:58:41 -08:00
Xavier Ducrohet
a8ba3114e8 Layoutlib: Add a constant for default density value.
Change-Id: I6dc8a694bbdae2385d4e877ea04a6b4325a5719e
2009-12-11 14:20:54 -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
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
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
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
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
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
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
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
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
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
Xavier Ducrohet
f73b83dd95 am 5f9d4bae: layout lib tests cleanup
Merge commit '5f9d4bae03b2dfa9c1e43a6e01cacaa5a5326690' into eclair-plus-aosp

* commit '5f9d4bae03b2dfa9c1e43a6e01cacaa5a5326690':
  layout lib tests cleanup
2009-10-07 11:57:39 -07:00
Xavier Ducrohet
d35a4df519 am 0a9d46b7: Add a test to make sure the replaced classes in layoutlib are correct.
Merge commit '0a9d46b7e741ccf7272bb69a4eef3c1f2adc91b7' into eclair-plus-aosp

* commit '0a9d46b7e741ccf7272bb69a4eef3c1f2adc91b7':
  Add a test to make sure the replaced classes in layoutlib are correct.
2009-10-07 11:57:32 -07:00
Xavier Ducrohet
7c28655d08 am 841a8eea: Merge change I24895c35 into eclair
Merge commit '841a8eea78479ad8a3c10e69a788adbeaef5a53d' into eclair-plus-aosp

* commit '841a8eea78479ad8a3c10e69a788adbeaef5a53d':
  Reimplement all the method of Paint for layoutlib
2009-10-07 11:52:46 -07:00
Xavier Ducrohet
2afff315dd am a970bf52: Merge change I34f51342 into eclair
Merge commit 'a970bf52581667e88d82e0801e0774d7c9cdcb8f' into eclair-plus-aosp

* commit 'a970bf52581667e88d82e0801e0774d7c9cdcb8f':
  Fix the layoutlib test to run from adt-tests.
2009-10-07 11:49:10 -07:00
Xavier Ducrohet
abf1e7cc55 am 71060f29: Merge change I8874a405 into eclair
Merge commit '71060f29855745893c122e8b93cf7a723186931b' into eclair-plus-aosp

* commit '71060f29855745893c122e8b93cf7a723186931b':
  Refactor class/method names used by layoutlib_create.
2009-10-07 11:48:54 -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
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
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