Merge "Fix regression: TextureView.setAlpha() was ignored"

This commit is contained in:
Romain Guy
2013-06-19 23:40:57 +00:00
committed by Android (Google) Code Review

View File

@@ -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) {