commit 6a6977e8728f3a3d209daadf587079dc7369050b
author Chet Haase <chet@google.com> Sun Sep 11 12:58:45 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Sun Sep 11 12:58:45 2011 -0700
tree c5e24046ccc935950ff315a0d2d89bad04fee54a
parent 8a48a2b96adb718f351ca3b6c3f25c74fef52a03
parent f186f30a7cbbf84e9b7ef52403d77f252b5229ed

Merge "Fix 5266335: bad DIRTY/invalidation logic"

core/java/android/view/View.java

diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java
index 637f6466..eedf19f 100644
--- a/core/java/android/view/View.java
+++ b/core/java/android/view/View.java
@@ -8193,6 +8193,7 @@
                 (mPrivateFlags & INVALIDATED) != INVALIDATED) {
             mPrivateFlags &= ~DRAWING_CACHE_VALID;
             mPrivateFlags |= INVALIDATED;
+            mPrivateFlags |= DIRTY;
             final ViewParent p = mParent;
             final AttachInfo ai = mAttachInfo;
             //noinspection PointlessBooleanExpression,ConstantConditions
@@ -8239,6 +8240,7 @@
                 (mPrivateFlags & INVALIDATED) != INVALIDATED) {
             mPrivateFlags &= ~DRAWING_CACHE_VALID;
             mPrivateFlags |= INVALIDATED;
+            mPrivateFlags |= DIRTY;
             final ViewParent p = mParent;
             final AttachInfo ai = mAttachInfo;
             //noinspection PointlessBooleanExpression,ConstantConditions
@@ -8294,6 +8296,7 @@
                 (mPrivateFlags & INVALIDATED) != INVALIDATED || isOpaque() != mLastIsOpaque) {
             mLastIsOpaque = isOpaque();
             mPrivateFlags &= ~DRAWN;
+            mPrivateFlags |= DIRTY;
             if (invalidateCache) {
                 mPrivateFlags |= INVALIDATED;
                 mPrivateFlags &= ~DRAWING_CACHE_VALID;
@@ -8334,6 +8337,7 @@
                 ((View) mParent).mPrivateFlags |= INVALIDATED;
             }
             mPrivateFlags &= ~DRAWN;
+            mPrivateFlags |= DIRTY;
             mPrivateFlags |= INVALIDATED;
             mPrivateFlags &= ~DRAWING_CACHE_VALID;
             if (mParent != null && mAttachInfo != null) {