am 30dca470: am f0a80b68: am ea74883e: am fe01ab10: Merge "Account for alpha in hasShadow()" into lmp-dev

* commit '30dca470d6b261433f0ad11117e5dff7d9124d9e': Account for alpha in hasShadow()
2014-09-20 00:19:38 +00:00
parent 44c49d9291 cac59c8de4
commit f1c91fec09
1 changed files with 3 additions and 1 deletions
--- a/libs/hwui/RenderProperties.h
+++ b/libs/hwui/RenderProperties.h
@@ -570,7 +570,9 @@ public:
    }

    bool hasShadow() const {
-        return getZ() >= 0.0f && getOutline().getPath() != NULL;
+        return getZ() >= 0.0f
+                && getOutline().getPath() != NULL
+                && getOutline().getAlpha() != 0.0f;
    }

 private: