1761 Commits

Author SHA1 Message Date
Deepanshu Gupta
e9abc279fd Merge "Fix theme/style resolution in Layoutlib" 2014-04-07 22:27:01 +00:00
Deepanshu Gupta
ddf286282d Fix sdk build
Change-Id: Ic08b57fdf2a653071a403bcc2c6b239a19363f72
2014-04-04 18:02:57 -07:00
Deepanshu Gupta
bfec73c2db Fix theme/style resolution in Layoutlib
Change-Id: Icfb91e566666408802dadc0e2070991151b16b9d
2014-04-04 13:44:22 -07:00
John Spurlock
0a0454fdcc am 642421aa: am 5c31e487: Merge "Introduce new UI_MODE_TYPE_WATCH and qualifier." into klp-modular-dev
* commit '642421aa7f284817cc1a972a7f9c7a64696a0116':
  Introduce new UI_MODE_TYPE_WATCH and qualifier.
2014-04-04 19:34:11 +00:00
John Spurlock
642421aa7f am 5c31e487: Merge "Introduce new UI_MODE_TYPE_WATCH and qualifier." into klp-modular-dev
* commit '5c31e487c4577e1c47ee7c949325d6a13f0d462e':
  Introduce new UI_MODE_TYPE_WATCH and qualifier.
2014-04-04 19:28:09 +00:00
John Spurlock
5c31e487c4 Merge "Introduce new UI_MODE_TYPE_WATCH and qualifier." into klp-modular-dev 2014-04-04 19:24:09 +00:00
John Spurlock
6c191299a7 Introduce new UI_MODE_TYPE_WATCH and qualifier.
Default ui mode to watch if we have FEATURE_WATCH.

Bug:13395758
Change-Id: Ie5ff95de60e69e91ad3612c7d2f1fca7f49061bd
2014-04-04 15:21:53 -04:00
Xavier Ducrohet
72b2f53690 am 76c484de: am d93b0b67: am e448bcf7: Merge "Add missing dependency in layoutlib build file [DO NOT MERGE]" into klp-dev
* commit '76c484de88317fbadc8a070fc333d4fb14355335':
  Add missing dependency in layoutlib build file [DO NOT MERGE]
2014-04-03 22:24:47 +00:00
Xavier Ducrohet
76c484de88 am d93b0b67: am e448bcf7: Merge "Add missing dependency in layoutlib build file [DO NOT MERGE]" into klp-dev
* commit 'd93b0b67754f6d06407086278298f44156458216':
  Add missing dependency in layoutlib build file [DO NOT MERGE]
2014-04-03 22:17:10 +00:00
Deepanshu Gupta
831f3ce9b5 Add stub getThemeAttributeId() to BridgeTypedArray
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
2014-04-01 10:17:31 -07:00
Deepanshu Gupta
779b0eea30 Merge "Fix visitFieldInsn in layoutlib_create." 2014-04-01 05:37:23 +00:00
Deepanshu Gupta
4a0f93bd32 Fix visitFieldInsn in layoutlib_create.
The bug caused some classes to be missed when computing the dependencies
of the existing classes.

Change-Id: I7285ff67e016ce5d73a8550501f49acc73cfadfa
2014-03-31 19:06:53 -07:00
Deepanshu Gupta
e345507ca4 Add missing dependency in layoutlib build file [DO NOT MERGE]
Add missing dependency on built_ext_data

Change-Id: I4e7cca7f6cbc7f5b7416ac9b85a9aec01e61ecd4
(cherry picked from commit 411b9691e39c0bdd0dafdda7db2737b99b45769e)
2014-03-31 23:15:52 +00:00
Deepanshu Gupta
411b9691e3 Add missing dependency in layoutlib build file
Add missing dependency on built_ext_data

Change-Id: I4e7cca7f6cbc7f5b7416ac9b85a9aec01e61ecd4
2014-03-31 16:11:13 -07:00
Adam Lesinski
587e420ea9 am 004ceaaa: am 55a65509: Merge "Reduce warning verbosity in aapt"
* commit '004ceaaa4d3ddfc66ba3f3635e987c2ddc7f2d09':
  Reduce warning verbosity in aapt
2014-03-27 21:05:06 +00:00
Adam Lesinski
776abc24cd Uses VMRuntime.newUnpaddedArray for ideal array sizes
Bug:13028925

Change-Id: I0a9301248b10a339afbdc5e4ffe3310ac4fa1fb7
2014-03-27 11:42:10 -07:00
Adam Lesinski
de898ff429 Shared library resource support
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
2014-03-25 12:09:56 -07:00
Dianne Hackborn
852472d9aa Fix build.
Change-Id: I1dd79e932a551bd537d2c71e8fca29a299c9312f
2014-03-24 14:53:39 -07:00
Adam Lesinski
e119b22146 Reduce warning verbosity in aapt
- Attributed source of problems to the correct file.
- Only verify string localizations against valid
  locales.
Bug:13140015
Change-Id: I9dabc5efa0510649caee8af0c8ebb803d6f48269
2014-03-24 10:50:34 -07:00
Adam Lesinski
ac6e97a5a6 Merge "Reduce warning verbosity in aapt" 2014-03-21 16:51:12 +00:00
Adam Lesinski
a01a9374fd Reduce warning verbosity in aapt
- Attributed source of problems to the correct file.
- Only verify string localizations against valid
  locales.
Bug:13140015
Change-Id: I9dabc5efa0510649caee8af0c8ebb803d6f48269
2014-03-20 18:14:48 -07:00
Svetoslav
1a5255d547 Fixing yet another build breackage
Change-Id: I83597d5433fc6cc380d5ec1dd6f78e115e76db5b
2014-03-20 14:54:08 -07:00
Deepanshu Gupta
a72da3aec6 Merge "Add native method delegates to layoutlib" 2014-03-14 21:16:22 +00:00
Deepanshu Gupta
103d40960d Add native method delegates to layoutlib
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
2014-03-14 13:31:12 -07:00
Narayan Kamath
ceb2e0a605 am 1abb7e0f: am 63938750: am c0232642: am 629daddd: Merge "Fix layoutlib build."
* commit '1abb7e0f3920b31cf216b99fc83231d80dfa7ca4':
  Fix layoutlib build.
2014-03-14 17:53:05 +00:00
Narayan Kamath
6393875024 am c0232642: am 629daddd: Merge "Fix layoutlib build."
* commit 'c0232642b74517aa2717673f0811ba65c620f491':
  Fix layoutlib build.
2014-03-14 14:22:30 +00:00
Narayan Kamath
c73991bda0 Fix layoutlib build.
Was using private data structures from libcore.

Change-Id: I5bd43190081891659e18b5c871686e6078efcc81
2014-03-14 14:10:30 +00:00
Deepanshu Gupta
f978f16e50 resolved conflicts for merge of c76345a3 to klp-modular-dev-plus-aosp
Change-Id: Id0aae224e17651bc07aa3f5b1a06923603d025b8
2014-03-11 16:39:13 -07:00
Deepanshu Gupta
792f38ddd9 Merge "Fix the delegate method signatures in LayoutLib" 2014-03-11 21:22:40 +00:00
Narayan Kamath
b5c4e7fd38 resolved conflicts for merge of 92860a74 to master
Change-Id: I3036ef9f1251c756092dc5ee2c4fed8146855e1e
2014-03-10 10:57:05 +00:00
Narayan Kamath
8272c84cb5 am bbf82665: am 6e2fb587: Merge "LP64: Make 9 patches architecture agnostic."
* commit 'bbf826659e8e5d0be683b2459207c495303d53b6':
  LP64: Make 9 patches architecture agnostic.
2014-03-10 10:47:45 +00:00
Narayan Kamath
6381dd4ff2 LP64: Make 9 patches architecture agnostic.
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
2014-03-10 10:00:02 +00:00
Tim Kilbourn
9eaaaf0fe3 resolved conflicts for merge of a81ee86b to master
Change-Id: I7be3a64261d2405eda55b43c02b47657f393c095
2014-03-07 23:04:03 -08:00
Ying Wang
0323098269 am 71364f8c: am f5f4d930: am 74bebf6f: Exclude the host aapt and aidl from PDK build.
* commit '71364f8c1e1bcc84375830dd5904dfe7cdfb5ed6':
  Exclude the host aapt and aidl from PDK build.
2014-03-08 05:46:48 +00:00
Tim Kilbourn
032305fbcf am b559b371: Merge "Dump leanback info in aapt dump badging." into klp-modular-dev
* commit 'b559b37150d24411f0b5ef102ced8d5acf858a0e':
  Dump leanback info in aapt dump badging.
2014-03-08 01:55:00 +00:00
Ying Wang
f5f4d93060 am 74bebf6f: Exclude the host aapt and aidl from PDK build.
* commit '74bebf6faed2d34814ffc3d46664330ea568f7b2':
  Exclude the host aapt and aidl from PDK build.
2014-03-08 01:54:52 +00:00
Tim Kilbourn
b559b37150 Merge "Dump leanback info in aapt dump badging." into klp-modular-dev 2014-03-08 00:55:48 +00:00
Tim Kilbourn
0a5a5d6996 Dump leanback info in aapt dump badging.
Leanback launcher activities are reported, including the banner.

Change-Id: Ifa496736ad3ba4239ec95e166768af895ff4dc53
2014-03-07 16:47:42 -08:00
Ying Wang
74bebf6fae Exclude the host aapt and aidl from PDK build.
Bug: 13028632
Change-Id: I0f774b19be77462d0fa271088a4a5a152729d13c
2014-03-07 15:56:14 -08:00
Deepanshu Gupta
0d7ebc51ff Fix the delegate method signatures in LayoutLib
Change-Id: I262c285c1047958afdb024724959d5afb3552802
2014-03-05 19:23:48 -08:00
David 'Digit' Turner
fd2c77ca24 am 4bd720c2: am a05e7526: am 9c6f41e3: am be7b8f4f: Merge "aidl: Support building with updated host sysroot."
* commit '4bd720c2c63b2400437db971ac96616693a8fe3b':
  aidl: Support building with updated host sysroot.
2014-03-06 00:59:15 +00:00
David 'Digit' Turner
a05e752615 am 9c6f41e3: am be7b8f4f: Merge "aidl: Support building with updated host sysroot."
* commit '9c6f41e3eb2258d52480be04dd8916a10f8be8db':
  aidl: Support building with updated host sysroot.
2014-03-05 23:18:20 +00:00
David 'Digit' Turner
be7b8f4f4c Merge "aidl: Support building with updated host sysroot." 2014-03-05 23:10:45 +00:00
David 'Digit' Turner
ea6d2197ba aidl: Support building with updated host sysroot.
This patch fixes tools/aidl/Type.cpp to compile with
a more recent SDK host toolchain sysroot (that has not
been submitted yet).

The main issue is that the code uses ssize_t which is
defined in <sys/types.h>, but didn't include the header
directly.

Apparently, this no longer compiles when using the Ubuntu
10.04 libc6-dev headers (the current SDK toolchain is
based on Ubuntu 8.04), so perform an explicit include
to fix this.

NOTE: This doesn't break the Windows SDK build.

Change-Id: Idcacf8f8d1c606b39bf8aa75ab409aa0c2a3cd5a
2014-03-05 23:57:46 +01:00
Ying Wang
03c6628f40 am 04c5bcf2: am 160c39d8: am 26026c62: am dd72b6e7: Merge "Fix indirect misuse of ."
* commit '04c5bcf2bb82099fa8c02dd9a38ccac36d326373':
  Fix indirect misuse of $(my-dir).
2014-03-01 17:35:54 +00:00
Ying Wang
160c39d8a5 am 26026c62: am dd72b6e7: Merge "Fix indirect misuse of ."
* commit '26026c62788f508f9de0df608dd7043e7d1399f6':
  Fix indirect misuse of $(my-dir).
2014-03-01 17:30:34 +00:00
Ying Wang
f794d63425 Fix indirect misuse of $(my-dir).
Change-Id: I20a98a8e1378da3a53e6a6d599c8fc0100f7f87a
2014-02-28 18:04:37 -08:00
Xavier Ducrohet
5ea4be5214 am b2334254: am ec84ada6: am 5e5602da: am 0c72b769: Merge "Update layoutlib method for SystemClock"
* commit 'b2334254ef497e0dcda68d257c096516c77679a4':
  Update layoutlib method for SystemClock
2014-02-27 23:41:38 +00:00
Xavier Ducrohet
ec84ada6e8 am 5e5602da: am 0c72b769: Merge "Update layoutlib method for SystemClock"
* commit '5e5602da5fa9cd2e1d135b2310af2a8352f65e8d':
  Update layoutlib method for SystemClock
2014-02-27 23:34:34 +00:00
Deepanshu Gupta
36acf8baeb Add tests to the layoutlib eclipse project.
Specify the test folder in the layoutlib/bridge eclipse project.

Also add the sourcepath for layoutlib-api-prebuilt.jar

Change-Id: I194ed182618e564388d6df645e2de7f59897fa1e
2014-02-27 11:59:50 -08:00