summaryrefslogtreecommitdiffstats
path: root/libs/hwui
diff options
context:
space:
mode:
authorRomain Guy <romainguy@google.com>2013-06-19 12:17:01 -0700
committerRomain Guy <romainguy@google.com>2013-06-19 12:17:01 -0700
commit2458939b5f926176a485a3196f59688eed78e858 (patch)
treefc608a8ae818144c69f679e059adb1fa198e01aa /libs/hwui
parent31e08e953fe7bdb1b1cbc247156cb6a19917a2f1 (diff)
downloadframeworks_base-2458939b5f926176a485a3196f59688eed78e858.zip
frameworks_base-2458939b5f926176a485a3196f59688eed78e858.tar.gz
frameworks_base-2458939b5f926176a485a3196f59688eed78e858.tar.bz2
Fix regression: TextureView.setAlpha() was ignored
Change-Id: I9f43eec0fe23a65dcc1cf9cd0ac1f5e8907786a7
Diffstat (limited to 'libs/hwui')
-rw-r--r--libs/hwui/OpenGLRenderer.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/libs/hwui/OpenGLRenderer.cpp b/libs/hwui/OpenGLRenderer.cpp
index 0daf9c7..6e8e126 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) {