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
Jerome Gaillard
d9152e3605
Merge "Ignore density in AdaptiveIconDrawable"
2017-05-02 14:26:24 +00:00
Jerome Gaillard
106df6992a
Merge "Update AccessibilityManager in layoutlib following I65db0252"
2017-05-02 14:25:33 +00:00
Calin Juravle
6958495360
Merge "SystemApi for dex module registration"
2017-05-01 22:56:31 +00: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
Salvador Martinez
c06c4ad71d
Merge "Added dialog to notify user of thermal shutdown" into oc-dev am: 4d09adcef1
...
am: ba1cc4bb42
2017-05-01 17:01:13 +00:00
Salvador Martinez
4d09adcef1
Merge "Added dialog to notify user of thermal shutdown" into oc-dev
2017-05-01 16:45:30 +00:00
Adam Lesinski
2d838019e4
Merge "AAPT2: Fix typo in manifest validation expectation" into oc-dev am: 7cf8ca95aa
...
am: f43dd4b032
2017-04-30 14:45:04 +00:00
TreeHugger Robot
7cf8ca95aa
Merge "AAPT2: Fix typo in manifest validation expectation" into oc-dev
2017-04-30 14:31:17 +00:00
Adam Lesinski
54fbb7ca81
Merge "AAPT2: binary parser should be more lenient with files" into oc-dev am: 557a0c50a0
...
am: 7ed9a3b3ad
2017-04-29 21:50:50 +00:00
TreeHugger Robot
557a0c50a0
Merge "AAPT2: binary parser should be more lenient with files" into oc-dev
2017-04-29 21:39:29 +00:00
Adam Lesinski
e6a7ca6fb2
Merge "AAPT2: Fix string escaping" into oc-dev am: f6bc1402ed
...
am: 349b647b75
2017-04-29 21:14:17 +00:00
TreeHugger Robot
f6bc1402ed
Merge "AAPT2: Fix string escaping" into oc-dev
2017-04-29 21:04:38 +00:00
Adam Lesinski
42dd85aee7
Merge changes I446fb6ab,Ife3bbd29 into oc-dev am: 53c9898e79
...
am: 66534ef01c
2017-04-29 20:50:20 +00:00
TreeHugger Robot
53c9898e79
Merge changes I446fb6ab,Ife3bbd29 into oc-dev
...
* changes:
Valid resource IDs may be negative
AAPT2: Workaround for findViewById with package ID > 0x7f
2017-04-29 20:38:20 +00:00
Adam Lesinski
742888f0fd
AAPT2: binary parser should be more lenient with files
...
Some APKs have file references that reference files that don't exist.
For now, just be lenient and ignore the files themselves.
Keep the actual reference until such a time as general resource
stripping is implemented.
Bug: 37749644
Test: manual
Change-Id: I773685acf41212405b71b064d64045fb4556dcfc
2017-04-28 15:34:52 -07:00
Chris Warrington
8f3a5a58e6
Merge "AAPT2: Error reporting through JNI." into oc-dev am: f49baef4b9
...
am: 128b206af8
2017-04-28 20:57:10 +00:00
Andreas Gampe
3bf6389120
Aapt2: Fix png leak
...
do9Patch is leaking two rows of data.
Bug: 37782695
Test: ASAN_OPTIONS= SANITIZE_HOST=address m
Change-Id: Ibd2198919cd9c24f2de9f50b23c87753f2190708
2017-04-28 13:51:39 -07:00
Adam Lesinski
c10c0d0db2
AAPT2: Fix typo in manifest validation expectation
...
Change expected tag from grant-uri-permissions -> grant-uri-permission
Bug: 37714102
Test: manual
Change-Id: Ic0178b83fff8de961cb3fdfe38023eaf111237ee
2017-04-28 12:54:08 -07:00
Adam Lesinski
48448e8a31
AAPT2: Fix string escaping
...
We were processing escaped strings too early, before
parsing of values into types. Now the escaped strings get
processed when they are being flattened.
Bug: 37715376
Test: make aapt2_tests
Change-Id: Ic59aa2e3a20c40756c219752ff74b2a4f8a602ba
2017-04-28 12:51:23 -07:00
