summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Collapse)AuthorAgeFilesLines
* Implement the layoutlib Bitmap through a native delegate.Xavier Ducrohet2010-10-299-348/+395
| | | | | | | | | 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
* Fix the layoutlib_bridge .classpath to not use the full layoutlibXavier Ducrohet2010-10-271-1/+1
| | | | | | | | 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
* Move layoutlib typeface implementation to delegate.Xavier Ducrohet2010-10-278-293/+308
| | | | | | | Also move BridgeContentProvider to its own class to make it less messy in BridgeContentResolver. Change-Id: Id3462218b500d43d4c9b20b25326ad24e4106fa5
* am 57f7ccc4: am 63e5d07e: Merge "Fix issue with project resources overriding ↵Xavier Ducrohet2010-10-273-19/+22
|\ | | | | | | framework resources." into gingerbread
| * am 63e5d07e: Merge "Fix issue with project resources overriding framework ↵Xavier Ducrohet2010-10-273-19/+22
| |\ | | | | | | | | | resources." into gingerbread
| | * Fix issue with project resources overriding framework resources.Xavier Ducrohet2010-10-263-19/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | Reimplement the native matrix method using the new delegate way.Xavier Ducrohet2010-10-278-1070/+1246
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | Fix rendering of digitalClock/Gallery in Eclipse editors.Xavier Ducrohet2010-10-263-11/+115
| | | | | | | | | | | | Change-Id: Iedcd3184cd9f34be8d0695a51eda953ac68683ce
* | | Revert "Fix rendering of digitalClock/Gallery in Eclipse editors."Raphael2010-10-263-104/+11
| | | | | | | | | | | | This reverts commit 25e96ce7b99f9736a6024d25bd65a83774c7640f.
* | | am a44a5e02: am 1b6180ec: Merge "Fix rendering of digitalClock/Gallery in ↵Xavier Ducrohet2010-10-263-11/+104
|\ \ \ | |/ / | | | | | | Eclipse editors." into gingerbread
| * | am 1b6180ec: Merge "Fix rendering of digitalClock/Gallery in Eclipse ↵Xavier Ducrohet2010-10-263-11/+104
| |\ \ | | |/ | | | | | | editors." into gingerbread
| | * Fix rendering of digitalClock/Gallery in Eclipse editors.Xavier Ducrohet2010-10-263-11/+104
| | | | | | | | | | | | Change-Id: I80f4f90b173529632eaf2fbc3bb5471b7ede8216
* | | Fix debug statements and aapt assert.Patrick Scott2010-10-261-4/+0
| | | | | | | | | | | | | | | | | | ENABLE_PSEUDOLOCALIZE seems to not exist. Change-Id: Ifef771a96938c7ff0f8b664142bb502030b8c543
* | | Merge "Implement issue #3116702: New manifest tags for supported screen sizes"Dianne Hackborn2010-10-221-9/+50
|\ \ \
| * | | Implement issue #3116702: New manifest tags for supported screen sizesDianne Hackborn2010-10-221-9/+50
| | | | | | | | | | | | | | | | | | | | | | | | Merged from GB. Change-Id: I94730b54bcacd083f77708e84c35f4932a7b9d2e
* | | | Merge "Layoutlib_Create: Fix order of class adapters."Xavier Ducrohet2010-10-221-5/+6
|\ \ \ \
| * | | | Layoutlib_Create: Fix order of class adapters.Raphael2010-10-221-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Transform adapter was running last, instead of running on the output of the Delegate adapter. Change-Id: I2cd777add7b0972c6bb197aaac6693d39dd5a103
* | | | | Merge "Layoutlib_create: fix binary name of delegate methods."Xavier Ducrohet2010-10-221-0/+1
|\ \ \ \ \ | |/ / / / | | / / / | |/ / / |/| | |
| * | | Layoutlib_create: fix binary name of delegate methods.Raphael2010-10-221-0/+1
| | | | | | | | | | | | | | | | Change-Id: Iebd7d730b23e12f770e6ecadafb2f5c3459958db
* | | | Merge "Remove dependency on ASM util classes."Xavier Ducrohet2010-10-221-21/+20
|\ \ \ \ | |/ / /
| * | | Remove dependency on ASM util classes.Raphael2010-10-221-21/+20
| | | | | | | | | | | | | | | | Change-Id: I975b103f8c207e727699e4135170755f6ba2a084
* | | | am 2051a1be: am c5371fad: Merge "Make layoutlib use the prebuilt of ↵Xavier Ducrohet2010-10-222-2/+2
|\ \ \ \ | |/ / / |/| / / | |/ / layoutlib_api"
| * | am c5371fad: Merge "Make layoutlib use the prebuilt of layoutlib_api"Xavier Ducrohet2010-10-222-2/+2
| |\ \
| | * | Make layoutlib use the prebuilt of layoutlib_apiXavier Ducrohet2010-10-212-2/+2
| | | | | | | | | | | | | | | | Change-Id: Ie04a9e847acacf7b2aeb179589517fc75688c75b
| * | | am ba501785: Merge "Implement issue #3116702: New manifest tags for ↵Dianne Hackborn2010-10-211-9/+50
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | Implement issue #3116702: New manifest tags for supported screen sizes DO ↵Dianne Hackborn2010-10-211-9/+50
| | | | | | | | | | | | | | | | | | | | | | | | NOT MERGE Change-Id: Iabf64d86c89d387ffbfbc39f950d308a73fe17eb
* | | | Report drag success/fail in the DRAG_ENDED messageChris Tate2010-10-211-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | am ec62719c: am 004f968d: Merge "Link against the static libcrypto in ↵Ying Wang2010-10-191-14/+11
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | external/openssl." into gingerbread Merge commit 'ec62719c8396997b436c44906c2760e3914698b8' * commit 'ec62719c8396997b436c44906c2760e3914698b8': Link against the static libcrypto in external/openssl.
| * | | am 004f968d: Merge "Link against the static libcrypto in external/openssl." ↵Ying Wang2010-10-181-14/+11
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | into gingerbread Merge commit '004f968d0cf60c08d7b393129ed2d6e4304041e5' into gingerbread-plus-aosp * commit '004f968d0cf60c08d7b393129ed2d6e4304041e5': Link against the static libcrypto in external/openssl.
| | * | Link against the static libcrypto in external/openssl.Ying Wang2010-10-141-14/+11
| | | | | | | | | | | | | | | | Change-Id: Iad41ec975f9b9a4aec0b8470678320f5abe03e1f
* | | | am 35d34c67: am 3d828e62: Merge "Do not build pbkdf2gen on non-Linux hosts" ↵Joe Onorato2010-10-151-7/+10
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | into gingerbread Merge commit '35d34c67b7e94639086f2392d674e59b82c26a42' * commit '35d34c67b7e94639086f2392d674e59b82c26a42': Do not build pbkdf2gen on non-Linux hosts
| * | | am 3d828e62: Merge "Do not build pbkdf2gen on non-Linux hosts" into gingerbreadJoe Onorato2010-10-141-7/+10
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | Merge commit '3d828e62c856074334a00ce7c621050b4d7166e4' into gingerbread-plus-aosp * commit '3d828e62c856074334a00ce7c621050b4d7166e4': Do not build pbkdf2gen on non-Linux hosts
| | * | Do not build pbkdf2gen on non-Linux hostsKenny Root2010-10-141-7/+10
| | | | | | | | | | | | | | | | Change-Id: I9f575a2ca7d45102a4f67424ea5866cf750adb13
* | | | am 8fda1636: am bdf8034c: Merge "OBB: use PBKDF2 for key generation." into ↵Kenny Root2010-10-154-11/+192
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | gingerbread Merge commit '8fda1636e3e35f060b9046294efd3c062a1fdb84' * commit '8fda1636e3e35f060b9046294efd3c062a1fdb84': OBB: use PBKDF2 for key generation.
| * | | am bdf8034c: Merge "OBB: use PBKDF2 for key generation." into gingerbreadKenny Root2010-10-134-11/+192
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | Merge commit 'bdf8034c657147226b2390eef113ff841e0d6065' into gingerbread-plus-aosp * commit 'bdf8034c657147226b2390eef113ff841e0d6065': OBB: use PBKDF2 for key generation.
| | * | Merge "OBB: use PBKDF2 for key generation." into gingerbreadKenny Root2010-10-134-11/+192
| | |\ \
| | | * | OBB: use PBKDF2 for key generation.Kenny Root2010-10-134-11/+192
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | resolved conflicts for merge of 8b1082bb to masterKenny Root2010-10-152-1/+13
|\ \ \ \ \ | |/ / / / | | | | | | | | | | Change-Id: If9d898123894c53bf83ac28cc7c03cd849c8ef17
| * | | | am 3394db7d: Merge "Regenerate preloaded classes for Gingerbread." into ↵Jesse Wilson2010-10-132-1/+13
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gingerbread Merge commit '3394db7d9432053e56d86b3f24e64deeb3099950' into gingerbread-plus-aosp * commit '3394db7d9432053e56d86b3f24e64deeb3099950': Regenerate preloaded classes for Gingerbread.
| | * | | Merge "Regenerate preloaded classes for Gingerbread." into gingerbreadJesse Wilson2010-10-132-1/+13
| | |\ \ \
| | | * | | Regenerate preloaded classes for Gingerbread.Jesse Wilson2010-10-132-1/+13
| | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | am b58af2b8: am 5c62ab0a: Merge "Adding a new <uses-gl-texture/> tag, to be ↵Dan Morrill2010-10-151-0/+9
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | am 5c62ab0a: Merge "Adding a new <uses-gl-texture/> tag, to be used to ↵Dan Morrill2010-10-131-0/+9
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | | Adding a new <uses-gl-texture/> tag, to be used to enable apps to specifyDan Morrill2010-10-131-0/+9
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | filtering based on support for OpenGL ES texture and texture compression formats. Change-Id: I993209a673579b296007ae2ba830d0275770dd11
| | * | Avoid pre-processing images when they won't be usedAnthony Newnam2010-10-061-1/+3
| | | | | | | | | | | | | | | | Change-Id: I24db3645c399f66dc7cc0e85909ce34b68ff829e
* | | | am 556866a2: am 656d2165: Merge "Parser is optional in ↵Xavier Ducrohet2010-10-081-5/+11
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | obtainStyledAttributes." into gingerbread Merge commit '556866a2ea1f4758a79fe4f207153b71815ed400' * commit '556866a2ea1f4758a79fe4f207153b71815ed400': Parser is optional in obtainStyledAttributes.
| * | | am 656d2165: Merge "Parser is optional in obtainStyledAttributes." into ↵Xavier Ducrohet2010-10-071-5/+11
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | gingerbread Merge commit '656d21656ad9b33f7d7e1e4960a2f03076a5fc7a' into gingerbread-plus-aosp * commit '656d21656ad9b33f7d7e1e4960a2f03076a5fc7a': Parser is optional in obtainStyledAttributes.
| | * | Parser is optional in obtainStyledAttributes.Xavier Ducrohet2010-10-041-5/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | If the parser is null it just means the default style/values are used. Change-Id: I5ff3d632fd5dfc5a1ce42796b2fef7b30f9fbf34
* | | | resolved conflicts for merge of 10d5b096 to masterDianne Hackborn2010-10-041-8/+10
|\ \ \ \ | |/ / / | | | | | | | | Change-Id: Id5c6ba651f72b48f0d70ee2ca64a6c9adf5e74f7
| * | | am 407f625a: Add new API to find out whether external storage is removable.Dianne Hackborn2010-10-041-8/+10
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | Merge commit '407f625a9b8e356e765a5ec587c443af1f3aadb5' into gingerbread-plus-aosp * commit '407f625a9b8e356e765a5ec587c443af1f3aadb5': Add new API to find out whether external storage is removable.