commit da7de0e5818814bd596914a374c0bd6d568e21db
author Galia Peycheva <galinap@google.com> Thu Dec 03 17:24:35 2020 +0100
committer Galia Peycheva <galinap@google.com> Thu Dec 17 18:58:04 2020 +0100
tree e363cc3638ef38f4077e67a2f5a8763475a6ea6b
parent adfede47f98d1d5f0b38d3048f68d3dd8bf918fd

Make layer background blur depend on parent alpha

That way animation leashes animating a fade will also animate the
background blur radius.

Bug: 171679369
Test: manual
Change-Id: I12196d10d2786f2239133fed501b7fb57c636c52

services/surfaceflinger/Layer.cpp

diff --git a/services/surfaceflinger/Layer.cpp b/services/surfaceflinger/Layer.cpp
index d5b599a..fe93f84 100644
--- a/services/surfaceflinger/Layer.cpp
+++ b/services/surfaceflinger/Layer.cpp
@@ -2185,7 +2185,10 @@
 }
 
 int32_t Layer::getBackgroundBlurRadius() const {
-    return getDrawingState().backgroundBlurRadius;
+    const auto& p = mDrawingParent.promote();
+
+    half parentAlpha = (p != nullptr) ? p->getAlpha() : 1.0_hf;
+    return parentAlpha * getDrawingState().backgroundBlurRadius;
 }
 
 const std::vector<BlurRegion>& Layer::getBlurRegions() const {