4231 Commits

Author SHA1 Message Date
Adam Lesinski
400136e06a Merge "AAPT2: Accept aliases defined for external resource types" 2015-11-07 22:11:00 +00:00
Adam Lesinski
caf4a89f18 Merge "AAPT2: Disambiguate merging of resources" 2015-11-07 22:09:37 +00:00
Adam Lesinski
fa10505cea AAPT2: Accept aliases defined for external resource types
Resource types that are typically stored outside of the resource table
(like layout, xml, drawable) can only have aliases (reference to another
resource).

Change-Id: Idb768801f02bb142e5be5e438904f221499bd756
2015-11-07 13:34:39 -08:00
Adam Lesinski
83f2255f69 AAPT2: Disambiguate merging of resources
Merging local app resources is slightly different than merging
resources from a static library.

Local app resources may not have a package name set, but we do take interest in the
ID set for the package (should be 0x0 or match the ID of the app we're building).

Static library resources have an explicit package name defined for them, so we
only merge resources from that package.

Change-Id: I95e559ae94cc1df6972e77a347b1b37a93674c4d
2015-11-07 11:51:23 -08:00
Adam Lesinski
b444afc0f4 Merge "AAPT2: Add support for clearer in-progress public attributes" 2015-11-07 18:07:01 +00:00
Jeff Sharkey
94d0b64d4f Merge "Initial file-based encryption public APIs." 2015-11-07 02:37:21 +00:00
Jeff Sharkey
15447798a3 Initial file-based encryption public APIs.
Define two explicit directories where device-encrypted and
credential-encrypted data will be stored.  Third-party apps only
need access to the device-encrypted directory, so that's the only
API exposed for now.

General cleanup in how ApplicationInfo details are derived.

Bug: 22358539
Change-Id: If0a0108721a4aa1c3052b4912e08604bbf24e1ae
2015-11-06 18:35:27 -08:00
Adam Lesinski
6a85b54d50 Merge "AAPT2: Fix inclusion of comments in R.java javadoc" 2015-11-07 02:31:20 +00:00
Adam Lesinski
27afb9e889 AAPT2: Add support for clearer in-progress public attributes
Before, the ID assigned to a public resource without an explicitly set id
was more difficult to figure out. It would be the next available ID.

AAPT2 introduces a new way to specify public attributes in progress.

<public-group type="attr" first-id="0x0101047f">
  <public name="foo" />
  <public name="bar" />
  ...
</public-group>

The IDs assigned to each resource is auto-incremented starting from `first-id`.
This also keeps resource's with the same type grouped together so that
the auto-incrementing nature is evident.

Also, due to how AAPT2 was implemented, this is required :P

Change-Id: I95ea92ad0405e87ed0b1766879bb2f1d9d0b636e
2015-11-06 18:25:04 -08:00
Adam Lesinski
b274e35abf AAPT2: Fix inclusion of comments in R.java javadoc
Comments weren't being copied when merged from the various
resource tables.

Also refactored the JavaClassGenerator to omit a class
if no entries exist for it.

Change-Id: I6eaa89b7b3715bc05403635a2baf0d1db3efd142
2015-11-06 16:37:57 -08:00
Winson
13d30660ef Fixing issue with canceling the thumbnail in addition to the app window.
Bug: 25392381
Change-Id: Ib507f53bcd2aad4771c2546f5e8bfe771769e9a2
2015-11-06 15:30:29 -08:00
Jorim Jaggi
1a2f3ab485 Fix build
Change-Id: Ie716bbec49920af459ceddf8e51387ccf5946a7f
2015-11-06 20:35:00 +00:00
Adam Lesinski
f1c54e6e89 Merge "AAPT2: Fix small issue with detecting translatable resources" 2015-11-05 19:20:05 +00:00
Adam Lesinski
9f22204c3a AAPT2: Fix small issue with detecting translatable resources
Change-Id: Idd21b5de4d20be06c6f8c8eb5a22ccd68afc4927
2015-11-05 10:56:32 -08:00
Deepanshu Gupta
2b23bc32cc Merge "Fix Switch colors" into mnc-ub-dev am: 71093465ab
am: ceb2b54909

* commit 'ceb2b549095b5f9a70baef6a0a847b453735f97a':
  Fix Switch colors
2015-11-05 17:29:47 +00:00
Deepanshu Gupta
ceb2b54909 Merge "Fix Switch colors" into mnc-ub-dev
am: 71093465ab

* commit '71093465abbdf887c705b40fb0cb8a2919894c4b':
  Fix Switch colors
2015-11-05 17:24:38 +00:00
Deepanshu Gupta
c9b8f95c99 Fix Switch colors
The conversion of the PorterDuff mode from int to enum was incorrect
resulting in the wrong PorterDuff Mode being used.

Change-Id: I7607d505b6e4382e6101869971154f6a77db279c
2015-11-05 09:20:07 -08:00
Filip Gruszczynski
14b4e57c1b Remove blink during the freeform -> recents transition.
We achieve the desired result by prolonging the last frame of the
animation until recents tells that it drew its content. The CL also
includes cleanup that moves code that depends heavily on WindowState
fields into that class.

Bug: 24913782
Change-Id: I5ee5b18504dd4a86c24033d17eca21cd31936bca
2015-11-04 09:53:22 -08:00
Diego Perez
96eb6d3e57 Merge "Remove auto-boxing during the inflate" into mnc-ub-dev am: 1c442aca0a
am: 7cdbfaf459

* commit '7cdbfaf459ede7ede430188ed4b1a990ba762144':
  Remove auto-boxing during the inflate
2015-11-04 14:44:20 +00:00
Diego Perez
fdf89c162f Merge "Update StaticLayout_Delegate to use new nLoadHyphenator" into mnc-ub-dev am: 7dda46e740
am: 724af9ce6f

* commit '724af9ce6fceb9ddf2ef4536d0da41a520928d5e':
  Update StaticLayout_Delegate to use new nLoadHyphenator
2015-11-04 14:42:58 +00:00
Diego Perez
7cdbfaf459 Merge "Remove auto-boxing during the inflate" into mnc-ub-dev
am: 1c442aca0a

* commit '1c442aca0a1b054e3aa0a40ba89c08b39099be2f':
  Remove auto-boxing during the inflate
2015-11-04 14:35:39 +00:00
Diego Perez
724af9ce6f Merge "Update StaticLayout_Delegate to use new nLoadHyphenator" into mnc-ub-dev
am: 7dda46e740

* commit '7dda46e740250d753bb9d01e129e91695ab8cfe2':
  Update StaticLayout_Delegate to use new nLoadHyphenator
2015-11-04 14:34:19 +00:00
Diego Perez
1c442aca0a Merge "Remove auto-boxing during the inflate" into mnc-ub-dev 2015-11-04 14:26:15 +00:00
Diego Perez
631c2ffd6f Update StaticLayout_Delegate to use new nLoadHyphenator
Small fix to update call parameters

Change-Id: I4322aa212493ec2970ae17ec1918b9b7e2f8e93a
2015-11-04 11:35:34 +00:00
Adam Lesinski
08322c2152 Merge "AAPT2: Add round qualifer support" 2015-11-04 00:17:30 +00:00
Adam Lesinski
aaeabee97b Merge "AAPT2: Verify positional Java String format arguments in strings" 2015-11-04 00:17:08 +00:00
Adam Lesinski
6425497f41 AAPT2: Add round qualifer support
Change-Id: Id5a1331198e01be7ca4d87b8833900e51f82ece5
2015-11-03 16:16:17 -08:00
Adam Lesinski
570b6bde76 Merge "AAPT2: Add Manifest fixing/validation" 2015-11-03 21:02:36 +00:00
Adam Lesinski
588396044e Merge "AAPT2: Add support for comments in R.java" 2015-11-03 21:01:41 +00:00
Adam Lesinski
b23f1e077b AAPT2: Verify positional Java String format arguments in strings
Change-Id: Id415969035a0d5712857c0e11e140155566a960c
2015-11-03 12:58:12 -08:00
Diego Perez
91fa3ba4cc Remove auto-boxing during the inflate
Change-Id: I3f9ba5d78363f878fa0c58ca8cbf736bd43fe1c0
2015-11-03 14:59:23 +00:00
Brian Carlstrom
faa09f531f Fix layoutlib-tests build by adding dummy implementation of IWindowSession.repositionChild to BridgeWindowSession
Change-Id: I9c3a609c76716b35595b82a33f32883d4f46c517
2015-11-02 22:41:45 -08:00
Adam Lesinski
2ae4a877d1 AAPT2: Add Manifest fixing/validation
Change-Id: I7f6d8b74d1c590adc356b4da55cb6cb777cdf1da
2015-11-02 16:56:34 -08:00
Winson
6b05f8030e Fixing build breakage.
Change-Id: Idf8759c7bc88af534103731eef535fc310bed7e5
2015-11-03 00:43:15 +00:00
Adam Lesinski
3b4cd94034 AAPT2: Add support for comments in R.java
Change-Id: Iaa5f3b75bf7de9dbf458fa5c452f7312989f4c4f
2015-11-02 11:53:47 -08:00
Adam Lesinski
104e028c3a Merge "AAPT2: Support generating Manifest.java" 2015-11-02 19:09:42 +00:00
Tor Norbye
562bb9f3a7 Merge "Don't set modification times in aapt zip entries" 2015-11-02 15:02:28 +00:00
Tor Norbye
b3559643b9 Don't set modification times in aapt zip entries
Use a modification timestamp of 0 for all files
inside the zip archive to make the build repeatable.

Change-Id: Ie6e57329469b99c6f93cb0a6083e0c402be99815
2015-10-30 20:00:13 -07:00
Filip Gruszczynski
f254e95d42 Fix build.
Change-Id: If103e0fbef656d565ce912c3fd13aa6497ab9d4a
2015-10-30 16:14:57 -07:00
Adam Lesinski
ca5638fd85 AAPT2: Support generating Manifest.java
This includes comments from AndroidManifest.xml.

Change-Id: I412d9ecb12bad20a49a683d6b3bea4a0be1235ae
2015-10-30 13:51:11 -07:00
Adam Lesinski
e78fd617ec AAPT2: Move comments and source into Value
Values are closely related to where they were defined, so
this information should live inside the Value.

This also enables comments to be attached to nested Values.

Change-Id: Ic7481b5a5f26d0ef248d638e2e29252f88154581
2015-10-22 16:35:47 -07:00
Adam Lesinski
9e10ac7015 AAPT2: Process <java-symbols> and private symbol package
Need to introduce the idea of multiple levels of visibility to support <java-symbol>.

Public, Private, Undefined.

Public means it is accessible from outside and requires an ID assigned.
Private means that we explicitly want this to be a symbol (show up in R.java), but not visible
to other packages. No ID required.

Undefined is any normal resource. When --private-symbols is specified in the link phase,
these resources will not show up in R.java.

Change-Id: Icba89221e08e685dee7683786aa7112baf28c856
2015-10-22 12:52:49 -07:00
Adam Lesinski
91bbbcf9a9 Merge "Filter products during compile phase" 2015-10-20 19:49:53 +00:00
Deepanshu Gupta
a79795a892 Fix build
Change-Id: I0e85f40955bfbf25e917f27c210c2f6f24d885a0
2015-10-20 11:59:27 -07:00
Adam Lesinski
9ba47d8130 Filter products during compile phase
Unfortunately there is no good way to deal with products in the link phase.
Products are like preprocessor defines in that they are processed early
and change the composition of the compiled unit.

Change-Id: I6d5e15ef60d29df8e83e059ba857c09333993779
2015-10-16 15:50:58 -07:00
Adam Lesinski
1ab598f46c AAPT2: Separate out the various steps
An early refactor. Some ideas became clearer as
development continued. Now the various phases are much
clearer and more easily reusable.

Also added a ton of tests!

Change-Id: Ic8f0a70c8222370352e63533b329c40457c0903e
2015-10-16 12:13:08 -07:00
Dianne Hackborn
c08b0e0dd3 Merge "Revert "Fix build."" 2015-10-13 19:34:44 +00:00
Dianne Hackborn
0b128232d2 Revert "Fix build."
This reverts commit 7a9687f1d7693907189fc315d640c1ad770ab88d.

Change-Id: I5b2f68a4e2b4c399d87c18adc223500b0e1bfcc7
2015-10-13 19:34:28 +00:00
Dianne Hackborn
98f16c6d1a Merge "Fix build." 2015-10-13 18:55:07 +00:00
Dianne Hackborn
7a9687f1d7 Fix build.
Change-Id: Iade965d86ce5f53cf476468423db47c8e6a602b2
2015-10-13 11:52:23 -07:00