am 0b807d2e: Merge "Update the layer\'s alpha value upon composition of the layer"

* commit '0b807d2e74f786af0d44162d92cc0bf85883349a':
  Update the layer's alpha value upon composition of the layer
This commit is contained in:
Chris Craik
2013-11-05 17:08:00 -08:00
committed by Android Git Automerger

View File

@ -1000,7 +1000,13 @@ void OpenGLRenderer::composeLayer(sp<Snapshot> current, sp<Snapshot> previous) {
}
} else if (!rect.isEmpty()) {
dirtyLayer(rect.left, rect.top, rect.right, rect.bottom);
save(0);
// the layer contains screen buffer content that shouldn't be alpha modulated
// (and any necessary alpha modulation was handled drawing into the layer)
mSnapshot->alpha = 1.0f;
composeLayerRect(layer, rect, true);
restore();
}
dirtyClip();