Commit Graph

8785 Commits

Author SHA1 Message Date
TreeHugger Robot
7ede1c157e Merge "Fix recent apps in system UI for Skia pipeline" 2017-05-12 17:36:53 +00:00
Stan Iliev
b33013fb3c Fix recent apps in system UI for Skia pipeline
Enable HW Bitmaps for Skia pipeline just enough to make
recent apps list working by adding support for BitmapShader.
Drawing HW bitmaps in a canvas is also supported.

Test: recent apps work, HWUI unit tests pass, CTS tests pass.
bug: 38136140
Change-Id: Ibd06c859c86dc213310d5ce5272497e1882d0cc6
2017-05-12 11:28:55 -04:00
Adam Lesinski
cf24404469 Merge "AAPT: Include empty locale in getLocales" into oc-dev am: 19af4cc375
am: 287a372575

Change-Id: I6c49d80d270d3877bce2652d687ef8434a68e333
2017-05-12 08:24:23 +00:00
Adam Lesinski
287a372575 Merge "AAPT: Include empty locale in getLocales" into oc-dev
am: 19af4cc375

Change-Id: Idcac3756eede932c7924ccc3ef3edc7e12b7a10b
2017-05-12 04:10:49 +00:00
Adam Lesinski
58a772cfa7 Merge "Fix support for @empty in style resolution" into oc-dev am: 7d75f49175
am: 0532e76302

Change-Id: I0c5ed6e6d149982e98578a02a7afbaa7d6cdfa6c
2017-05-12 03:46:31 +00:00
Adam Lesinski
0532e76302 Merge "Fix support for @empty in style resolution" into oc-dev
am: 7d75f49175

Change-Id: Ie5a046f75a7c7fa13d330b90f3b9a8ff6c5ac373
2017-05-12 01:00:00 +00:00
TreeHugger Robot
19af4cc375 Merge "AAPT: Include empty locale in getLocales" into oc-dev 2017-05-12 00:22:44 +00:00
TreeHugger Robot
7d75f49175 Merge "Fix support for @empty in style resolution" into oc-dev 2017-05-11 21:55:24 +00:00
Adam Lesinski
fa2fc0b263 AAPT: Include empty locale in getLocales
AAPT dump badging relies on the empty locale being
present when there are no locales.

Bug: 38192121
Test: manual
Change-Id: I2f5c431d4fd07c525a2318e7b93be0e93c32448f
2017-05-11 12:26:52 -07:00
Adam Lesinski
32e7501a27 Fix support for @empty in style resolution
If @empty is encountered in XML, do not fallback
to searching through the theme.

Bug: 36891052
Test: make aapt2_tests
Test: bit CtsContentTestCases:android.content.res.cts.TypedArrayTest
Change-Id: Ie3bf7b70af9c7913513a1092afd95d26bec5e635
2017-05-11 11:28:29 -07:00
Mathias Agopian
3d7d5f999f fix circular dependency libnativewindow <-> libui
Bug: 37647680, 37648355
Test: compile, manual
Change-Id: I00d72d063c252739ca5a63dbf84424ad4f837f89
2017-05-09 16:40:50 -07:00
Seigo Nonaka
373b15bda9 Fix double bolding
resolveStyle increases minikinStyle's weight value based on Skia's style
value. Since we compute Skia's style based on given weight value, we
should not add extra bold weight to minikinStyle.

This CL also fixes misunderstanding of base weight.
The base weight is only used for computing weight relative to the
weighted alias. Thus, base weight should not be updated except for
createWeightAlias method.

To be clear, this CL changes the function names but keeps the same
semantics as before.

Test: adb shell /data/nativetest/hwui_unit_tests/hwui_unit_tests
Test: am instrument -w -e class android.graphics.cts.TypefaceTest\
      android.graphics.cts/android.support.test.runner.AndroidJUnitRunner
Bug: 37880319
Merged-In: Ied73189b11792fb062da46f45afd2db664e6ecb4

Change-Id: I82350a1bfb99ce198b955f127949e21bccccb1cb
2017-05-09 04:10:07 +00:00
Seigo Nonaka
264d3bef34 Fix double bolding
resolveStyle increases minikinStyle's weight value based on Skia's style
value. Since we compute Skia's style based on given weight value, we
should not add extra bold weight to minikinStyle.

This CL also fixes misunderstanding of base weight.
The base weight is only used for computing weight relative to the
weighted alias. Thus, base weight should not be updated except for
createWeightAlias method.

To be clear, this CL changes the function names but keeps the same
semantics as before.

Test: adb shell /data/nativetest/hwui_unit_tests/hwui_unit_tests
Test: am instrument -w -e class android.graphics.cts.TypefaceTest\
      android.graphics.cts/android.support.test.runner.AndroidJUnitRunner
Bug: 37880319

Change-Id: Ied73189b11792fb062da46f45afd2db664e6ecb4
(cherry picked from commit 1f9c461e6a)
2017-05-09 03:58:29 +00:00
Yi Kong
61563f96e8 Merge "Remove unused lambda captures" am: 1101f45613 am: c7ce115073 am: ca9988f0f9
am: d71a903539

Change-Id: I9cd2fa3419fdc69bb6970a2951edcca2fd466e8f
2017-05-09 00:47:10 +00:00
Yi Kong
d71a903539 Merge "Remove unused lambda captures" am: 1101f45613 am: c7ce115073
am: ca9988f0f9

Change-Id: Id1259cbbf1bbe9032d66315a346fa4d5d27ce2b3
2017-05-09 00:40:22 +00:00
Seigo Nonaka
1f9c461e6a Fix double bolding
resolveStyle increases minikinStyle's weight value based on Skia's style
value. Since we compute Skia's style based on given weight value, we
should not add extra bold weight to minikinStyle.

This CL also fixes misunderstanding of base weight.
The base weight is only used for computing weight relative to the
weighted alias. Thus, base weight should not be updated except for
createWeightAlias method.

To be clear, this CL changes the function names but keeps the same
semantics as before.

Test: adb shell /data/nativetest/hwui_unit_tests/hwui_unit_tests
Test: am instrument -w -e class android.graphics.cts.TypefaceTest\
      android.graphics.cts/android.support.test.runner.AndroidJUnitRunner
Bug: 37880319

Change-Id: Ied73189b11792fb062da46f45afd2db664e6ecb4
2017-05-08 11:11:06 -07:00
Yi Kong
b2233821e1 Remove unused lambda captures
Test: build
Bug: 37752547
Change-Id: Id102e93fef06e9c818b27fa8a5c6218c319bdd30
2017-05-08 10:24:22 -07:00
Colin Cross
af737306f9 Convert libandroid and libandroid_runtime to Android.bp
See build/soong/README.md for more information.

Test: m -j checkbuild
Change-Id: Ie3c9c3d3c8c75ade36422d1e8ee0a5fe117e9091
(cherry picked from commit 3f8fd40f28)
2017-05-06 00:50:39 +00:00
Colin Cross
eb4a527898 Merge "Convert libandroid and libandroid_runtime to Android.bp" 2017-05-06 00:43:08 +00:00
Sergey Vasilinets
de0c35decb Merge "Add StrictMode.noteSlowCall to calls that result in hw bitmap readback" into oc-dev am: 01a5cc9004
am: 9c29d93ee3

Change-Id: I85f853aee80cbe9659c646468d35fbd15a5a45d4
2017-05-05 19:56:10 +00:00
Sergey Vasilinets
9c29d93ee3 Merge "Add StrictMode.noteSlowCall to calls that result in hw bitmap readback" into oc-dev
am: 01a5cc9004

Change-Id: I52ea2290a175df2dcd5b3805f7e5943e387133da
2017-05-05 19:51:04 +00:00
Sergey Vasilinets
01a5cc9004 Merge "Add StrictMode.noteSlowCall to calls that result in hw bitmap readback" into oc-dev 2017-05-05 19:31:53 +00:00
Arun
6ba13368db Merge "Merge "Reduce hwui CPU time by using glDrawRangeElements" am: 057c7c3164 am: 94f4f5e45f am: b5facc7516" into oc-dev-plus-aosp
am: 5d3f297b1f

Change-Id: I54ef1955da9808c8e47aba660beba7c5e98403bd
2017-05-05 19:22:01 +00:00
Arun
93cafba790 Merge "Reduce hwui CPU time by using glDrawRangeElements" am: 057c7c3164 am: 94f4f5e45f
am: b5facc7516

Change-Id: I9e96bf83ae5ebd4237fc4d78a58e83793de86aad
2017-05-05 19:10:21 +00:00
Treehugger Robot
057c7c3164 Merge "Reduce hwui CPU time by using glDrawRangeElements" 2017-05-05 18:50:13 +00:00
Arun
b0a9477c8e Reduce hwui CPU time by using glDrawRangeElements
The CPU overhead of glDrawElements in the GPU driver is significant
with client-side vertex data (unique per draw call) as the driver has
to calculate the mininimum and maximum indices from the index buffer
in order to evaluate the range of vertex data required. This can be
avoided by keeping track of the min-max in hwui and passing it with
glDrawRangeElements. This requires OpenGL ES3.0 support (which is
already checked for elsewhere in hwui).

Test: manual - visual inspection on fugu (nexus player)

Change-Id: I57bb1ddd239a1032f74f1cd2683bbe0970e84bd9
2017-05-05 15:11:27 +00:00
Colin Cross
3f8fd40f28 Convert libandroid and libandroid_runtime to Android.bp
See build/soong/README.md for more information.

Test: m -j checkbuild
Change-Id: Ie3c9c3d3c8c75ade36422d1e8ee0a5fe117e9091
2017-05-04 13:00:21 -07:00
Colin Cross
99c9bf65ae Fix 64-bit GraphicStats.findRootPath test
frameworks/base/libs/hwui/tests/unit/GraphicsStatsServiceTests.cpp:54: Failure
Value of: findRootPath()
  Actual: "/data/nativetest64/hwui_unit_tests"
Expected: expected
Which is: "/data/nativetest/hwui_unit_tests"
[  FAILED  ] GraphicsStats.findRootPath (1 ms)

Test: hwui_unit_tests
Change-Id: I809fcc9d5f640ecd4248a8ae2272c72ba4bd2cdd
2017-05-04 10:27:21 -07:00
Colin Cross
58f94a9526 Convert libhwui to Android.bp
See build/soong/README.md for more information.

Test: m -j checkbuild
Change-Id: Ifebdb3797498d49f2bebe5fc728e6d6d8def71cb
Merged-In: Ifebdb3797498d49f2bebe5fc728e6d6d8def71cb
(cherry picked from commit f629810118)
2017-05-04 10:11:54 -07:00
Colin Cross
271c2e00aa Convert libhwui to Android.bp
See build/soong/README.md for more information.

Test: m -j checkbuild
Change-Id: Ifebdb3797498d49f2bebe5fc728e6d6d8def71cb
Merged-In: Ifebdb3797498d49f2bebe5fc728e6d6d8def71cb
(cherry picked from commit f629810118)
2017-05-04 10:07:21 -07:00
Colin Cross
9bdff5adce Merge "Convert libhwui to Android.bp" 2017-05-04 16:58:45 +00:00
TreeHugger Robot
d96995e534 Merge "Store an SkImageInfo on Bitmap" 2017-05-04 10:02:24 +00:00
sergeyv
9fd259c9b0 Add StrictMode.noteSlowCall to calls that result in hw bitmap readback
bug:37748500
Test: BitmapTest:*inStrictMode
Change-Id: Ifea1c6f0c50ba2f409c96b7ccf7eb31c89ef81c8
2017-05-03 17:41:33 -07:00
Colin Cross
f629810118 Convert libhwui to Android.bp
See build/soong/README.md for more information.

Test: m -j checkbuild
Change-Id: Ifebdb3797498d49f2bebe5fc728e6d6d8def71cb
2017-05-03 16:40:57 -07:00
Chris Craik
d1267d367e Merge "Make all FrameBuilderTests run on RT" into oc-dev am: ecc121d8bf
am: 16ee9b9bd1

Change-Id: I1a48d2f483b9d9859b6e5f599e6f59af8cd756c7
2017-05-03 22:53:46 +00:00
Chris Craik
16ee9b9bd1 Merge "Make all FrameBuilderTests run on RT" into oc-dev
am: ecc121d8bf

Change-Id: Iee5e75009bfe1dcce9dd021aa20f1410b1810f32
2017-05-03 22:46:22 +00:00
Chris Craik
e681bf6b5c Make all FrameBuilderTests run on RT
Fixes: 33834637
Test: adb shell /data/nativetest/hwui_unit_tests/hwui_unit_tests  --gtest_filter=FrameBuilder.renderNode_OpenGL
Test: adb shell /data/nativetest/hwui_unit_tests/hwui_unit_tests  --gtest_filter=FrameBuilder.projection*

They essentially all use Caches, so making RT-only for safety. This
prevents crashes when trying to access Caches in a non-rt test, when
it's not guaranteed to be created.

Change-Id: I530c73d0ffe2d4f4ef53a46715f5bcca2c485f70
2017-05-03 10:55:29 -07:00
Matt Sarett
489cfff4ad Store an SkImageInfo on Bitmap
Color type, alpha type, and color space are being removed from
SkPixelRef.

The Bitmap class wants these to be mutable anyway.

For other uses of SkPixelRef, it is often convenient to reinterpret
the swizzle, alpha type, or color space of the pixel ref.

Test: Refactor
skbug.com/6535

Change-Id: Ie49ac64b46e171974a53614e1803ab18300e634e
2017-05-03 13:47:29 -04:00
Yi Kong
0164f5e101 Merge "Merge "Remove no-op std::max call" am: c00af4c533 am: ef5e579cec am: f3310cb3b1" into oc-dev-plus-aosp
am: d1a0cdc85f

Change-Id: I5ba3c71615c0c4bbb777d5c31458a586243c67eb
2017-05-01 19:02:56 +00:00
Yi Kong
5edbb34dd2 Merge "Remove no-op std::max call" am: c00af4c533 am: ef5e579cec
am: f3310cb3b1

Change-Id: I553be70f9ba04feaf4da01041bfb3edc6ae38252
2017-05-01 18:51:59 +00:00
Yi Kong
06a2d2bf23 Remove no-op std::max call
This was calling std::max on an unsigned integer and 0, which is
essentially no-op. Remove this code.

Test: Build
Bug: 37752547
Change-Id: I74ce45b95960621dff11f574fbe1af60ad147cf0
2017-04-30 23:54:08 -07:00
Chris Craik
e8f9d61bcc Merge "Merge "Revert "Temporarily enable GL validation"" into oc-dev am: 8f4ac4ac05" into oc-dev-plus-aosp
am: ed6ebc5b09

Change-Id: I908b67fb00b1e5846601541038c7e856f9234091
2017-04-28 23:34:02 +00:00
Chris Craik
5805cfdbc1 Merge "Revert "Temporarily enable GL validation"" into oc-dev
am: 8f4ac4ac05

Change-Id: I7a44ab6a8a2a05c124bbe0d84475f5c21b1b7bf4
2017-04-28 23:15:34 +00:00
Chris Craik
8f4ac4ac05 Merge "Revert "Temporarily enable GL validation"" into oc-dev 2017-04-28 23:04:02 +00:00
Chris Craik
05cdededbe Merge "Add conic support for Path#approximate" into oc-dev am: ebd44d0076
am: a1e500ebf4

Change-Id: Ifc5033fbb595a672a29539599e39ac7e56c62d50
2017-04-28 19:11:02 +00:00
Chris Craik
a1e500ebf4 Merge "Add conic support for Path#approximate" into oc-dev
am: ebd44d0076

Change-Id: I68f5924aef7526de1c801f529dd5a304a1a1d287
2017-04-28 18:53:15 +00:00
TreeHugger Robot
ebd44d0076 Merge "Add conic support for Path#approximate" into oc-dev 2017-04-28 18:47:37 +00:00
Adam Lesinski
82e26c9214 Merge "AAPT2: Add workaround for non-standard package IDs" into oc-dev am: e7172ff9fb
am: 65c42a5569

Change-Id: I1238656a9edb9984d36412dba506b869f574e3d4
2017-04-28 01:27:30 +00:00
Adam Lesinski
65c42a5569 Merge "AAPT2: Add workaround for non-standard package IDs" into oc-dev
am: e7172ff9fb

Change-Id: I7b8e53f8394e41433ceebe4f6e477f8561e49807
2017-04-28 01:04:51 +00:00
Derek Sollenberger
4220989601 Merge "Disable Vulkan backend when running hwui_unit_tests." into oc-dev am: f9dc09f4ea
am: 1c9c7b867c

Change-Id: I9550af0105210cdf24483f8dfe219833ff7812c8
2017-04-28 00:25:46 +00:00