Adam Lesinski
ed52cefd94
Merge "AAPT2: Ignore trailing data after IEND chunk in PNG" into oc-dev am: 2d885e942d
...
am: 0196460f27
2017-05-18 17:56:15 +00:00
Adam Lesinski
0196460f27
Merge "AAPT2: Ignore trailing data after IEND chunk in PNG" into oc-dev
...
am: 2d885e942d
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
9541078397
Merge "AAPT2: Respect format attr in <array> resource" into oc-dev am: dc6da8b4df
...
am: e768ad3708
2017-05-17 23:22:27 +00:00
Adam Lesinski
e768ad3708
Merge "AAPT2: Respect format attr in <array> resource" into oc-dev
...
am: dc6da8b4df
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
6ff052a556
Merge "AAPT2: Update locale script filtering logic" into oc-dev am: 3cd6e0bee5
...
am: 9d6a0d73e6
2017-05-17 20:02:29 +00:00
Adam Lesinski
9d6a0d73e6
Merge "AAPT2: Update locale script filtering logic" into oc-dev
...
am: 3cd6e0bee5
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
f6d33e57c2
Merge "AAPT2: Allow <uses-permission-sdk-23> in manifest" into oc-dev am: 0d11c91d9e
...
am: 25b63c7bb8
2017-05-13 00:16:00 +00:00
Adam Lesinski
25b63c7bb8
Merge "AAPT2: Allow <uses-permission-sdk-23> in manifest" into oc-dev
...
am: 0d11c91d9e
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
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
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
9a286fedb6
Merge "AAPT2: Add option to disable PNG crunching" into oc-dev am: fb194bb81c
...
am: 71aab90db2
2017-05-11 20:24:25 +00:00
Adam Lesinski
73d39aebd8
Merge "AAPT: Allow including dependencies in dump command" into oc-dev am: 33644ff3f9
...
am: 32b7e187e1
2017-05-11 19:43:18 +00:00
Adam Lesinski
71aab90db2
Merge "AAPT2: Add option to disable PNG crunching" into oc-dev
...
am: fb194bb81c
2017-05-11 19:06:18 +00:00
Adam Lesinski
32b7e187e1
Merge "AAPT: Allow including dependencies in dump command" into oc-dev
...
am: 33644ff3f9
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
TreeHugger Robot
2dd45f4d45
Merge "Stop deprecated parcelables triggering Error FW8"
2017-05-11 05:18:44 +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
Diego Perez
4493b7c429
Removing layout from frameworks/base
...
The directory is being moved to its own project in frameworks/layoutlib
Bug: 36889565
Test: Built manually
Change-Id: I69a1a826d0bac8ede1f9a337c9c1d930bbcd04f3
2017-05-10 12:34:29 +01:00
Jerome Gaillard
13f6a914c2
Merge "Modify font metrics computation to match Android"
2017-05-10 11:22:33 +00:00
Alex Klyubin
38039d8716
Merge "Merge "Merge "Switch from libcrypto_static to libcrypto target" am: 4ad5256547 am: 44eb369c83" into nyc-mr2-dev-plus-aosp am: 473e674143" into oc-dev-plus-aosp
...
am: 9e79409e6f
2017-05-09 22:59:37 +00:00
Adam Lesinski
76bce49d4d
Merge "AAPT2: Ignore namespaced elements in AndroidManifest.xml" into oc-dev am: dea0438385
...
am: 84da7cdafe
2017-05-09 21:31:52 +00: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
2017-05-09 21:24:05 +00:00
Adam Lesinski
84da7cdafe
Merge "AAPT2: Ignore namespaced elements in AndroidManifest.xml" into oc-dev
...
am: dea0438385
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
Jerome Gaillard
fccc122027
Modify font metrics computation to match Android
...
On Android, font metrics top and bottom seem 15% larger than ascent and
descent. Paint_Delegate is modified to reflect this fact.
Test: layoutlib tests updated
Bug: 38117115
Change-Id: I4e9995ccbc991fbb857c8e3af45a908ad55db99e
2017-05-09 18:23:23 +01:00
Jerome Gaillard
7ae52023bb
Update Typeface_Delegate following Change Ied73189b
...
Test: layoutlib tests
Change-Id: I86ef9794751c6adb3f304ae6e00c5e24428da5dd
2017-05-09 13:49:07 +01:00
Pierre Lecesne
aadf27e1b5
Return exit code 1 when an error occurs during 'aapt2 dump'.
...
Bug: 37975355
Test: Manual
Change-Id: Ia29483a4aa10c98e75fe38ac0082759c8574a649
2017-05-09 09:16:24 +01: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
380983107b
Merge "Merge "Fix a NPE with outlineProvider="none"" am: 46a4fbb2e4 am: 65d65ec14b am: a3460f2bb1" into oc-dev-plus-aosp
...
am: 939ba35913
2017-05-08 21:31:02 +00:00
Sergey Prigogin
3d33f5cf77
Merge "Fix a NPE with outlineProvider="none"" am: 46a4fbb2e4 am: 65d65ec14b
...
am: a3460f2bb1
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
TreeHugger Robot
7b3b636593
Merge "Draw rectangle shadow fast in low elevation cases"
2017-05-06 19:54:07 +00:00
Charlie Tsai
8618589908
Draw rectangle shadow fast in low elevation cases
...
When the elevation is not high, the shadow is similar
to just add some dark lines on the edges and corners of
rectangle views. Using simple algorithm can also improve
the performance and save more memory.
Test: The render result of unit test is updated.
Bug: 37906145
Change-Id: I28758f868ee6e24e4552368bddfb7ac10fe0a205
2017-05-06 19:10:14 +01:00
TreeHugger Robot
2dcec3ce91
Merge "avoid calculate shadow when elevation is 0"
2017-05-05 11:21:21 +00:00
Joe LaPenna
4538000dca
Stop deprecated parcelables triggering Error FW8
...
Test: Ran against system-current with and without the cl.
Change-Id: I492e211701b16e660bbc57913220a93df1ed31ac
2017-05-04 16:25:39 +00:00
Charlie Tsai
8975018f73
avoid calculate shadow when elevation is 0
...
Test: N/A
Bug: 37906145
Change-Id: Ib8dc3f781767271388eb3e6f886267e9d98d67f8
2017-05-04 12:00:11 +01:00
Yi Kong
bf0a3ec0fa
Merge "Resolve merge conflicts of ccc5b9bbd0 to oc-dev-plus-aosp" into oc-dev-plus-aosp
...
am: 51ccc24d57
2017-05-02 20:00:21 +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
