diff options
| author | Chris Craik <ccraik@google.com> | 2014-09-19 23:47:21 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-09-19 23:47:21 +0000 |
| commit | 746c441d4b525584d2233fdc8687ee77579bd8d5 (patch) | |
| tree | fe1aabd6870ff539c70a65a7fa7bb50f6ade10b9 /libs | |
| parent | d42488dd8e17ba55f827f28f522543449d348e9a (diff) | |
| parent | 9e7c91919159050f397e28ba8df04d0b42b96e01 (diff) | |
| download | frameworks_base-746c441d4b525584d2233fdc8687ee77579bd8d5.zip frameworks_base-746c441d4b525584d2233fdc8687ee77579bd8d5.tar.gz frameworks_base-746c441d4b525584d2233fdc8687ee77579bd8d5.tar.bz2 | |
am fe01ab10: Merge "Account for alpha in hasShadow()" into lmp-dev
* commit 'fe01ab10593f07ec17bdf490fcd8b57296616fa4':
Account for alpha in hasShadow()
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: |