summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Adding render stats APIs to UiAutomation (framework)."Svetoslav2014-04-101-11/+12
|\
| * Adding render stats APIs to UiAutomation (framework).Svetoslav2014-04-071-11/+12
| | | | | | | | | | | | bug:12927198 Change-Id: Iae21481c75ae58dcdab3731bf5f1e2844e29d434
* | Support custom views using TimePickerDialog in layoutlibDeepanshu Gupta2014-04-091-0/+1
| | | | | | | | | | | | Bug: http://b.android/com/61515 Change-Id: I0dc3357be0c058adde9d3ea5b6796004b786fd34
* | Merge "Update layoutlib create README"Deepanshu Gupta2014-04-081-138/+128
|\ \
| * | Update layoutlib create READMEDeepanshu Gupta2014-04-081-138/+128
| | | | | | | | | | | | | | | | | | | | | Update the doc to reflect the current state of the tool and use a consistent 100 char column limit. Change-Id: I64fb58cc46abbc2f3759cb1f99d42b5090c1409f
* | | Merge "Make layoutlib load on Java 7 VM"Deepanshu Gupta2014-04-082-1/+12
|\ \ \
| * | | Make layoutlib load on Java 7 VMDeepanshu Gupta2014-04-082-1/+12
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | Prevent Java 7 VM from verifying the StackMapTable for methods by lying about the class version. The changeset also fixes the eclipse project by using the right asm library in the checkout. Change-Id: Idabf165380fb75fcc2d5c8fbd72388f52887a5df
* | | Fix sdk build.Ying Wang2014-04-081-0/+5
| | | | | | | | | | | | Change-Id: I3e620315e082b46ba5fcd4511b9c258bf610ddf5
* | | Merge "Fix theme/style resolution in Layoutlib"Deepanshu Gupta2014-04-074-14/+145
|\ \ \ | |/ / |/| |
| * | Fix theme/style resolution in LayoutlibDeepanshu Gupta2014-04-044-14/+145
| | | | | | | | | | | | Change-Id: Icfb91e566666408802dadc0e2070991151b16b9d
* | | Fix sdk buildDeepanshu Gupta2014-04-041-0/+5
| | | | | | | | | | | | Change-Id: Ic08b57fdf2a653071a403bcc2c6b239a19363f72
* | | am 642421aa: am 5c31e487: Merge "Introduce new UI_MODE_TYPE_WATCH and ↵John Spurlock2014-04-041-0/+5
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | qualifier." into klp-modular-dev * commit '642421aa7f284817cc1a972a7f9c7a64696a0116': Introduce new UI_MODE_TYPE_WATCH and qualifier.
| * | am 5c31e487: Merge "Introduce new UI_MODE_TYPE_WATCH and qualifier." into ↵John Spurlock2014-04-041-0/+5
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | klp-modular-dev * commit '5c31e487c4577e1c47ee7c949325d6a13f0d462e': Introduce new UI_MODE_TYPE_WATCH and qualifier.
| | * \ Merge "Introduce new UI_MODE_TYPE_WATCH and qualifier." into klp-modular-devJohn Spurlock2014-04-041-0/+5
| | |\ \
| | | * | Introduce new UI_MODE_TYPE_WATCH and qualifier.John Spurlock2014-04-041-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Default ui mode to watch if we have FEATURE_WATCH. Bug:13395758 Change-Id: Ie5ff95de60e69e91ad3612c7d2f1fca7f49061bd
| * | | | am 76c484de: am d93b0b67: am e448bcf7: Merge "Add missing dependency in ↵Xavier Ducrohet2014-04-031-0/+1
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | layoutlib build file [DO NOT MERGE]" into klp-dev * commit '76c484de88317fbadc8a070fc333d4fb14355335': Add missing dependency in layoutlib build file [DO NOT MERGE]
| | * | | am d93b0b67: am e448bcf7: Merge "Add missing dependency in layoutlib build ↵Xavier Ducrohet2014-04-031-0/+1
| | |\ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | file [DO NOT MERGE]" into klp-dev * commit 'd93b0b67754f6d06407086278298f44156458216': Add missing dependency in layoutlib build file [DO NOT MERGE]
| | | * | Add missing dependency in layoutlib build file [DO NOT MERGE]Deepanshu Gupta2014-03-311-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add missing dependency on built_ext_data Change-Id: I4e7cca7f6cbc7f5b7416ac9b85a9aec01e61ecd4 (cherry picked from commit 411b9691e39c0bdd0dafdda7db2737b99b45769e)
| * | | | am 004ceaaa: am 55a65509: Merge "Reduce warning verbosity in aapt"Adam Lesinski2014-03-274-92/+98
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * commit '004ceaaa4d3ddfc66ba3f3635e987c2ddc7f2d09': Reduce warning verbosity in aapt
| | * | | | Reduce warning verbosity in aaptAdam Lesinski2014-03-244-92/+98
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Attributed source of problems to the correct file. - Only verify string localizations against valid locales. Bug:13140015 Change-Id: I9dabc5efa0510649caee8af0c8ebb803d6f48269
* | | | | | Add stub getThemeAttributeId() to BridgeTypedArrayDeepanshu Gupta2014-04-011-8/+15
| |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The method is used to obtain theme attribute IDs for drawables for caching. The changeset also fixes some minor style issues found by code inspection. Change-Id: Ib5fe05511397b5ec7cb8e64f6b2769ec2c355f41
* | | | | Merge "Fix visitFieldInsn in layoutlib_create."Deepanshu Gupta2014-04-016-7/+36
|\ \ \ \ \
| * | | | | Fix visitFieldInsn in layoutlib_create.Deepanshu Gupta2014-03-316-7/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The bug caused some classes to be missed when computing the dependencies of the existing classes. Change-Id: I7285ff67e016ce5d73a8550501f49acc73cfadfa
* | | | | | Add missing dependency in layoutlib build fileDeepanshu Gupta2014-03-311-0/+1
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | Add missing dependency on built_ext_data Change-Id: I4e7cca7f6cbc7f5b7416ac9b85a9aec01e61ecd4
* | | | | Uses VMRuntime.newUnpaddedArray for ideal array sizesAdam Lesinski2014-03-271-56/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug:13028925 Change-Id: I0a9301248b10a339afbdc5e4ffe3310ac4fa1fb7
* | | | | Shared library resource supportAdam Lesinski2014-03-259-19/+95
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Shared libraries can now export resources for applications to use. Exporting resources works the same way the framework exports resources, by defining the public symbols in res/values/public.xml. Building a shared library requires aapt to be invoked with the --shared-lib option. Shared libraries will be assigned a package ID of 0x00 at build-time. At runtime, all loaded shared libraries will be assigned a new package ID. Currently, shared libraries should not import other shared libraries, as those dependencies will not be loaded at runtime. At runtime, reflection is used to update the package ID of resource symbols in the shared library's R class file. The package name of the R class file is assumed to be the same as the shared library's package name declared in its manifest. This will be customizable in a future commit. See /tests/SharedLibrary/ for examples of a shared library and its client. Bug:12724178 Change-Id: I60c0cb8ab87849f8f8a1a13431562fe8603020a7
* | | | | Fix build.Dianne Hackborn2014-03-241-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I1dd79e932a551bd537d2c71e8fca29a299c9312f
* | | | | Merge "Reduce warning verbosity in aapt"Adam Lesinski2014-03-214-92/+98
|\ \ \ \ \
| * | | | | Reduce warning verbosity in aaptAdam Lesinski2014-03-204-92/+98
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Attributed source of problems to the correct file. - Only verify string localizations against valid locales. Bug:13140015 Change-Id: I9dabc5efa0510649caee8af0c8ebb803d6f48269
* | | | | | Fixing yet another build breackageSvetoslav2014-03-201-36/+0
|/ / / / / | | | | | | | | | | | | | | | Change-Id: I83597d5433fc6cc380d5ec1dd6f78e115e76db5b
* | | | | Merge "Add native method delegates to layoutlib"Deepanshu Gupta2014-03-142-0/+13
|\ \ \ \ \
| * | | | | Add native method delegates to layoutlibDeepanshu Gupta2014-03-142-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add delegates for Path.native_isConvex and ICU.getCurrencyNumericCode. The original methods were added in 5be83edd15e11420287cc0af93a95d5a6dfae68f and d627bd4525e41b0503f94c2887c3e01618c73105 respectively. TODO: Implement Path_Delegate.native_isConvex Change-Id: If1046467d3950ab6955c6b81383a60fd6bd03fd2
* | | | | | am 1abb7e0f: am 63938750: am c0232642: am 629daddd: Merge "Fix layoutlib build."Narayan Kamath2014-03-141-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| / / / / | |/ / / / | | | | | * commit '1abb7e0f3920b31cf216b99fc83231d80dfa7ca4': Fix layoutlib build.
| * | | | am c0232642: am 629daddd: Merge "Fix layoutlib build."Narayan Kamath2014-03-141-1/+1
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * commit 'c0232642b74517aa2717673f0811ba65c620f491': Fix layoutlib build.
| | * | | Fix layoutlib build.Narayan Kamath2014-03-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Was using private data structures from libcore. Change-Id: I5bd43190081891659e18b5c871686e6078efcc81
| * | | | resolved conflicts for merge of c76345a3 to klp-modular-dev-plus-aospDeepanshu Gupta2014-03-112-4/+20
| |\ \ \ \ | | |/ / / | | | | | | | | | | Change-Id: Id0aae224e17651bc07aa3f5b1a06923603d025b8
| | * | | Merge "Fix the delegate method signatures in LayoutLib"Deepanshu Gupta2014-03-116-94/+46
| | |\ \ \
| | | * | | Fix the delegate method signatures in LayoutLibDeepanshu Gupta2014-03-056-94/+46
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I262c285c1047958afdb024724959d5afb3552802
* | | | | | resolved conflicts for merge of 92860a74 to masterNarayan Kamath2014-03-101-52/+28
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | Change-Id: I3036ef9f1251c756092dc5ee2c4fed8146855e1e
| * | | | | am bbf82665: am 6e2fb587: Merge "LP64: Make 9 patches architecture agnostic."Narayan Kamath2014-03-101-50/+25
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | * commit 'bbf826659e8e5d0be683b2459207c495303d53b6': LP64: Make 9 patches architecture agnostic.
| | * | | | LP64: Make 9 patches architecture agnostic.Narayan Kamath2014-03-101-50/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Res_png_9patch struct had several pointer members whose size differed between 32 and 64 bit platforms. These members have been replaced by uint32_t offsets to serialized data. The serialized form for 9patches places a Res_png_9patch object at the beginning of serialized data, followed by int32_t arrays of xDivs, yDivs and colors. Note that these offsets are not strictly required, since they can be computed from the values of numXDivs, numYDivs & numColors, however they are called in tight loops so having them computed once is a beneficial. This change also removed the unused patch_equals function from aapt's Image.cpp. Change-Id: I3b9ac8ae5c05510d41377cae4dff1c69b40c2531
* | | | | | resolved conflicts for merge of a81ee86b to masterTim Kilbourn2014-03-071-9/+34
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | Change-Id: I7be3a64261d2405eda55b43c02b47657f393c095
| * | | | | am b559b371: Merge "Dump leanback info in aapt dump badging." into ↵Tim Kilbourn2014-03-081-8/+32
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | klp-modular-dev * commit 'b559b37150d24411f0b5ef102ced8d5acf858a0e': Dump leanback info in aapt dump badging.
| | * | | | Merge "Dump leanback info in aapt dump badging." into klp-modular-devTim Kilbourn2014-03-081-8/+32
| | |\ \ \ \
| | | * | | | Dump leanback info in aapt dump badging.Tim Kilbourn2014-03-071-8/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Leanback launcher activities are reported, including the banner. Change-Id: Ifa496736ad3ba4239ec95e166768af895ff4dc53
* | | | | | | am 71364f8c: am f5f4d930: am 74bebf6f: Exclude the host aapt and aidl from ↵Ying Wang2014-03-082-4/+4
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PDK build. * commit '71364f8c1e1bcc84375830dd5904dfe7cdfb5ed6': Exclude the host aapt and aidl from PDK build.
| * | | | | | am 74bebf6f: Exclude the host aapt and aidl from PDK build.Ying Wang2014-03-082-4/+4
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | * commit '74bebf6faed2d34814ffc3d46664330ea568f7b2': Exclude the host aapt and aidl from PDK build.
| | * | | | | Exclude the host aapt and aidl from PDK build.Ying Wang2014-03-072-4/+4
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | Bug: 13028632 Change-Id: I0f774b19be77462d0fa271088a4a5a152729d13c
* | | | | | am 4bd720c2: am a05e7526: am 9c6f41e3: am be7b8f4f: Merge "aidl: Support ↵David 'Digit' Turner2014-03-061-0/+2
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | building with updated host sysroot." * commit '4bd720c2c63b2400437db971ac96616693a8fe3b': aidl: Support building with updated host sysroot.
| * | | | | am 9c6f41e3: am be7b8f4f: Merge "aidl: Support building with updated host ↵David 'Digit' Turner2014-03-051-0/+2
| |\ \ \ \ \ | | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | sysroot." * commit '9c6f41e3eb2258d52480be04dd8916a10f8be8db': aidl: Support building with updated host sysroot.