Commit Graph

5427 Commits

Author SHA1 Message Date
Adam Lesinski
54376bbd4b Merge "DO NOT MERGE: AAPT2: Allow undefined resources (placeholders)" into oc-dev
am: 2f84c4715d

Change-Id: I266b8648e9aa292befa02c4e7dc0ce54f0b26e21
2017-06-05 17:54:37 +00:00
Adam Lesinski
90919978e7 DO NOT MERGE: AAPT2: Allow undefined resources (placeholders)
A resource defined like so:

<item type="drawable" name="foo" />

should be assigned the value @null.

The only exception is for <string> resources, which are given the
empty string value (since <string></string> is ambiguous). The decision
to use "" is based off the fact that old AAPT used to assign "" to all
undefined resources, even non-string ones.

Bug: 38425050
Test: make aapt2_tests
Change-Id: Ib3e0f6f83d16ddd8b279c9fd44a07a37867b85e9
2017-06-02 16:51:59 -07:00
Adam Lesinski
3c860ed41d Merge "AAPT2: Allow any value type for <item> without format attr" into oc-dev
am: 1ac325e4d5

Change-Id: I1b1180f2b33a077b2c46a8466c58d83ed618576e
2017-06-02 02:35:07 +00:00
Adam Lesinski
e597d68d33 AAPT2: Allow any value type for <item> without format attr
TO bring AAPT2 behavior in-line with AAPT, <item> has a default
format of "any", and only becomes restricted with an explicit format
attribute.

Bug: 62260121
Test: make aapt2_tests
Change-Id: Ife416f520e6c2710bb30e3ba3f2d4463794bfa06
2017-06-01 17:16:44 -07:00
Adam Lesinski
ad227a8086 Merge "AAPT2: Update --no-version-vector list" into oc-dev
am: f296105e22

Change-Id: I0cde63dfd73b50debdc56f549f7adb1318f05309
2017-05-31 21:15:32 +00:00
Adam Lesinski
b5cdbdfcf8 Merge "AAPT2: Allow merging of Style attributes from overlays" into oc-dev
am: f42c86660d

Change-Id: I4a52a16fff3d544d8d7d63d8a482ba7e2111d01a
2017-05-31 21:12:58 +00:00
TreeHugger Robot
f296105e22 Merge "AAPT2: Update --no-version-vector list" into oc-dev 2017-05-31 20:49:02 +00:00
Adam Lesinski
f42c86660d Merge "AAPT2: Allow merging of Style attributes from overlays" into oc-dev 2017-05-31 20:48:06 +00:00
Winson Chung
b3419d76a6 Merge changes from topic 'hw_bitmap' into oc-dev
am: 4e73123c52

Change-Id: Ic202387c7fddcf6cc87024812c112e5ce3a4ab7b
2017-05-31 18:56:50 +00:00
Winson Chung
4e73123c52 Merge changes from topic 'hw_bitmap' into oc-dev
* changes:
  DO NOT MERGE Updating AnimationSpec and related internal APIs to use GraphicBuffer.
  Update code to draw into hardware bitmaps.
2017-05-31 18:46:59 +00:00
Adam Lesinski
41ea44f63d AAPT2: Update --no-version-vector list
Keep in sync with AAPT. Since gradle is moving to use AAPT2
by default, updates to AAPT will no longer be necessary and
this will be the authoritative list until a more programmatic
solution presents itself.

Bug: 62211148
Test: manual
Change-Id: Id9232c9fb730c50e4850887fa0f5da82574ca900
2017-05-31 10:23:58 -07:00
Adam Lesinski
5924d8c9ab AAPT2: Allow merging of Style attributes from overlays
Previously style overlays would completely override an existing style.
To be compatible with AAPT, styles now merge with the overlay, allowing
the overlay's attributes and parent to take precedence.

Bug: 38355988
Test: make aapt2_tests
Change-Id: Id25c7240050a43e6a4a177c6e3d51e048d0cceb5
2017-05-31 10:09:06 -07:00
Winson Chung
aa7fa01353 DO NOT MERGE Updating AnimationSpec and related internal APIs to use GraphicBuffer.
- This reduces the copy of the hardware bitmap when it is
  parceled/unparceled.

Bug: 38507414
Bug: 62021436
Test: Launch Overview to/from app, ensure that the header bar shows
Test: go/wm-smoke

Change-Id: I85a9a59a0a3699d1642158061d10fddef34393c3
Signed-off-by: Winson Chung <winsonc@google.com>
2017-05-31 16:23:24 +00:00
Adam Lesinski
ce1e415d55 Merge "AAPT2: Fix <add-resource> tag for overlays" into oc-dev
am: 8255ced3f5

Change-Id: Icc420eea48a8379723c0bc84a5f30c03ac2a2492
2017-05-30 20:53:38 +00:00
Adam Lesinski
c69611fd86 Merge "AAPT2: Follow symlinks when compiling" into oc-dev
am: 6ea61f9c6d

Change-Id: I18dc95b8adf503e0bf72e5b48036945dc95312de
2017-05-27 01:51:55 +00:00
Adam Lesinski
4488f1c74a AAPT2: Fix <add-resource> tag for overlays
Bug: 38355988
Test: make aapt2_tests
Change-Id: Iea8887f55f8ceb2c15bd963405fd132916173c0c
2017-05-26 17:38:34 -07:00
Adam Lesinski
2354b56837 AAPT2: Follow symlinks when compiling
Bug: 62144459
Test: make AaptSymlinkTest
Change-Id: Idb3ab1ece17c52bb4fd174ec4c08a9e173289e55
2017-05-26 16:56:34 -07:00
Adam Lesinski
138d2a65b3 Merge "AAPT2: Implement attribute compat versioning" into oc-dev
am: e229113d46

Change-Id: I0200771f675cdfa69c458c374d3c16b0d91c5756
2017-05-26 18:49:11 +00:00
Adam Lesinski
c744ae8aca AAPT2: Implement attribute compat versioning
This change defines some hardcoded rules to degrade
attributes in newer SDKs to specific older attributes.

An attribute with a degrade rule will generate a new XML for the API
in which the attribute resulting from the degradation was introduced.

Since API 22 (Lollipop MR1), attributes are correctly ignored and do
not need to be versioned. In XML files defined for APIs 22+, the
original and degraded attributes coexist in the same XML file.

One such example is paddingHorizontal, introduced in API 26.
paddingHorizontal degrades to paddingLeft and paddingRight, which
were both introduced in API 1.

Bug: 35763493
Test: make aapt2_tests
Change-Id: I4aa8755a9ee2c0cc5afdc55c3d30093fd3a47f3d
2017-05-24 15:14:29 -07:00
Adam Lesinski
0196460f27 Merge "AAPT2: Ignore trailing data after IEND chunk in PNG" into oc-dev
am: 2d885e942d

Change-Id: Ic1c24dd55a4d6258533e57cea957a775e03013df
2017-05-18 17:42:44 +00:00
TreeHugger Robot
2d885e942d Merge "AAPT2: Ignore trailing data after IEND chunk in PNG" into oc-dev 2017-05-18 17:30:26 +00:00
Adam Lesinski
e768ad3708 Merge "AAPT2: Respect format attr in <array> resource" into oc-dev
am: dc6da8b4df

Change-Id: Ic7aa094d3d663d98fa4bc20eaf436f1f453da5d7
2017-05-17 23:11:04 +00:00
Adam Lesinski
dc6da8b4df Merge "AAPT2: Respect format attr in <array> resource" into oc-dev 2017-05-17 22:52:25 +00:00
Adam Lesinski
9d6a0d73e6 Merge "AAPT2: Update locale script filtering logic" into oc-dev
am: 3cd6e0bee5

Change-Id: Ie5377066de50d828f9f0a183c9dab4ee41f433eb
2017-05-17 19:28:43 +00:00
Adam Lesinski
13308bcdf6 AAPT2: Update locale script filtering logic
AAPT got an update to its locale script filtering logic that
dealt with enabling the removal of specific locales like
b+sr+Latn. Update AAPT2 to do the same.

Bug: 28055669
Bug: 29412034
Test: aapt2_tests
Change-Id: I3315c0814796cff05dfa1032d66d0306fe2b12bc
2017-05-16 15:28:36 -07:00
Adam Lesinski
d5fd76a2ff AAPT2: Respect format attr in <array> resource
Bug: 38152130
Test: make aapt2_tests
Change-Id: I84f352afb1a8fd2f329354f789aaa36c5ef88e47
2017-05-16 12:18:53 -07:00
Adam Lesinski
cc73e990e5 AAPT2: Ignore trailing data after IEND chunk in PNG
libpng seems to do the same, so our chunk filter should not care what
comes after.

Bug: 38169876
Test: manual
Change-Id: I020ddfe29ac3eb4d5ef9ace5611c6f6497de443d
2017-05-15 13:07:32 -07:00
Adam Lesinski
25b63c7bb8 Merge "AAPT2: Allow <uses-permission-sdk-23> in manifest" into oc-dev
am: 0d11c91d9e

Change-Id: I27d82f39f3063a9d03a5e4973c45c39e7f0054f6
2017-05-13 00:04:25 +00:00
Adam Lesinski
0d11c91d9e Merge "AAPT2: Allow <uses-permission-sdk-23> in manifest" into oc-dev 2017-05-12 23:54:11 +00:00
Adam Lesinski
4b585db64f AAPT2: Allow <uses-permission-sdk-23> in manifest
Bug: 38269610
Test: build tools/aapt2/integration-tests/AppOne
Change-Id: I1d0b87aa36f6bf82aab146339acf8848166b218d
2017-05-12 15:25:50 -07:00
Sunny Goyal
1e0a89055d Merge "Setting Session commited broadcast when an existing apk is enabled for a different user" into oc-dev
am: fc157e702f

Change-Id: I4cabbad8bac8fb24c86506a89c29d0a34b90a564
2017-05-12 21:16:32 +00:00
Sunny Goyal
a31a74b993 Setting Session commited broadcast when an existing apk is enabled for
a different user

Test: Manual tests and CTS
Bug: 38204385
Change-Id: Ic3bddbc2e6070c11b11f0685077db7737f2b8849
2017-05-12 10:00:30 -07:00
Diego Perez
38b3c15d4a Merge "Disable font test temporarily" into oc-dev
am: 152f6c8e04

Change-Id: I548bee7f45bfc7f364327233c4b4e1faf75139a1
2017-05-12 11:25:12 +00:00
TreeHugger Robot
152f6c8e04 Merge "Disable font test temporarily" into oc-dev 2017-05-12 11:21:35 +00:00
Adam Lesinski
71aab90db2 Merge "AAPT2: Add option to disable PNG crunching" into oc-dev
am: fb194bb81c

Change-Id: Ie471641c9b5fdb38c9623cc35cb3cc41c05c28a5
2017-05-11 19:06:18 +00:00
Adam Lesinski
32b7e187e1 Merge "AAPT: Allow including dependencies in dump command" into oc-dev
am: 33644ff3f9

Change-Id: Ibabd8a7517df444c97a4d1eb0793b9179b2a121f
2017-05-11 18:49:14 +00:00
Adam Lesinski
fb194bb81c Merge "AAPT2: Add option to disable PNG crunching" into oc-dev 2017-05-11 18:39:05 +00:00
Adam Lesinski
33644ff3f9 Merge "AAPT: Allow including dependencies in dump command" into oc-dev 2017-05-11 18:36:42 +00:00
Adam Lesinski
57fe48389f AAPT: Allow including dependencies in dump command
Feature splits depend on their base. The dump badging command
does resource resolution, and needs to be able to find resources
located in the base APK of a feature split.

Bug: 38038608
Test: manual
Change-Id: I8c22f0083c46a853a3a56a4049715409ac2723fe
2017-05-10 15:42:22 -07:00
Adam Lesinski
28e6c0bac2 AAPT2: Add option to disable PNG crunching
When compiling, a developer may want to disable PNG crunching
for a specific set of PNGs.

Bug: 37729284
Test: manual
Change-Id: I134f208f8bb212df07a4eef65b467985a6443375
2017-05-10 15:00:10 -07:00
Alex Klyubin
f18b4eae50 Merge "Merge "Switch from libcrypto_static to libcrypto target" am: 4ad5256547 am: 44eb369c83" into nyc-mr2-dev-plus-aosp
am: 473e674143

Change-Id: I25e54403e7d41e5e897654ce71e6919d48503a1f
2017-05-09 21:24:05 +00:00
Adam Lesinski
84da7cdafe Merge "AAPT2: Ignore namespaced elements in AndroidManifest.xml" into oc-dev
am: dea0438385

Change-Id: I7868395090d2d49eeab80b61a73498f7535a57ab
2017-05-09 20:19:43 +00:00
Alex Klyubin
4ad5256547 Merge "Switch from libcrypto_static to libcrypto target" 2017-05-09 19:13:53 +00:00
Adam Lesinski
63699b128e AAPT2: Ignore namespaced elements in AndroidManifest.xml
Some third party stores/tools expect manifest elements
under their namespace, and AAPT2 shouldn't fail if these
are present.

Bug: 37943705
Test: make aapt2_tests
Change-Id: I87b7500c7da5e8e79fc2a78b30e8e4334124af3d
2017-05-08 18:36:33 -07:00
Alex Klyubin
9d2b22d2e6 Switch from libcrypto_static to libcrypto target
libcrypto target offers the same static library as libcrypto_static.
Thus, there's no need to use libcrypto_static.

Test: make pbkdf2gen
      Run pbkdf2gen with and without a password and confirm it works
Bug: 26160319

Change-Id: I89a60b7521e6c3df91421d0edf64a71b8b2c20e0
2017-05-08 15:12:00 -07:00
Sergey Prigogin
3d33f5cf77 Merge "Fix a NPE with outlineProvider="none"" am: 46a4fbb2e4 am: 65d65ec14b
am: a3460f2bb1

Change-Id: Iccb6dc6a7758abffe2d25bcc8b5dfbb1f600b05c
2017-05-08 21:20:38 +00:00
Sergey Prigogin
46a4fbb2e4 Merge "Fix a NPE with outlineProvider="none"" 2017-05-08 20:44:12 +00:00
Yi Kong
087e2d46ab Resolve merge conflicts of ccc5b9bbd0 to oc-dev-plus-aosp
Test: Build
Change-Id: I7d3d6bb4c436b2025a0293f9c6475855243f4dd9
2017-05-02 12:49:25 -07:00
Diego Perez
2931eb0d95 Disable font test temporarily
Bug: 37725933
Test: Disables test
Change-Id: I6be7e89c79cde97e088d2a897e3af38b8d58973d
2017-05-02 17:51:31 +01:00
Yi Kong
b1d8144ef0 SymbolComparator operator() is missing const
Clean up, no functionality change.

Test: build
Bug: 37752547
Change-Id: I7b6f368c0d0776f956a8b99353df7b23cbbc388d
2017-05-01 10:57:39 -07:00