Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 341ac600 authored by Chet Haase's avatar Chet Haase Committed by Android Git Automerger
Browse files

am 1bf58a5a: am cfbbc864: Merge "Restore previous alpha value on noop\'d... 

am 1bf58a5a: am cfbbc864: Merge "Restore previous alpha value on noop\'d DisplayList operations" into jb-mr2-dev

* commit '1bf58a5a':
  Restore previous alpha value on noop'd DisplayList operations
parents 664ed997 1bf58a5a

libs/hwui/DisplayList.cpp

+3 −1
Original line number Diff line number Diff line
@@ -501,8 +501,10 @@ void DisplayList::iterate(OpenGLRenderer& renderer, T& handler, const int level) 
    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;

    }