4589 Commits

Author SHA1 Message Date
Lucas Dupin
da517d5370 Merge "Revert "Enable dithering on RippleDrawable"" into sc-dev 2021-05-27 19:07:56 +00:00
Lucas Dupin
2a5d63d8bd Revert "Enable dithering on RippleDrawable"
This reverts commit 1cbfc3b00bd058e8bddd93cd5fc9b4e0b985420e.

Reason for revert: CL was no-op
Bug: 189281134
Change-Id: I2c70b51dd1d2f679a8310b1847675360ce415d35
2021-05-27 19:07:35 +00:00
Lucas Dupin
5941f0fb95 Merge "Enable dithering on RippleDrawable" into sc-dev 2021-05-26 20:39:09 +00:00
Lucas Dupin
9f6fb354e8 Constant sparkle scale
Drawables from different themes are yielding different densities.
Framework themes are returning 160 (DENSITY_MEDIUM), while AppCompat
is reporting 420 (DENSITY_420.)

This is causing the sparkles to have completely different sizes on
the same device, which is wrong.

Fixes: 189236372
Test: manual
Change-Id: Ia79e360123cf740aaba85d5348f07604c2b39026
2021-05-26 09:31:24 -07:00
Lucas Dupin
1cbfc3b00b Enable dithering on RippleDrawable
Per UX request, given that gradients started to show some banding.

Test: manual
Fixes: 189281134
Change-Id: I8898f2463c6e07c390c07c242b6632dcbb9c3ef3
2021-05-26 09:13:51 -07:00
Lucas Dupin
2011da8730 Merge "New shader parameters" into sc-dev 2021-05-25 18:54:21 +00:00
Lucas Dupin
8a7d4e2b2a New shader parameters
- Fading out sparkles earlier
- New density and size for sparkles
- Overall timing tweaks
- New turbulence parameters

Test: manual
Fixes: 188453593
Fixes: 188454455
Change-Id: I70e364c84cc04f653618ea811a817d9f82895af5
2021-05-25 09:35:17 -07:00
Seigo Nonaka
9c16cc5a3e Merge "Skip buffer equality check for SystemFonts" into sc-dev 2021-05-21 05:03:38 +00:00
Seigo Nonaka
5abd5dfd9d Skip buffer equality check for SystemFonts
All system font files are file backed and stored in the unique place,
so no need to compare the buffers during creating sets of system fonts.

Bug: 188201287
Test: atest FontFamilyUpdateRequestTest
Test: atest FontListParserTest
Test: atest FontManagerTest
Test: atest NativeSystemFontTest
Test: atest PersistentSystemFontConfigTest
Test: atest SystemFontsTest
Test: atest SystemFontsUniqueNameTest
Test: atest UpdatableFontDirTest
Test: atest UpdatableSystemFontTest
Change-Id: I4a4680937988c013aaa4e4fa729e61ac8514c513
2021-05-20 15:56:43 -07:00
TreeHugger Robot
395e8c9997 Merge "Fix RadialGradient Javadocs" into sc-dev 2021-05-18 20:53:44 +00:00
Nader Jawad
33ceaf8f95 Fix RadialGradient Javadocs
Fixed issue where Javadoc references
were not displayed and the list
of circumstances in which exceptions
would be thrown was not separated
by line breaks

Fixes: 188102023
Test: N/A
Change-Id: Ibdba7c26e053bdba5d8cff21f1cb7c0764f5a4f1
2021-05-18 12:16:23 -07:00
Nader Jawad
85cf59de2f Merge "Add support to toggle different shader behaviors" into sc-dev 2021-05-18 16:27:47 +00:00
Nader Jawad
93d6e248de Add support to toggle different shader
behaviors

Updated HWUI to toggle overscroll stretch
implementation based on whether the
device supports high end graphics
or not

Bug: 187718492
Test: manual
Change-Id: I13a91a8861c07bec8af43268ba22d0f5b7060b4f
2021-05-17 22:42:15 -07:00
Lucas Dupin
fdda357925 Correctly initialize the noise phase
To make it move smoothly throughout the animation

Fixes: 186130728
Test: manual
Change-Id: I78bb220f72238f13b21055c5874ce8b829171b5d
2021-05-17 16:28:31 -07:00
Seigo Nonaka
09439752da Add perf test for SystemFonts.getAvailableFonts
Bug: 188201287
Test: atest SystemFontsPerfTest
Change-Id: Id08a53e980a012a682e95e7b41d363aae31c1232
2021-05-14 13:55:55 -07:00
Kohsuke Yatoh
048d4b1788 Close FDs / mmap handles promptly.
Currently we rely on GC to close them.
This may cause system_server crash depending on the timing of GC.

Bug: 187879195
Test: atest UpdatableSystemFontTest
Change-Id: I09ac3f349e5ec100e4164320cbf27977474cc4bb
2021-05-13 16:23:55 +00:00
Joe Hsu
c73c098665 Merge "Check FontFamily null before adding it." into sc-dev 2021-05-13 01:59:02 +00:00
Lucas Dupin
b52611aa8a Merge "Blend premultiplied colors" into sc-dev 2021-05-12 20:08:16 +00:00
Lucas Dupin
0ec7ddeba8 Blend premultiplied colors
Mixing alpha blended colors, and then premultiplying them in the end was
causing artifacts on the sparkles.

Bug: 187824279
Test: visual
Change-Id: Icde12c3fa737f597f18f2705eefa687a49a19445
2021-05-12 11:14:03 -07:00
joehsu
1681aa2eeb Check FontFamily null before adding it.
Missing ttf files under /product/fonts will cause NullPointerException.
This CL fixes it.

Bug: 187901462
Test: Flash Sabrina to Android S. Boot to check if there's still an error.
Change-Id: I9d39c2a6e4730563f35f43176f630ac0439767b3
2021-05-12 14:18:58 +08:00
Jordan Demeulenaere
47c51fe80e Enable {ANTI_ALIAS,DITHER}_FLAG by default (1/2)
Test: atest android.graphics.cts.PaintTest
Bug: 186644628
Change-Id: I5d5d03e430af380e23016c6deba5eca46067a22b
2021-05-11 17:40:08 +02:00
TreeHugger Robot
6836ab8607 Merge "Update ripple mask when invalidated" into sc-dev 2021-05-07 16:30:33 +00:00
Lucas Dupin
1cc81e18f6 Merge "Fix sparkle alpha blending" into sc-dev 2021-05-07 15:08:22 +00:00
Lucas Dupin
b73fa47929 Merge "Adding force-dark support to RippleDrawable" into sc-dev 2021-05-07 01:08:43 +00:00
Lucas Dupin
a79111e05c Fix sparkle alpha blending
We should not blend between the fill alpha and the sparkle alpha.
This would cause the sparkle pixel to have lower opacity than the fill,
when the fillAlpha > sparkleAlpha.

We do need to blend the fill and sparkle colors, but their alphas need
to be combined separately.

In the end we then premultiply the alpha into the color.

Test: manual
Bug: 186130682
Change-Id: I519f6c797839feda14e714c7375ee727aba2cf8b
2021-05-06 17:45:59 -07:00
Lucas Dupin
00af5271da Adding force-dark support to RippleDrawable
Add force-dark support to RippleDrawable by modifying the ink color.

Test: manual
Test: atest CanvasOp
Fixes: 186130682
Change-Id: I89eaaf3afa5ec53a74d2d08de8cff6484e55a912
2021-05-06 15:17:02 -07:00
Brad Stenning
1be127b866 Update Icon find shared library resources
Icon is building its own resource object and not including the default flag that would allow for including of shared-lib resources

Bug: 187332041
Test: Manual
Change-Id: I121b5f75cbe7d125f8adddb30c84024e2b1a80c7
2021-05-05 21:09:34 +00:00
Jay Aliomer
5121e27f89 Update ripple mask when invalidated
When a child drawable is updated, the invalidated mask
needs to reflect on the animation paint

Fixes: 187290156
Test: visual
Change-Id: I30065027f73f646c887933648d8e296ec651c299
2021-05-05 16:14:04 -04:00
Nader Jawad
603d612707 Merge "Update hole punch logic in HWUI" into sc-dev 2021-05-05 02:59:18 +00:00
Jorim Jaggi
a4d6988f12 Merge "Mark first frames in metrics properly" into sc-dev 2021-05-04 10:55:59 +00:00
Nader Jawad
197743ff9c Update hole punch logic in HWUI
--Updated HWUI holepunch logic for SurfaceView to
also apply the stretch to the hole punch
--Updated RenderNode callbacks to also include
an offset from the ancestor RenderNode that also
has a stretch configured on it
--Added new test activity to verify hole punch
logic

Bug: 179047472
Test: manual
Change-Id: Ibbaf8248a31839ba9dc352ecb9fef54e1276918e
2021-05-03 18:08:47 -07:00
Jay Aliomer
7df767f3d8 Merge "Only generate paint/mask bitmap when starting animations" into sc-dev 2021-05-03 19:06:53 +00:00
Jay Aliomer
8cd53fb886 Only generate paint/mask bitmap when starting animations
Fixes: b/185570903
Test: performance testing bitmap threashold
Change-Id: Ia94011b3c7c34bf44e9ed7356873748724059c2a
2021-05-03 13:07:59 -04:00
Jorim Jaggi
9516605d63 Mark first frames in metrics properly
Such that we only set the flag in case window visibility actually
changes. There are a lot of other cases where we need to do a
window relayout which can lead to visible jank.

Test: FrameMetricsListenerTest, manual
Bug: 185902609
Change-Id: Ia09ce640f3a89bf9dd4ff0f4e4469e88a513709a
2021-05-03 15:49:25 +02:00
Seigo Nonaka
2a77167ce4 Skip FontFamily creation if the font files don't exists.
Bug: 186580197
Test: atest FontFamilyUpdateRequestTest FontListParserTest
      FontManagerTest NativeSystemFontTest
      PersistentSystemFontConfigTest SystemFontsTest
      SystemFontsUniqueNameTest UpdatableFontDirTest
      UpdatableSystemFontTest
Change-Id: Ibbcfb9ed43d05dd9db0132f3a7cb0321243be054
2021-04-28 17:06:17 -07:00
John Reck
3aa5a8fb72 Merge "Fix that CSL cache hits produce bad drawables" into sc-dev 2021-04-27 19:59:13 +00:00
John Reck
b541034702 Fix that CSL cache hits produce bad drawables
onState() needs to be called to initialize the color to be drawn
with. ColorStateListDrawable(ColorStateList) does this as part
of the call to setColorStateList(), however this was missing from
ColorStateListDrawable(ColorStateListDrawableState) which is hit
when doing ColorStateListDrawableState#newDrawable() when
Resources has a cache-hit on a drawable to load.

Fixes: 186254988
Test: app in bug
Change-Id: Ifb3626f6f85b03dd66142a2f91ba06bc648bff16
2021-04-26 21:16:44 -04:00
Brian Osman
28fd1926c0 Merge "Update frameworks/base to use newer SkRuntimeEffect::MakeForShader" into sc-dev 2021-04-26 21:52:55 +00:00
TreeHugger Robot
6a31678645 Merge "Fix a potential thread safety issue in VectorDrawable" into sc-dev 2021-04-26 20:41:47 +00:00
Brian Osman
64ee324b93 Update frameworks/base to use newer SkRuntimeEffect::MakeForShader
This enforces stricter rules on the SkSL at effect creation time, and
ensures it's valid as an SkShader (vs. an SkColorFilter). Also updated
some SkSL that was already (or would become) illegal:

- Child shaders must be declared 'uniform', not 'in'
- sampling a child requires coordinates

Bug: skia:11813
Change-Id: I743b985b5012723186a43e58e9e3ccf29d809d2b
(cherry picked from commit 7556777511b46a0c1a4cdab55d8ba59d99f7c328)
2021-04-26 18:31:36 +00:00
John Reck
549ee05ac5 Fix a potential thread safety issue in VectorDrawable
Bug: 158839504
Test: speculative
Change-Id: Id9f229f08fe5897dda25441fbaa15c98f8130de9
2021-04-22 16:55:09 -04:00
Seigo Nonaka
80269f9f2b Use PostScript name as a key of updated font map
Bug: 185818011
Test: atest FontManagerTest
Test: atest UpdatableFontDirTest
Test: atest UpdatableSystemFontTest
Test: atest FontFamilyUpdateRequestTest
Test: atest PersistentSystemFontConfigTest
Test: atest SystemFontsUniqueNameTest

Change-Id: I78e6ee962dbd50201105599361727b71de11cf2a
2021-04-22 10:51:32 -07:00
Lucas Dupin
68ff6fb718 Merge "Clamp ink color alpha" into sc-dev 2021-04-21 16:24:42 +00:00
Lucas Dupin
fe06390a3c Clamp ink color alpha
On the old version of the ripple, the alpha is limited to 50%, we should
also do the same on the latest designs.

Bug: 184165556
Test: manual
Change-Id: Iec14394e0a0bca00283a713a409dd0794eb6fb9a
2021-04-20 21:36:37 -07:00
Lucas Dupin
668bb09e1a More subtle sparkle animation
- Reduce sparkle size
- Make sparkles fade out earlier
- Adjust animation duration

Test: visual
Fixes: 185826327
Change-Id: I477300f861dad4ec489b7a4d36b0ed7d75bf72e8
2021-04-19 15:40:55 -07:00
Lucas Dupin
469e1b4942 Merge "Make sparkle color and alpha customizable" into sc-dev 2021-04-19 21:32:28 +00:00
Lucas Dupin
9548384364 Make sparkle color and alpha customizable
This CL introduces a new attr: effectColor.
The attribute can be used on ripple tags to customize the color and
alpha of the ripple decoration.

It's also possible to change the effect color via code by invoking
RippleDrawable#setEffectColor.

Fixes: 185602477
Test: atest RippleDrawableTest
Change-Id: I9b50f330729a67ef4b529283a92c83c28387fa0b
2021-04-19 21:32:12 +00:00
Huihong Luo
81d78b91f9 Merge "Webview overlay support" into sc-dev 2021-04-19 04:45:52 +00:00
TreeHugger Robot
2ce8aef9ee Merge "Update native font API to read updated font files." into sc-dev 2021-04-17 22:36:55 +00:00
TreeHugger Robot
0566ee964d Merge "Add FontConfig.Font.getPostScriptName API" into sc-dev 2021-04-17 22:34:51 +00:00