258 Commits

Author SHA1 Message Date
Xavier Ducrohet
3bd6dc6535 am b44051ee: Merge "ADT/Layoutlib: implement sweep gradient." into eclair
Merge commit 'b44051eee04450888a7dcb1cd2e6f31d0edfb678' into eclair-plus-aosp

* commit 'b44051eee04450888a7dcb1cd2e6f31d0edfb678':
  ADT/Layoutlib: implement sweep gradient.
2010-01-20 09:47:06 -08:00
Xavier Ducrohet
3330927bdd ADT/Layoutlib: implement sweep gradient.
Change-Id: I2d460decff82f5f64b0a5cfeaa68156aad4fb3e6
2010-01-19 18:51:06 -08:00
Xavier Ducrohet
60e3c09ec0 am 6866daee: Merge "ADT/Layoutlib: implement radial gradient." into eclair
Merge commit '6866daee6a18992e8f2c9a948e873bbfc2090fb0' into eclair-plus-aosp

* commit '6866daee6a18992e8f2c9a948e873bbfc2090fb0':
  ADT/Layoutlib: implement radial gradient.
2010-01-19 14:53:52 -08:00
Ying Wang
3c05f1fbac am b5fb50a1: Merge "Add instrumentation as a source tag for proguard keep options." into eclair
Merge commit 'b5fb50a133c6fc7fc93d6241912dd9ec24de6ace' into eclair-plus-aosp

* commit 'b5fb50a133c6fc7fc93d6241912dd9ec24de6ace':
  Add instrumentation as a source tag for proguard keep options.
2010-01-19 14:53:47 -08:00
Xavier Ducrohet
6866daee6a Merge "ADT/Layoutlib: implement radial gradient." into eclair 2010-01-19 14:48:58 -08:00
Xavier Ducrohet
45a7c28598 ADT/Layoutlib: implement radial gradient.
Also refactored some parts of LinearGradient to reuse them
in the radial gradient

Change-Id: I2ec69bd60190bd014217d989177dcc7269188dea
2010-01-19 14:03:31 -08:00
Ying Wang
b5fb50a133 Merge "Add instrumentation as a source tag for proguard keep options." into eclair 2010-01-19 11:55:12 -08:00
Xavier Ducrohet
da84d6a1b1 am 908a8111: Merge "ADT/Layoutlib: Add dash support to stroke." into eclair
Merge commit '908a81119061092468067789acbec9b99d79ad5f' into eclair-plus-aosp

* commit '908a81119061092468067789acbec9b99d79ad5f':
  ADT/Layoutlib: Add dash support to stroke.
2010-01-18 23:42:55 -08:00
Xavier Ducrohet
c0ea805c64 am 2b30a4a5: Merge "ADT/Layoutlib: properly handle stroke information." into eclair
Merge commit '2b30a4a50e24080fdd8b796e4a64447f223d4522' into eclair-plus-aosp

* commit '2b30a4a50e24080fdd8b796e4a64447f223d4522':
  ADT/Layoutlib: properly handle stroke information.
2010-01-18 23:42:28 -08:00
Xavier Ducrohet
36ab1284d8 ADT/Layoutlib: Add dash support to stroke.
Change-Id: I09a7e84948be013cbb11f6d9774ab81df897b424
2010-01-15 11:24:44 -08:00
Xavier Ducrohet
5ac8f409f5 ADT/Layoutlib: properly handle stroke information.
Change-Id: Iec9284d0e65d1313739e361d1fd5a522646fd1fd
2010-01-14 19:43:54 -08:00
Xavier Ducrohet
20cc557033 am 79f05bb4: Merge "ADT/Layoutlib: improved gradient drawing for perf." into eclair
Merge commit '79f05bb4a502d5768f84cf975f791f3ba981e0e5' into eclair-plus-aosp

* commit '79f05bb4a502d5768f84cf975f791f3ba981e0e5':
  ADT/Layoutlib: improved gradient drawing for perf.
2010-01-14 19:15:28 -08:00
Xavier Ducrohet
38fa9eee93 am 89d538dc: ADT/Layoutlib: don\'t draw 0-sized rectangle, AWT doesn\'t like that.
Merge commit '89d538dcca9a4cb95682c56b0c4b85e8a77442be' into eclair-plus-aosp

* commit '89d538dcca9a4cb95682c56b0c4b85e8a77442be':
  ADT/Layoutlib: don't draw 0-sized rectangle, AWT doesn't like that.
2010-01-14 19:15:22 -08:00
Xavier Ducrohet
79f05bb4a5 Merge "ADT/Layoutlib: improved gradient drawing for perf." into eclair 2010-01-14 19:10:44 -08:00
Xavier Ducrohet
e8f4d7deab ADT/Layoutlib: improved gradient drawing for perf.
Change-Id: I79b909d7787e4442e7cfdf196de1ac0c077da7f8
2010-01-14 18:45:04 -08:00
Xavier Ducrohet
895c92a44b am 240298f9: Merge "ADT/Layoutlib: always use custom gradient (java) Paint." into eclair
Merge commit '240298f9e4542c487edd0337e84b50c493cbeecd' into eclair-plus-aosp

* commit '240298f9e4542c487edd0337e84b50c493cbeecd':
  ADT/Layoutlib: always use custom gradient (java) Paint.
2010-01-14 18:39:48 -08:00
Xavier Ducrohet
89d538dcca ADT/Layoutlib: don't draw 0-sized rectangle, AWT doesn't like that.
Change-Id: I298d00208ace2421478c5864cc5a66a508b2b411
2010-01-14 18:38:06 -08:00
Xavier Ducrohet
31ef2e77c5 am b847fbf2: Merge "ADT/Layout: support for 3+ color in linear gradients" into eclair
Merge commit 'b847fbf2098acc8c5854bbbfa1453431128c720e' into eclair-plus-aosp

* commit 'b847fbf2098acc8c5854bbbfa1453431128c720e':
  ADT/Layout: support for 3+ color in linear gradients
2010-01-14 17:20:04 -08:00
Xavier Ducrohet
2dbb923aa0 ADT/Layoutlib: always use custom gradient (java) Paint.
The normal linear paint from AWT does not support our TileModes.

Change-Id: I24667671dabdf1a5dffa342e4de9cc69487db0b6
2010-01-14 17:17:25 -08:00
Xavier Ducrohet
374abf0b95 ADT/Layout: support for 3+ color in linear gradients
Change-Id: I14c6a5a1de41470c6f1c66d490492ecc727302f2
2010-01-14 15:15:35 -08:00
Xavier Ducrohet
f95e3dd23c am 5e083024: ADT/Layoutlib: shader clean-up.
Merge commit '5e083024269e7c5bf904301a98fa6eade6fec094' into eclair-plus-aosp

* commit '5e083024269e7c5bf904301a98fa6eade6fec094':
  ADT/Layoutlib: shader clean-up.
2010-01-14 11:36:50 -08:00
Xavier Ducrohet
5e08302426 ADT/Layoutlib: shader clean-up.
Change-Id: I0a200f438b7ccde2bfc19fd23614a647cb19d312
2010-01-14 10:37:13 -08:00
Xavier Ducrohet
e1a9914763 am d3026e16: Merge "ADT/Layoutlib: 2 color, linear gradient support." into eclair
Merge commit 'd3026e1618d893db55c2131d66b08bc4a6e7aaf4' into eclair-plus-aosp

* commit 'd3026e1618d893db55c2131d66b08bc4a6e7aaf4':
  ADT/Layoutlib: 2 color, linear gradient support.
2010-01-14 10:08:37 -08:00
Xavier Ducrohet
63b2e61627 ADT/Layoutlib: 2 color, linear gradient support.
Change-Id: Ifaafa4fc42a22f4851449a7c35a5b82e211aafe7
2010-01-13 20:30:26 -08:00
Xavier Ducrohet
1da2735c58 am f73bd14a: Merge "ADT/Layoutlib: implement Canvas.concat(Matrix)" into eclair
Merge commit 'f73bd14a8d5932b34a0e6e4d2de78b74705276b8' into eclair-plus-aosp

* commit 'f73bd14a8d5932b34a0e6e4d2de78b74705276b8':
  ADT/Layoutlib: implement Canvas.concat(Matrix)
2010-01-13 19:17:07 -08:00
Xavier Ducrohet
608cd11cdc ADT/Layoutlib: implement Canvas.concat(Matrix)
This prevented ImageView from making proper use of ScaleType.

Also fixed Canvas.getSaveCount() that returned the wrong
value and Matrix.getTransform() which used the wrong order
for the AffineTransform constructor!!

Bug: 2364564

Change-Id: I78babf4aa6689440e52ad06b1473f75b20eb66da
2010-01-13 18:17:59 -08:00
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
Ying Wang
46f4b9827e Add instrumentation as a source tag for proguard keep options. 2010-01-13 16:53:07 -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