am 48a65d99: Merge change I8c5f2fc3 into eclair

Merge commit '48a65d99cba33db3af2e05982a6825b883be2030' into eclair-mr2

* commit '48a65d99cba33db3af2e05982a6825b883be2030':
  Fix invalidate code path (#2273209).

1 files changed, 4 insertions, 3 deletions

diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java
index 0b8753659087..1fc367810d22 100644
--- a/core/java/android/view/View.java
+++ b/core/java/android/view/View.java
@@ -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;
         }
     }