Merge "Fix bug with display lists and layout." into honeycomb

2011-01-24 17:03:30 -08:00
parent 85d3ef337b 5af048c791
commit 50d4de21ee
1 changed files with 2 additions and 0 deletions
--- a/core/java/android/view/View.java
+++ b/core/java/android/view/View.java
@@ -10288,6 +10288,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, Accessibility
        }

        mPrivateFlags |= FORCE_LAYOUT;
+        mPrivateFlags |= INVALIDATED;

        if (mParent != null && !mParent.isLayoutRequested()) {
            mParent.requestLayout();
@@ -10301,6 +10302,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, Accessibility
     */
    public void forceLayout() {
        mPrivateFlags |= FORCE_LAYOUT;
+        mPrivateFlags |= INVALIDATED;
    }

    /**