commit cfbbc864da1b7a9ed64807f9072c5730c421b4ef
author Chet Haase <chet@google.com> Thu May 23 18:23:34 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu May 23 18:23:34 2013 +0000
tree 6b7d31867b210b95fcb36550d4b5f55f3b9cfcbe
parent 5482b65ae8d3d02fa4b07a2221b3f00079c9aa80
parent c725903eec82aa73ebe9682d142904c06321bc2c

Merge "Restore previous alpha value on noop'd DisplayList operations" into jb-mr2-dev

libs/hwui/DisplayList.cpp

diff --git a/libs/hwui/DisplayList.cpp b/libs/hwui/DisplayList.cpp
index c11741c..648da9c 100644
--- a/libs/hwui/DisplayList.cpp
+++ b/libs/hwui/DisplayList.cpp
@@ -501,8 +501,10 @@
     setViewProperties<T>(renderer, handler, level + 1);
 
     if (mClipToBounds && renderer.quickRejectNoScissor(0, 0, mWidth, mHeight)) {
-        DISPLAY_LIST_LOGD("%*sRestoreToCount %d", level * 2, "", restoreTo);
+        DISPLAY_LIST_LOGD("%*sRestoreToCount %d", (level + 1) * 2, "", restoreTo);
         handler(mRestoreToCountOp->reinit(restoreTo), PROPERTY_SAVECOUNT, mClipToBounds);
+        renderer.restoreToCount(restoreTo);
+        renderer.setOverrideLayerAlpha(1.0f);
         return;
     }