From 00af5271dabd578397176eda0cd7a66c55fac59a Mon Sep 17 00:00:00 2001 From: Lucas Dupin Date: Thu, 29 Apr 2021 20:30:01 -0700 Subject: 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 --- libs/hwui/SkiaCanvas.cpp | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) (limited to 'libs/hwui/SkiaCanvas.cpp') diff --git a/libs/hwui/SkiaCanvas.cpp b/libs/hwui/SkiaCanvas.cpp index 3056e977f841..d032e2b00649 100644 --- a/libs/hwui/SkiaCanvas.cpp +++ b/libs/hwui/SkiaCanvas.cpp @@ -815,17 +815,8 @@ void SkiaCanvas::drawCircle(uirenderer::CanvasPropertyPrimitive* x, mCanvas->drawDrawable(drawable.get()); } -void SkiaCanvas::drawRipple(uirenderer::CanvasPropertyPrimitive* x, - uirenderer::CanvasPropertyPrimitive* y, - uirenderer::CanvasPropertyPrimitive* radius, - uirenderer::CanvasPropertyPaint* paint, - uirenderer::CanvasPropertyPrimitive* progress, - uirenderer::CanvasPropertyPrimitive* turbulencePhase, - const SkRuntimeShaderBuilder& effectBuilder) { - sk_sp drawable( - new uirenderer::skiapipeline::AnimatedRipple(x, y, radius, paint, progress, - turbulencePhase, effectBuilder)); - mCanvas->drawDrawable(drawable.get()); +void SkiaCanvas::drawRipple(const uirenderer::skiapipeline::RippleDrawableParams& params) { + uirenderer::skiapipeline::AnimatedRippleDrawable::draw(mCanvas, params); } void SkiaCanvas::drawPicture(const SkPicture& picture) { -- cgit v1.2.3-59-g8ed1b