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

Commit cc6dda77 authored by Mathias Agopian's avatar Mathias Agopian Committed by Android Git Automerger
Browse files

am 4c87edfe: am 1763d6f9: Merge "always trigger a re-draw when updating the... 

am 4c87edfe: am 1763d6f9: Merge "always trigger a re-draw when updating the transparent region hint" into jb-mr2-dev

* commit '4c87edfe':
  always trigger a re-draw when updating the transparent region hint
parents 7abfc34c 4c87edfe

core/java/android/view/ViewRootImpl.java

+3 −2
Original line number Original line Diff line number Diff line
@@ -1730,7 +1730,7 @@ public final class ViewRootImpl implements ViewParent, 
        if (didLayout) {

        if (didLayout) {

            performLayout(lp, desiredWindowWidth, desiredWindowHeight);

            performLayout(lp, desiredWindowWidth, desiredWindowHeight);





            // By this point all views have been sized and positionned

            // By this point all views have been sized and positioned

            // We can compute the transparent area

            // We can compute the transparent area





            if ((host.mPrivateFlags & View.PFLAG_REQUEST_TRANSPARENT_REGIONS) != 0) {

            if ((host.mPrivateFlags & View.PFLAG_REQUEST_TRANSPARENT_REGIONS) != 0) {
@@ -1748,6 +1748,7 @@ public final class ViewRootImpl implements ViewParent, 




                if (!mTransparentRegion.equals(mPreviousTransparentRegion)) {

                if (!mTransparentRegion.equals(mPreviousTransparentRegion)) {

                    mPreviousTransparentRegion.set(mTransparentRegion);

                    mPreviousTransparentRegion.set(mTransparentRegion);

                    mFullRedrawNeeded = true;

                    // reconfigure window manager

                    // reconfigure window manager

                    try {

                    try {

                        mWindowSession.setTransparentRegion(mWindow, mTransparentRegion);

                        mWindowSession.setTransparentRegion(mWindow, mTransparentRegion);
@@ -4925,7 +4926,7 @@ public final class ViewRootImpl implements ViewParent, 
    public void handleDispatchDoneAnimating() {

    public void handleDispatchDoneAnimating() {

        if (mWindowsAnimating) {

        if (mWindowsAnimating) {

            mWindowsAnimating = false;

            mWindowsAnimating = false;

            if (!mDirty.isEmpty() || mIsAnimating)  {

            if (!mDirty.isEmpty() || mIsAnimating || mFullRedrawNeeded)  {

                scheduleTraversals();

                scheduleTraversals();

            }

            }

        }

        }