diff options
| author | Romain Guy <romainguy@google.com> | 2013-06-19 23:40:57 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-06-19 23:40:57 +0000 |
| commit | fb5a41a371e540f402e3dd987b0fbf92d1267902 (patch) | |
| tree | 4ac7697c19cef2444e9d48fbe32e4de602cecd34 /libs/hwui | |
| parent | ff4ea7987714dad4f4d9065902f0ac5fd61833fd (diff) | |
| parent | 2458939b5f926176a485a3196f59688eed78e858 (diff) | |
| download | frameworks_base-fb5a41a371e540f402e3dd987b0fbf92d1267902.zip frameworks_base-fb5a41a371e540f402e3dd987b0fbf92d1267902.tar.gz frameworks_base-fb5a41a371e540f402e3dd987b0fbf92d1267902.tar.bz2 | |
Merge "Fix regression: TextureView.setAlpha() was ignored"
Diffstat (limited to 'libs/hwui')
| -rw-r--r-- | libs/hwui/OpenGLRenderer.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libs/hwui/OpenGLRenderer.cpp b/libs/hwui/OpenGLRenderer.cpp index 965e5d1..1dcf21a 100644 --- a/libs/hwui/OpenGLRenderer.cpp +++ b/libs/hwui/OpenGLRenderer.cpp @@ -1061,7 +1061,7 @@ void OpenGLRenderer::composeLayer(sp<Snapshot> current, sp<Snapshot> previous) { } void OpenGLRenderer::drawTextureLayer(Layer* layer, const Rect& rect) { - float alpha = layer->getAlpha() / 255.0f * mSnapshot->alpha; + float alpha = getLayerAlpha(layer); setupDraw(); if (layer->getRenderTarget() == GL_TEXTURE_2D) { |