diff options
| author | Chris Craik <ccraik@google.com> | 2014-09-19 23:56:46 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-09-19 23:56:46 +0000 |
| commit | 4d4b3aa3d969fdf0d2654181b820e128087fe085 (patch) | |
| tree | 4fe2de4c99034a4c1e949b5a9a50258aff355a64 /libs | |
| parent | a57901c5fb11bb1600b7e3de54c73504787cf0f6 (diff) | |
| parent | 746c441d4b525584d2233fdc8687ee77579bd8d5 (diff) | |
| download | frameworks_base-4d4b3aa3d969fdf0d2654181b820e128087fe085.zip frameworks_base-4d4b3aa3d969fdf0d2654181b820e128087fe085.tar.gz frameworks_base-4d4b3aa3d969fdf0d2654181b820e128087fe085.tar.bz2 | |
am 91a40be0: am fe01ab10: Merge "Account for alpha in hasShadow()" into lmp-dev
* commit '91a40be04f8d1822c27888cc47124bf965633f4f':
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: |