summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Collapse)AuthorAgeFilesLines
* Cherrypick d1ed33c4 from hc-mr1. do not merge.Xavier Ducrohet2011-06-033-0/+86
| | | | | | | | | | | | | | | | Fix zombie threads in the Layoutlib. Some widgets can create (indirectly) HandlerThread which are started but never stopped. This patch use the delegate methods to override the thread run method to record which threads are started to be able to call quit() on them after a render. Note that we should really fix layoutlib_create to be able to call the default implementation from a delegate to remove code duplication. Change-Id: Iaf5432623e9704bb3114a8e0583c8553282c205e
* Cherrypick 5b61ea6b from hc-mr1Xavier Ducrohet2011-06-031-1/+1
| | | | | | Fix drawCircle in layoutlib. Change-Id: I035c48b925cad246ed821e9e59a93d37174982ef
* LayoutLib: enable the LAYOUT_ONLY capability.Xavier Ducrohet2011-06-021-1/+1
| | | | Change-Id: Ib302af47d2a83a7ac3def6256bf0b892823f594f
* Merge dba35f1b from honeycomb-mr1. do not merge.Xavier Ducrohet2011-06-017-16/+13
| | | | | Change-Id: Iebda5ea67fd40cac76a8ca3fe3c3cd4ee95ddebe LayoutLib: Properly configure KXmlParser to read UTF8
* Merge 6103e22c from honeycomb-mr1. do not merge.Xavier Ducrohet2011-05-241-53/+58
| | | | | | | | | | LayoutLib: custom styles override the default style instead of replacing it. Intead of reading either the custom or the default style for a widget, we read both and use the values from the custom style if it exists, or from the default style otherwise. Change-Id: Ibcec2e9b1e8a95295ab26ede145c287ff2f30be4
* Merge 2402ad60 from honeycomb-mr1. do not merge.Xavier Ducrohet2011-05-231-1/+1
| | | | | | LayoutLib: Fix Canvas_Delegate.native_concat(). Change-Id: I863c43d65a929816ac7c9e69addcc647dac1878b
* Merge e57aa434 from honeycomb-mr1. do not merge.Xavier Ducrohet2011-05-203-32/+72
| | | | | | | | | | | | | | | LayoutLib: Fix issue where <include> with no layout params wouldn't display. The issue is that the layout params from the root element of the included layout should be used but this failed because loading the layout params from the <include> tag didn't throw a RuntimeException in our modified code (BridgeTypedArray). Because we don't want to throw exception in general we only throw it when reading the layout params of an include node which is pretty crappy, but works for now. Change-Id: I83ccf956e8b476f34dfc9a70aebae2288d53746e
* Merge 05b7b69c from honeycomb-mr1. do not merge.Xavier Ducrohet2011-05-193-22/+33
| | | | | Change-Id: I1aca5774dec2e18ab5f9e860f6fd90b481b2857c LayoutLib: support the new baseline/margin query API.
* Merge 2fae858d from Honeycomb-mr1. do not merge.Xavier Ducrohet2011-05-1911-51/+799
| | | | | Change-Id: I648f9ffa9745331ce4104dc4772f78ed933a4909 LayoutLib: implement data binding for most AdapterView
* LayoutLib: don't render when shader's local matrix is set to 0 scale.Xavier Ducrohet2011-04-062-18/+35
| | | | Change-Id: I7726d87f3dd0475ac662f535a08c6435b8b9ed1f
* Merge c5aeac7f from honeycomb.Xavier Ducrohet2011-04-061-23/+75
| | | | | | | | | | | | | | | | | | | | | | | LayoutLib: Fix issue with rendering mode. When the layout content is embedded inside a decor layout to emulate system bar (top or bottom) and title bar (or action bar) then the code computing the full required size based on the RenderingMode would fail because the decor layout would prevents the content layout to take as much room as possible. There is also an issue with the way we know render dialogs as the dialogs usually as a frame with some padding and the previous measurements would not take into account the dialog padding when increasing the screen size. This fix makes the code measure the size of the content layout in the normal rendering, and then separately from the root layout with the proper MeasureSpec to let the content grown. The difference in size is then added to the screen size. Bug: http://code.google.com/p/android/issues/detail?id=15892 Change-Id: Ie9a6c5e254b16785f817dcb9fae755d4936880aa
* Merge 67450db0 from honeycomb. Do not merge.Xavier Ducrohet2011-03-171-11/+4
| | | | | Change-Id: I0ca140dd6d9279ff313f930739ad40fbbed4f335 LayoutLib: TypedArray.getDimensionPixelSize can actually return <0
* Merge 9d76581f from honeycomb. do not merge.Xavier Ducrohet2011-03-152-30/+52
| | | | | | | | LayoutLib: Fix Arc rendering. Looks like Java2D and Skia go in different directions for angles. Change-Id: I4d72db56455afe25b4f51f23a9b29d6c438119ba
* Merge adaa12cd from honeycomb. do not merge.Xavier Ducrohet2011-03-153-12/+23
| | | | | | | | | | | | | LayoutLib: fix Capabilities and getDimensionPixelSize Commented out a Capability that is not in ADT 10. BridgeTypedArray.getDimensionPixelSize shouldn't call getDimension since most of the code is duplicated, and it prevents use from properly detecting malformed attribute values. Change-Id: I008334af605a89f240247a13c0024009247ec5af
* Merge 6f2fb570 from honeycomb. do not merge.Xavier Ducrohet2011-03-142-14/+10
| | | | | | | | | LayoutLib: Fix dimension parsing to handle negative value. Also make TypedArray.getDimensionPixelSize properly handle negative values (which are not allowed). Change-Id: I03ffcef5ab7ec7ef95419566776dcc798845fd88
* Merge c12b4093 from honeycomb. do not merge.Xavier Ducrohet2011-03-141-25/+80
| | | | | Change-Id: Icfbb70c097d87bf92415c6f0534346adde4c02fe LayoutLib: Implement some missing add###() method in Path.
* Merge 1911a6f7 into gingerbread. do not merge.Xavier Ducrohet2011-02-2512-66/+67
| | | | | Change-Id: I6d56644c4ab1a70eb4a6d0d2e5d84ea4aa674041 LayoutLib: move tests to their own project.
* LayoutLib: Adapt the HC layoutlib to GB. do not merge.Xavier Ducrohet2011-02-2340-1422/+296
| | | | Change-Id: I0b2016987a65fabbc0ce7011514543349e9fb929
* LayoutLib: Original import of Honeycomb's layoutlib. do not merge.Xavier Ducrohet2011-02-23141-8401/+17623
| | | | | | frameworks/base.git @ f0a53435f14d23d9555fc46014352ee6a7baa647 Change-Id: Ibc215751693dc7650683b61bb458f7c8beaf8060
* GL texture filtering changed from AND to OR, so rename tag name to match.Dan Morrill2010-12-131-2/+2
| | | | | | | (<uses-foo> == AND, <supports-foo> == OR, e.g. uses-feature vs. supports-screen). Change-Id: I0f20aed7f95169d9adfc7fe128191eb6e49d116f
* fix xlarge support in aapt for gingerbreadScott Main2010-11-041-2/+2
| | | | Change-Id: I4d8872fb839a6eadc538055215d4455af328846c
* 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
* Fix rendering of digitalClock/Gallery in Eclipse editors.Xavier Ducrohet2010-10-263-11/+104
| | | | Change-Id: I80f4f90b173529632eaf2fbc3bb5471b7ede8216
* Implement issue #3116702: New manifest tags for supported screen sizes DO ↵Dianne Hackborn2010-10-211-9/+50
| | | | | | NOT MERGE Change-Id: Iabf64d86c89d387ffbfbc39f950d308a73fe17eb
* Link against the static libcrypto in external/openssl.Ying Wang2010-10-141-14/+11
| | | | Change-Id: Iad41ec975f9b9a4aec0b8470678320f5abe03e1f
* Do not build pbkdf2gen on non-Linux hostsKenny Root2010-10-141-7/+10
| | | | Change-Id: I9f575a2ca7d45102a4f67424ea5866cf750adb13
* 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
* | 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
* | 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
* 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
* Add new API to find out whether external storage is removable.Dianne Hackborn2010-10-041-8/+10
| | | | | | | | This is implemented based on whether we are using the "nosdcard" product. Needed to tweak aapt to allow use of the product attribute with other resource definition tags besides strings. Change-Id: I49922d23b52a34183a8e2f4d2515adaf1fc9149a
* Add "none" for vold and deprecate mkobb -cKenny Root2010-10-011-3/+2
| | | | | | | | | | If vold isn't told "none" for the key, it will try to mount it as an encrypted container. Also remove the -c option from mkobb since it can be triggered by including a key as well. Change-Id: I40a8ff3f778bfda682312630e6687ecc14b51844
* Hash keys with MD5; track IBinders not IInterfaceKenny Root2010-09-301-9/+21
| | | | | | | | | | | | Using a plaintext password doesn't work unless it's a certain length, so just hash the plaintext password with MD5 to make it the right length for the twofish encryption. Tracking the IInterface doesn't make much sense since it's different each time, so track the IBinder instead. That way we can unlinkToDeath the binder when the last thing it's holding onto goes away. Change-Id: Id828d25b4d74f27e9d8b4bfb3909c964469cc473
* Call functions to calculate deps and classes.jarYing Wang2010-09-281-8/+4
| | | | | | Instead of hard-coding them. Change-Id: Ia5818a1a69efb0964d5aa7de7e8d30ef04dfeccc
* Allow all apps to call ContentResolver.getType().Dianne Hackborn2010-09-261-0/+6
| | | | | | | | | I can't find the bug number for this, but it is needed for some things we are doing where the app building an intent may not have access to the URI in the data field. This is for HC, but doing in GB to avoid introducing integration issues. Change-Id: I0cac971854198b18775d2a73deb80f23431bfbe2
* Add an aapt option to allow string variations for different devices.Eric Fischer2010-09-233-5/+95
| | | | | | | | | | | | | | | | | | | | The --product option to aapt is a comma-separated list of characteristics of the device being built for. For example, --product nosdcard,grayscale for a device with no SD card and a grayscale screen. Strings can specify a product="characteristic" option to cause that version of the string to be used only for that type of device. All such strings should also specify, at the end of the block, product="default", which will be used if none of the variations match. For example: <string name="choose" product="bw">Choose black or white</string> <string name="choose" product="grayscale">Choose a shade of gray</string> <string name="choose" product="default">Choose a color</string> The default characteristic will also be used when no --product option is specified. Change-Id: Ie6c1505599e02e15b7818e8be6ec47bc6ce71aaa
* Add image creator helper script for OBBsKenny Root2010-09-211-0/+260
| | | | Change-Id: Id3f2b158077e8d104582e0ac720c2428c3ba4d97
* Implement #2964234: Add support for <uses-package> element to aaptDianne Hackborn2010-09-021-0/+9
| | | | Change-Id: Ifb381f387cab7e5a99006691e330d0e3d9d0f250
* Add a --debug-mode option to aapt.Xavier Ducrohet2010-08-313-3/+18
| | | | | | | | | | | When passed (with no needed parameters) to the aapt command line, aapt will insert debuggable=true in the application node of the manifest automatically. This is to be used by the SDK tools to make true "debug" builds that require no code/file change. Change-Id: I6f0a7af7b7d51f26bb0ec012e6f142a6060b8618
* Merge "Add LFH offset to verbose list of APK" into gingerbreadKenny Root2010-08-252-8/+9
|\
| * Add LFH offset to verbose list of APKKenny Root2010-08-252-8/+9
| | | | | | | | | | | | | | | | | | The Local File Header (LFH) offset is printed in debugging cases when the platform is inspecting APKs. This adds the LFH offset field to the list of contents of an APK, so that it can be checked easily against the Central Directory (CD). Change-Id: I08f9a13256bfe6563c1a963c4f0289789b2e7857
* | Fix linux 64 buildBrian Carlstrom2010-08-242-2/+2
|/ | | | | | git cherry-pick -e 49416bc658e37a0f4ae4f2b7b8582dd1606fba0f Change-Id: I37a689acea8aeb5d6ac92ee56b077bafe4fba170
* Fix aapt dump badging to support xlarge screens.Dianne Hackborn2010-08-201-0/+9
| | | | Change-Id: Ieeb757cd48ad9b3f46c5e4aed9d5efaeac834049
* Add OBB flags to support overlaysKenny Root2010-08-181-11/+10
| | | | | | | | | | | * Add flags field in OBB footer to support overlays. * Remove unused 'crypto' and 'filesystem' fields in obbtool (could later be supported in the "flags" field of the OBB footer). * Add notes to document OBB classes before shipping. Change-Id: I386b43c32c5edef55210acb5d3322639c08010ba
* Merge "Output proguard keep flags for fragment classes." into gingerbreadYing Wang2010-08-131-18/+48
|\
| * Output proguard keep flags for fragment classes.Ying Wang2010-08-131-18/+48
| | | | | | | | | | Change-Id: I28c10fbf18b91f8ba3dfc2575cd41215f65f11ec Bug: 2916847
* | Merge "Change aapt's warning message to suggest formatted="false", not ↵Eric Fischer2010-08-131-1/+1
|\ \ | | | | | | | | | "true"." into gingerbread