commit b13d54b0e86d7a34e318411b9e8e3f0e47a1eca6
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Jan 30 23:37:53 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jan 30 23:37:53 2020 +0000
tree ffb1795f9ebcb0c0e67c751d055eabf6e0d165eb
parent 199495817eb791d0a0745bb2c940b980277330d3
parent 371626cd0d3f643bc30e8b026051195b98a07155

Merge "Consider a color layer to be opaque if its alpha is 1.0"

services/surfaceflinger/ColorLayer.cpp

diff --git a/services/surfaceflinger/ColorLayer.cpp b/services/surfaceflinger/ColorLayer.cpp
index 04854d0..dbdfd5b 100644
--- a/services/surfaceflinger/ColorLayer.cpp
+++ b/services/surfaceflinger/ColorLayer.cpp
@@ -61,7 +61,7 @@
 }
 
 bool ColorLayer::isVisible() const {
-    return !isHiddenByPolicy() && getAlpha() > 0.0f;
+    return !isHiddenByPolicy() && getAlpha() > 0.0_hf;
 }
 
 bool ColorLayer::setColor(const half3& color) {
@@ -104,7 +104,9 @@
 }
 
 bool ColorLayer::isOpaque(const Layer::State& s) const {
-    return (s.flags & layer_state_t::eLayerOpaque) != 0;
+    // Consider the layer to be opaque if its opaque flag is set or its effective
+    // alpha (considering the alpha of its parents as well) is 1.0;
+    return (s.flags & layer_state_t::eLayerOpaque) != 0 || getAlpha() == 1.0_hf;
 }
 
 ui::Dataspace ColorLayer::getDataSpace() const {