diff options
| author | Chris Craik <ccraik@google.com> | 2014-09-20 00:19:38 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-09-20 00:19:38 +0000 |
| commit | f1c91fec09c3ed9ec0dcafe10ed2942d91d2a975 (patch) | |
| tree | 3b9f2db36a770647a364d821784b8e6c34ec4f5e /libs/hwui | |
| parent | 44c49d929147aefd0c7feba9ffedd853081dcbba (diff) | |
| parent | cac59c8de40e6a9720968edf19a582756c66095e (diff) | |
| download | frameworks_base-f1c91fec09c3ed9ec0dcafe10ed2942d91d2a975.zip frameworks_base-f1c91fec09c3ed9ec0dcafe10ed2942d91d2a975.tar.gz frameworks_base-f1c91fec09c3ed9ec0dcafe10ed2942d91d2a975.tar.bz2 | |
am 30dca470: am f0a80b68: am ea74883e: am fe01ab10: Merge "Account for alpha in hasShadow()" into lmp-dev
* commit '30dca470d6b261433f0ad11117e5dff7d9124d9e':
Account for alpha in hasShadow()
Diffstat (limited to 'libs/hwui')
| -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: |