644 Commits

Author SHA1 Message Date
Jean-Baptiste Queru
5580e44c25 Merge "Support changing style parent in overlays" 2010-11-04 07:26:37 -07:00
Xavier Ducrohet
9c05b39728 Layoutlib native delegate: FloatMath.
While the difference is pretty minor since it's a small class,
the point is that the unit test will ensure that we detect
new methods added to FloatMath more easily.

Change-Id: Ia8bfee231cc4ae0cfeb18692be86d02649c187d5
2010-11-03 19:15:07 -07:00
Xavier Ducrohet
4b606da91d Layoutlib native delegate: path effects and xfermode.
Change-Id: Iafaac6dbaf452e2dba3e77c801089dad33ac4ea9
2010-11-03 19:15:07 -07:00
Xavier Ducrohet
251d2e9924 Layoutlib native delegate: primitive shapes and shaders
Change-Id: Id2b0c6231589e82d8e96c9f019042eba348a6583
2010-11-03 13:23:22 -07:00
Xavier Ducrohet
abff653ce8 More layout Canvas/Paint implementation.
Change-Id: Ib3da4a4b2259dc7c53b24444b5c0b78cee15d387
2010-11-01 18:45:20 -07:00
Xavier Ducrohet
5802deabf0 More implementation of the layoutlib Paint/Canvas delegates.
Change-Id: I0c0029b9a679af4ae0178488f70b2a90292ea42d
2010-11-01 17:52:42 -07:00
Xavier Ducrohet
9f63ff263b Layoutlib Canvas and Paint implementation through native delegates
Also fix native delegate generation to put "this" parameter even
for methods that don't have any parameters.

Change-Id: I5dd0c505871370ff7b4cda16de84a5b3ae438f73
2010-11-01 13:31:47 -07:00
Xavier Ducrohet
5de11a18e9 Implement the layoutlib Bitmap through a native delegate.
This does not implement all the native methods of the
android.graphics.Bitmap class, only what's needed to draw an
ImageView object. The rest will be implemented after Canvas and
Paint have been moved to the native delegate.

Change-Id: Ia0c3b2cafa03871c298deaef5817a25ac1c35521
2010-10-29 16:01:40 -07:00
Xavier Ducrohet
65dc3974a1 Fix the layoutlib_bridge .classpath to not use the full layoutlib
Instead this uses the actual output of layoutlib_create, which is
all the modified classes before the content of the bridge is added
to form layoutlib.

Change-Id: I22755f38800cd69206834ff9594a99cb0c1d2139
2010-10-27 18:22:03 -07:00
Xavier Ducrohet
5e7ed8da0d Move layoutlib typeface implementation to delegate.
Also move BridgeContentProvider to its own class to make it
less messy in BridgeContentResolver.

Change-Id: Id3462218b500d43d4c9b20b25326ad24e4106fa5
2010-10-27 18:12:27 -07:00
Xavier Ducrohet
4c9d691a01 am 57f7ccc4: am 63e5d07e: Merge "Fix issue with project resources overriding framework resources." into gingerbread 2010-10-27 11:59:05 -07:00
Xavier Ducrohet
57f7ccc422 am 63e5d07e: Merge "Fix issue with project resources overriding framework resources." into gingerbread 2010-10-27 11:23:58 -07:00
Xavier Ducrohet
4f291d33e1 Reimplement the native matrix method using the new delegate way.
Instead of renaming the old Matrix class into _Original_Matrix
and have layoutlib provide a full new implementation of Matrix,
we keep the old one by only modifying it to implement the native
methods which calls out to a new Matrix_Delegate class.

The goal is to not have to maintain the java portion in
sync between the framework and the layoutlib version.

Change-Id: I3e1aefffbae45e91b75331c0c6ff2260323deacd
2010-10-27 09:55:58 -07:00
Xavier Ducrohet
c2e28dd748 Fix issue with project resources overriding framework resources.
Framework resources loaded through Drawable.createFromXml could
be overriden by project resources if there were loaded through
a  state list drawable where the final resource name was used
by a project resource (of the same type).

This ensures that the XML parser knows that it's a framework
resource being parsed and that the resource resolution uses
that information.

Change-Id: I39cf9eba755e55f1604b968637aeecff969a558d
2010-10-26 17:14:55 -07:00
Xavier Ducrohet
d815e37048 Fix rendering of digitalClock/Gallery in Eclipse editors.
Change-Id: Iedcd3184cd9f34be8d0695a51eda953ac68683ce
2010-10-26 14:29:23 -07:00
Raphael
f241c40476 Revert "Fix rendering of digitalClock/Gallery in Eclipse editors."
This reverts commit 25e96ce7b99f9736a6024d25bd65a83774c7640f.
2010-10-26 13:55:10 -07:00
Xavier Ducrohet
68404a0125 am a44a5e02: am 1b6180ec: Merge "Fix rendering of digitalClock/Gallery in Eclipse editors." into gingerbread 2010-10-26 12:13:32 -07:00
Xavier Ducrohet
a44a5e02d2 am 1b6180ec: Merge "Fix rendering of digitalClock/Gallery in Eclipse editors." into gingerbread 2010-10-26 12:10:28 -07:00
Xavier Ducrohet
25e96ce7b9 Fix rendering of digitalClock/Gallery in Eclipse editors.
Change-Id: I80f4f90b173529632eaf2fbc3bb5471b7ede8216
2010-10-26 11:18:39 -07:00
Patrick Scott
4f145c9674 Fix debug statements and aapt assert.
ENABLE_PSEUDOLOCALIZE seems to not exist.

Change-Id: Ifef771a96938c7ff0f8b664142bb502030b8c543
2010-10-26 13:22:17 -04:00
Dianne Hackborn
a7a44d47cb Merge "Implement issue #3116702: New manifest tags for supported screen sizes" 2010-10-22 17:16:12 -07:00
Dianne Hackborn
a0b46c9c44 Implement issue #3116702: New manifest tags for supported screen sizes
Merged from GB.

Change-Id: I94730b54bcacd083f77708e84c35f4932a7b9d2e
2010-10-22 16:18:43 -07:00
Xavier Ducrohet
a6ca66af0c Merge "Layoutlib_Create: Fix order of class adapters." 2010-10-22 15:42:40 -07:00
Xavier Ducrohet
c08e175f14 Merge "Layoutlib_create: fix binary name of delegate methods." 2010-10-22 15:42:26 -07:00
Raphael
e2e8ba904b Layoutlib_Create: Fix order of class adapters.
The Transform adapter was running last, instead of
running on the output of the Delegate adapter.

Change-Id: I2cd777add7b0972c6bb197aaac6693d39dd5a103
2010-10-22 15:29:04 -07:00
Xavier Ducrohet
2191b4b22f Merge "Remove dependency on ASM util classes." 2010-10-22 14:03:07 -07:00
Raphael
280372e2c7 Layoutlib_create: fix binary name of delegate methods.
Change-Id: Iebd7d730b23e12f770e6ecadafb2f5c3459958db
2010-10-22 13:58:31 -07:00
Xavier Ducrohet
ee9642c2ba am 2051a1be: am c5371fad: Merge "Make layoutlib use the prebuilt of layoutlib_api" 2010-10-22 13:41:08 -07:00
Xavier Ducrohet
2051a1be52 am c5371fad: Merge "Make layoutlib use the prebuilt of layoutlib_api" 2010-10-22 13:38:58 -07:00
Raphael
d556d8ba36 Remove dependency on ASM util classes.
Change-Id: I975b103f8c207e727699e4135170755f6ba2a084
2010-10-22 13:33:50 -07:00
Dianne Hackborn
101f14b275 am ba501785: Merge "Implement issue #3116702: New manifest tags for supported screen sizes DO NOT MERGE" into gingerbread
Merge commit 'ba501785c7b298198d1c6e4787fd40e98f97da67' into gingerbread-plus-aosp

* commit 'ba501785c7b298198d1c6e4787fd40e98f97da67':
  Implement issue #3116702: New manifest tags for supported screen sizes  DO NOT MERGE
2010-10-21 20:17:56 -07:00
Xavier Ducrohet
0db3844925 Make layoutlib use the prebuilt of layoutlib_api
Change-Id: Ie04a9e847acacf7b2aeb179589517fc75688c75b
2010-10-21 18:32:37 -07:00
Dianne Hackborn
a6d9c7c04c Implement issue #3116702: New manifest tags for supported screen sizes DO NOT MERGE
Change-Id: Iabf64d86c89d387ffbfbc39f950d308a73fe17eb
2010-10-21 15:32:06 -07:00
Chris Tate
d4533f1469 Report drag success/fail in the DRAG_ENDED message
DragEvent.getResult() returns 'true' if the drop was ultimately accepted;
false otherwise.  The validity of this datum is only guaranteed when the
DragEvent's action verb is ACTION_DRAG_ENDED.

Also fixes the drag-start timeout handling (though the offending app is
not yet officially declared ANR).

Implements bug 3097807

Change-Id: I6908ac628c72ff7d6193d87060d769a559a78d0e
2010-10-21 14:25:06 -07:00
Ying Wang
3222df8d83 am ec62719c: am 004f968d: Merge "Link against the static libcrypto in external/openssl." into gingerbread
Merge commit 'ec62719c8396997b436c44906c2760e3914698b8'

* commit 'ec62719c8396997b436c44906c2760e3914698b8':
  Link against the static libcrypto in external/openssl.
2010-10-19 09:52:16 -07:00
Ying Wang
ec62719c83 am 004f968d: Merge "Link against the static libcrypto in external/openssl." into gingerbread
Merge commit '004f968d0cf60c08d7b393129ed2d6e4304041e5' into gingerbread-plus-aosp

* commit '004f968d0cf60c08d7b393129ed2d6e4304041e5':
  Link against the static libcrypto in external/openssl.
2010-10-18 11:50:08 -07:00
Joe Onorato
78fc85ce64 am 35d34c67: am 3d828e62: Merge "Do not build pbkdf2gen on non-Linux hosts" into gingerbread
Merge commit '35d34c67b7e94639086f2392d674e59b82c26a42'

* commit '35d34c67b7e94639086f2392d674e59b82c26a42':
  Do not build pbkdf2gen on non-Linux hosts
2010-10-15 14:25:59 -07:00
Kenny Root
fcab0f5502 am 8fda1636: am bdf8034c: Merge "OBB: use PBKDF2 for key generation." into gingerbread
Merge commit '8fda1636e3e35f060b9046294efd3c062a1fdb84'

* commit '8fda1636e3e35f060b9046294efd3c062a1fdb84':
  OBB: use PBKDF2 for key generation.
2010-10-15 14:00:58 -07:00
Kenny Root
f25d24b2c7 resolved conflicts for merge of 8b1082bb to master
Change-Id: If9d898123894c53bf83ac28cc7c03cd849c8ef17
2010-10-15 13:10:01 -07:00
Dan Morrill
1785627fb3 am b58af2b8: am 5c62ab0a: Merge "Adding a new <uses-gl-texture/> tag, to be used to enable apps to specify filtering based on support for OpenGL ES texture and texture compression formats." into gingerbread
Merge commit 'b58af2b8b3871436942d0e2c878c906bffaa2fb0'

* commit 'b58af2b8b3871436942d0e2c878c906bffaa2fb0':
  Adding a new <uses-gl-texture/> tag, to be used to enable apps to specify
2010-10-15 08:33:00 -07:00
Ying Wang
a1b592e60d Link against the static libcrypto in external/openssl.
Change-Id: Iad41ec975f9b9a4aec0b8470678320f5abe03e1f
2010-10-14 16:13:31 -07:00
Joe Onorato
35d34c67b7 am 3d828e62: Merge "Do not build pbkdf2gen on non-Linux hosts" into gingerbread
Merge commit '3d828e62c856074334a00ce7c621050b4d7166e4' into gingerbread-plus-aosp

* commit '3d828e62c856074334a00ce7c621050b4d7166e4':
  Do not build pbkdf2gen on non-Linux hosts
2010-10-14 12:03:07 -07:00
Kenny Root
a09f1ebeb5 Do not build pbkdf2gen on non-Linux hosts
Change-Id: I9f575a2ca7d45102a4f67424ea5866cf750adb13
2010-10-14 10:43:15 -07:00
Kenny Root
8fda1636e3 am bdf8034c: Merge "OBB: use PBKDF2 for key generation." into gingerbread
Merge commit 'bdf8034c657147226b2390eef113ff841e0d6065' into gingerbread-plus-aosp

* commit 'bdf8034c657147226b2390eef113ff841e0d6065':
  OBB: use PBKDF2 for key generation.
2010-10-13 22:54:10 -07:00
Kenny Root
bdf8034c65 Merge "OBB: use PBKDF2 for key generation." into gingerbread 2010-10-13 18:29:43 -07:00
Kenny Root
3b1abba6bb OBB: use PBKDF2 for key generation.
Switch to using PBKDF2 for the key generation for OBBs. Any previously
generated OBBs will stop being read correctly. A small pbkdf2gen program
is available to allow generation of appropriate keys with the salts.

Bug: 3059950
Change-Id: If4305c989fd692fd1150eb270dbf751e09c37295
2010-10-13 18:25:33 -07:00
Jesse Wilson
8b1082bba9 am 3394db7d: Merge "Regenerate preloaded classes for Gingerbread." into gingerbread
Merge commit '3394db7d9432053e56d86b3f24e64deeb3099950' into gingerbread-plus-aosp

* commit '3394db7d9432053e56d86b3f24e64deeb3099950':
  Regenerate preloaded classes for Gingerbread.
2010-10-13 17:02:48 -07:00
Jesse Wilson
3394db7d94 Merge "Regenerate preloaded classes for Gingerbread." into gingerbread 2010-10-13 16:59:12 -07:00
Jesse Wilson
eaca10e2d0 Regenerate preloaded classes for Gingerbread.
Unlike previous releases where the set of classes-to-be-preloaded
was generated on a first-generation device (G1 and MyTouch 3G), this
round I used a second-generation device, a Nexus One. As a consequence,
class loading is faster (win) and fewer classes hit the 1250ms threshold.
Instead of sharing classes based on load time alone, classes are now shared
based on the number of applications loading them.

Change-Id: I18f7aa3e7e6258818871b3968b515c06314371b3
http://b/2546002
2010-10-13 16:55:26 -07:00
Dan Morrill
b58af2b8b3 am 5c62ab0a: Merge "Adding a new <uses-gl-texture/> tag, to be used to enable apps to specify filtering based on support for OpenGL ES texture and texture compression formats." into gingerbread
Merge commit '5c62ab0af9dadc3bccdad7b01c3ae17266f0b0e1' into gingerbread-plus-aosp

* commit '5c62ab0af9dadc3bccdad7b01c3ae17266f0b0e1':
  Adding a new <uses-gl-texture/> tag, to be used to enable apps to specify
2010-10-13 15:23:27 -07:00