diff options
| author | Chris Craik <ccraik@google.com> | 2014-09-19 23:36:20 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-09-19 23:36:22 +0000 |
| commit | 9e7c91919159050f397e28ba8df04d0b42b96e01 (patch) | |
| tree | af9cfbe7f8e2e09d9b8a2a9379a4a16418e38e9e /libs | |
| parent | cf456e3c225fa736914cca1f51eb5311fa16fb88 (diff) | |
| parent | 9fa364dc72613f4301b0783f0547fe6b01abac39 (diff) | |
| download | frameworks_base-9e7c91919159050f397e28ba8df04d0b42b96e01.zip frameworks_base-9e7c91919159050f397e28ba8df04d0b42b96e01.tar.gz frameworks_base-9e7c91919159050f397e28ba8df04d0b42b96e01.tar.bz2 | |
Merge "Account for alpha in hasShadow()" into lmp-dev
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/hwui/RenderProperties.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libs/hwui/RenderProperties.h b/libs/hwui/RenderProperties.h index 46eeb6a..b936d4b 100644 --- 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: |