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

Commit f2feb0fa authored by Romain Guy's avatar Romain Guy Committed by Android Git Automerger
Browse files

am 48a65d99: Merge change I8c5f2fc3 into eclair 

Merge commit '48a65d99' into eclair-mr2

* commit '48a65d99':
  Fix invalidate code path (#2273209).
parents 8280c2b1 48a65d99

core/java/android/view/View.java

+4 −3
Original line number Diff line number Diff line
@@ -4324,8 +4324,9 @@ public class View implements Drawable.Callback, KeyEvent.Callback, Accessibility 
            requestLayout();

            invalidate();



            if (((mViewFlags & VISIBILITY_MASK) == GONE) && hasFocus()) {

                clearFocus();

            if (((mViewFlags & VISIBILITY_MASK) == GONE)) {

                if (hasFocus()) clearFocus();

                destroyDrawingCache();

            }

            if (mAttachInfo != null) {

                mAttachInfo.mViewVisibilityChanged = true;
@@ -6283,6 +6284,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, Accessibility 
            canvas.translate(-mScrollX, -mScrollY);



            mPrivateFlags |= DRAWN;

            mPrivateFlags |= DRAWING_CACHE_VALID;



            // Fast path for layouts with no backgrounds

            if ((mPrivateFlags & SKIP_DRAW) == SKIP_DRAW) {
@@ -6301,7 +6303,6 @@ public class View implements Drawable.Callback, KeyEvent.Callback, Accessibility 
                // Restore the cached Canvas for our siblings

                attachInfo.mCanvas = canvas;

            }

            mPrivateFlags |= DRAWING_CACHE_VALID;

        }

    }