Merge "Fix quickReject logic for transformed views" into jb-dev

chethaase · Android (Google) Code Review · commit 76f082189ec4 · 2012-05-11T12:59:41.000-07:00
diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java
@@ -2135,6 +2135,13 @@ public class View implements Drawable.Callback, Drawable.Callback2, KeyEvent.Cal
      */
     static final int VIEW_IS_ANIMATING_TRANSFORM = 0x10000000;
 
+    /**
+     * Flag indicating whether a view failed the quickReject() check in draw(). This condition
+     * is used to check whether later changes to the view's transform should invalidate the
+     * view to force the quickReject test to run again.
+     */
+    static final int VIEW_QUICK_REJECTED = 0x20000000;
+
     /* End of masks for mPrivateFlags2 */
 
     static final int DRAG_MASK = DRAG_CAN_ACCEPT | DRAG_HOVERED;
@@ -8567,6 +8574,10 @@ public void setCameraDistance(float distance) {
         if (mDisplayList != null) {
             mDisplayList.setCameraDistance(-Math.abs(distance) / dpi);
         }
+        if ((mPrivateFlags2 & VIEW_QUICK_REJECTED) == VIEW_QUICK_REJECTED) {
+            // View was rejected last time it was drawn by its parent; this may have changed
+            invalidateParentIfNeeded();
+        }
     }
 
     /**
@@ -8609,6 +8620,10 @@ public void setRotation(float rotation) {
             if (mDisplayList != null) {
                 mDisplayList.setRotation(rotation);
             }
+            if ((mPrivateFlags2 & VIEW_QUICK_REJECTED) == VIEW_QUICK_REJECTED) {
+                // View was rejected last time it was drawn by its parent; this may have changed
+                invalidateParentIfNeeded();
+            }
         }
     }
 
@@ -8656,6 +8671,10 @@ public void setRotationY(float rotationY) {
             if (mDisplayList != null) {
                 mDisplayList.setRotationY(rotationY);
             }
+            if ((mPrivateFlags2 & VIEW_QUICK_REJECTED) == VIEW_QUICK_REJECTED) {
+                // View was rejected last time it was drawn by its parent; this may have changed
+                invalidateParentIfNeeded();
+            }
         }
     }
 
@@ -8703,6 +8722,10 @@ public void setRotationX(float rotationX) {
             if (mDisplayList != null) {
                 mDisplayList.setRotationX(rotationX);
             }
+            if ((mPrivateFlags2 & VIEW_QUICK_REJECTED) == VIEW_QUICK_REJECTED) {
+                // View was rejected last time it was drawn by its parent; this may have changed
+                invalidateParentIfNeeded();
+            }
         }
     }
 
@@ -8742,6 +8765,10 @@ public void setScaleX(float scaleX) {
             if (mDisplayList != null) {
                 mDisplayList.setScaleX(scaleX);
             }
+            if ((mPrivateFlags2 & VIEW_QUICK_REJECTED) == VIEW_QUICK_REJECTED) {
+                // View was rejected last time it was drawn by its parent; this may have changed
+                invalidateParentIfNeeded();
+            }
         }
     }
 
@@ -8781,6 +8808,10 @@ public void setScaleY(float scaleY) {
             if (mDisplayList != null) {
                 mDisplayList.setScaleY(scaleY);
             }
+            if ((mPrivateFlags2 & VIEW_QUICK_REJECTED) == VIEW_QUICK_REJECTED) {
+                // View was rejected last time it was drawn by its parent; this may have changed
+                invalidateParentIfNeeded();
+            }
         }
     }
 
@@ -8828,6 +8859,10 @@ public void setPivotX(float pivotX) {
             if (mDisplayList != null) {
                 mDisplayList.setPivotX(pivotX);
             }
+            if ((mPrivateFlags2 & VIEW_QUICK_REJECTED) == VIEW_QUICK_REJECTED) {
+                // View was rejected last time it was drawn by its parent; this may have changed
+                invalidateParentIfNeeded();
+            }
         }
     }
 
@@ -8874,6 +8909,10 @@ public void setPivotY(float pivotY) {
             if (mDisplayList != null) {
                 mDisplayList.setPivotY(pivotY);
             }
+            if ((mPrivateFlags2 & VIEW_QUICK_REJECTED) == VIEW_QUICK_REJECTED) {
+                // View was rejected last time it was drawn by its parent; this may have changed
+                invalidateParentIfNeeded();
+            }
         }
     }
 
@@ -9032,6 +9071,10 @@ public final void setTop(int top) {
             }
             mBackgroundSizeChanged = true;
             invalidateParentIfNeeded();
+            if ((mPrivateFlags2 & VIEW_QUICK_REJECTED) == VIEW_QUICK_REJECTED) {
+                // View was rejected last time it was drawn by its parent; this may have changed
+                invalidateParentIfNeeded();
+            }
         }
     }
 
@@ -9101,6 +9144,10 @@ public final void setBottom(int bottom) {
             }
             mBackgroundSizeChanged = true;
             invalidateParentIfNeeded();
+            if ((mPrivateFlags2 & VIEW_QUICK_REJECTED) == VIEW_QUICK_REJECTED) {
+                // View was rejected last time it was drawn by its parent; this may have changed
+                invalidateParentIfNeeded();
+            }
         }
     }
 
@@ -9164,6 +9211,10 @@ public final void setLeft(int left) {
             }
             mBackgroundSizeChanged = true;
             invalidateParentIfNeeded();
+            if ((mPrivateFlags2 & VIEW_QUICK_REJECTED) == VIEW_QUICK_REJECTED) {
+                // View was rejected last time it was drawn by its parent; this may have changed
+                invalidateParentIfNeeded();
+            }
         }
     }
 
@@ -9224,6 +9275,10 @@ public final void setRight(int right) {
             }
             mBackgroundSizeChanged = true;
             invalidateParentIfNeeded();
+            if ((mPrivateFlags2 & VIEW_QUICK_REJECTED) == VIEW_QUICK_REJECTED) {
+                // View was rejected last time it was drawn by its parent; this may have changed
+                invalidateParentIfNeeded();
+            }
         }
     }
 
@@ -9308,6 +9363,10 @@ public void setTranslationX(float translationX) {
             if (mDisplayList != null) {
                 mDisplayList.setTranslationX(translationX);
             }
+            if ((mPrivateFlags2 & VIEW_QUICK_REJECTED) == VIEW_QUICK_REJECTED) {
+                // View was rejected last time it was drawn by its parent; this may have changed
+                invalidateParentIfNeeded();
+            }
         }
     }
 
@@ -9345,6 +9404,10 @@ public void setTranslationY(float translationY) {
             if (mDisplayList != null) {
                 mDisplayList.setTranslationY(translationY);
             }
+            if ((mPrivateFlags2 & VIEW_QUICK_REJECTED) == VIEW_QUICK_REJECTED) {
+                // View was rejected last time it was drawn by its parent; this may have changed
+                invalidateParentIfNeeded();
+            }
         }
     }
 
@@ -12816,8 +12879,10 @@ boolean draw(Canvas canvas, ViewGroup parent, long drawingTime) {
 
         if (!concatMatrix && canvas.quickReject(mLeft, mTop, mRight, mBottom, Canvas.EdgeType.BW) &&
                 (mPrivateFlags & DRAW_ANIMATION) == 0) {
+            mPrivateFlags2 |= VIEW_QUICK_REJECTED;
             return more;
         }
+        mPrivateFlags2 &= ~VIEW_QUICK_REJECTED;
 
         if (hardwareAccelerated) {
             // Clear INVALIDATED flag to allow invalidation to occur during rendering, but

Original file line number	Diff line number	Diff line change
`@@ -2135,6 +2135,13 @@ public class View implements Drawable.Callback, Drawable.Callback2, KeyEvent.Cal`
`2135`	`2135`	`*/`
`2136`	`2136`	`static final int VIEW_IS_ANIMATING_TRANSFORM = 0x10000000;`
`2137`	`2137`
	`2138`	`+ /**`
	`2139`	`+ * Flag indicating whether a view failed the quickReject() check in draw(). This condition`
	`2140`	`+ * is used to check whether later changes to the view's transform should invalidate the`
	`2141`	`+ * view to force the quickReject test to run again.`
	`2142`	`+ */`
	`2143`	`+ static final int VIEW_QUICK_REJECTED = 0x20000000;`
	`2144`	`+`
`2138`	`2145`	`/* End of masks for mPrivateFlags2 */`
`2139`	`2146`
`2140`	`2147`	`static final int DRAG_MASK = DRAG_CAN_ACCEPT \| DRAG_HOVERED;`
`@@ -8567,6 +8574,10 @@ public void setCameraDistance(float distance) {`
`8567`	`8574`	`if (mDisplayList != null) {`
`8568`	`8575`	`mDisplayList.setCameraDistance(-Math.abs(distance) / dpi);`
`8569`	`8576`	`}`
	`8577`	`+ if ((mPrivateFlags2 & VIEW_QUICK_REJECTED) == VIEW_QUICK_REJECTED) {`
	`8578`	`+ // View was rejected last time it was drawn by its parent; this may have changed`
	`8579`	`+ invalidateParentIfNeeded();`
	`8580`	`+ }`
`8570`	`8581`	`}`
`8571`	`8582`
`8572`	`8583`	`/**`
`@@ -8609,6 +8620,10 @@ public void setRotation(float rotation) {`
`8609`	`8620`	`if (mDisplayList != null) {`
`8610`	`8621`	`mDisplayList.setRotation(rotation);`
`8611`	`8622`	`}`
	`8623`	`+ if ((mPrivateFlags2 & VIEW_QUICK_REJECTED) == VIEW_QUICK_REJECTED) {`
	`8624`	`+ // View was rejected last time it was drawn by its parent; this may have changed`
	`8625`	`+ invalidateParentIfNeeded();`
	`8626`	`+ }`
`8612`	`8627`	`}`
`8613`	`8628`	`}`
`8614`	`8629`
`@@ -8656,6 +8671,10 @@ public void setRotationY(float rotationY) {`
`8656`	`8671`	`if (mDisplayList != null) {`
`8657`	`8672`	`mDisplayList.setRotationY(rotationY);`
`8658`	`8673`	`}`
	`8674`	`+ if ((mPrivateFlags2 & VIEW_QUICK_REJECTED) == VIEW_QUICK_REJECTED) {`
	`8675`	`+ // View was rejected last time it was drawn by its parent; this may have changed`
	`8676`	`+ invalidateParentIfNeeded();`
	`8677`	`+ }`
`8659`	`8678`	`}`
`8660`	`8679`	`}`
`8661`	`8680`
`@@ -8703,6 +8722,10 @@ public void setRotationX(float rotationX) {`
`8703`	`8722`	`if (mDisplayList != null) {`
`8704`	`8723`	`mDisplayList.setRotationX(rotationX);`
`8705`	`8724`	`}`
	`8725`	`+ if ((mPrivateFlags2 & VIEW_QUICK_REJECTED) == VIEW_QUICK_REJECTED) {`
	`8726`	`+ // View was rejected last time it was drawn by its parent; this may have changed`
	`8727`	`+ invalidateParentIfNeeded();`
	`8728`	`+ }`
`8706`	`8729`	`}`
`8707`	`8730`	`}`
`8708`	`8731`
`@@ -8742,6 +8765,10 @@ public void setScaleX(float scaleX) {`
`8742`	`8765`	`if (mDisplayList != null) {`
`8743`	`8766`	`mDisplayList.setScaleX(scaleX);`
`8744`	`8767`	`}`
	`8768`	`+ if ((mPrivateFlags2 & VIEW_QUICK_REJECTED) == VIEW_QUICK_REJECTED) {`
	`8769`	`+ // View was rejected last time it was drawn by its parent; this may have changed`
	`8770`	`+ invalidateParentIfNeeded();`
	`8771`	`+ }`
`8745`	`8772`	`}`
`8746`	`8773`	`}`
`8747`	`8774`
`@@ -8781,6 +8808,10 @@ public void setScaleY(float scaleY) {`
`8781`	`8808`	`if (mDisplayList != null) {`
`8782`	`8809`	`mDisplayList.setScaleY(scaleY);`
`8783`	`8810`	`}`
	`8811`	`+ if ((mPrivateFlags2 & VIEW_QUICK_REJECTED) == VIEW_QUICK_REJECTED) {`
	`8812`	`+ // View was rejected last time it was drawn by its parent; this may have changed`
	`8813`	`+ invalidateParentIfNeeded();`
	`8814`	`+ }`
`8784`	`8815`	`}`
`8785`	`8816`	`}`
`8786`	`8817`
`@@ -8828,6 +8859,10 @@ public void setPivotX(float pivotX) {`
`8828`	`8859`	`if (mDisplayList != null) {`
`8829`	`8860`	`mDisplayList.setPivotX(pivotX);`
`8830`	`8861`	`}`
	`8862`	`+ if ((mPrivateFlags2 & VIEW_QUICK_REJECTED) == VIEW_QUICK_REJECTED) {`
	`8863`	`+ // View was rejected last time it was drawn by its parent; this may have changed`
	`8864`	`+ invalidateParentIfNeeded();`
	`8865`	`+ }`
`8831`	`8866`	`}`
`8832`	`8867`	`}`
`8833`	`8868`
`@@ -8874,6 +8909,10 @@ public void setPivotY(float pivotY) {`
`8874`	`8909`	`if (mDisplayList != null) {`
`8875`	`8910`	`mDisplayList.setPivotY(pivotY);`
`8876`	`8911`	`}`
	`8912`	`+ if ((mPrivateFlags2 & VIEW_QUICK_REJECTED) == VIEW_QUICK_REJECTED) {`
	`8913`	`+ // View was rejected last time it was drawn by its parent; this may have changed`
	`8914`	`+ invalidateParentIfNeeded();`
	`8915`	`+ }`
`8877`	`8916`	`}`
`8878`	`8917`	`}`
`8879`	`8918`
`@@ -9032,6 +9071,10 @@ public final void setTop(int top) {`
`9032`	`9071`	`}`
`9033`	`9072`	`mBackgroundSizeChanged = true;`
`9034`	`9073`	`invalidateParentIfNeeded();`
	`9074`	`+ if ((mPrivateFlags2 & VIEW_QUICK_REJECTED) == VIEW_QUICK_REJECTED) {`
	`9075`	`+ // View was rejected last time it was drawn by its parent; this may have changed`
	`9076`	`+ invalidateParentIfNeeded();`
	`9077`	`+ }`
`9035`	`9078`	`}`
`9036`	`9079`	`}`
`9037`	`9080`
`@@ -9101,6 +9144,10 @@ public final void setBottom(int bottom) {`
`9101`	`9144`	`}`
`9102`	`9145`	`mBackgroundSizeChanged = true;`
`9103`	`9146`	`invalidateParentIfNeeded();`
	`9147`	`+ if ((mPrivateFlags2 & VIEW_QUICK_REJECTED) == VIEW_QUICK_REJECTED) {`
	`9148`	`+ // View was rejected last time it was drawn by its parent; this may have changed`
	`9149`	`+ invalidateParentIfNeeded();`
	`9150`	`+ }`
`9104`	`9151`	`}`
`9105`	`9152`	`}`
`9106`	`9153`
`@@ -9164,6 +9211,10 @@ public final void setLeft(int left) {`
`9164`	`9211`	`}`
`9165`	`9212`	`mBackgroundSizeChanged = true;`
`9166`	`9213`	`invalidateParentIfNeeded();`
	`9214`	`+ if ((mPrivateFlags2 & VIEW_QUICK_REJECTED) == VIEW_QUICK_REJECTED) {`
	`9215`	`+ // View was rejected last time it was drawn by its parent; this may have changed`
	`9216`	`+ invalidateParentIfNeeded();`
	`9217`	`+ }`
`9167`	`9218`	`}`
`9168`	`9219`	`}`
`9169`	`9220`
`@@ -9224,6 +9275,10 @@ public final void setRight(int right) {`
`9224`	`9275`	`}`
`9225`	`9276`	`mBackgroundSizeChanged = true;`
`9226`	`9277`	`invalidateParentIfNeeded();`
	`9278`	`+ if ((mPrivateFlags2 & VIEW_QUICK_REJECTED) == VIEW_QUICK_REJECTED) {`
	`9279`	`+ // View was rejected last time it was drawn by its parent; this may have changed`
	`9280`	`+ invalidateParentIfNeeded();`
	`9281`	`+ }`
`9227`	`9282`	`}`
`9228`	`9283`	`}`
`9229`	`9284`
`@@ -9308,6 +9363,10 @@ public void setTranslationX(float translationX) {`
`9308`	`9363`	`if (mDisplayList != null) {`
`9309`	`9364`	`mDisplayList.setTranslationX(translationX);`
`9310`	`9365`	`}`
	`9366`	`+ if ((mPrivateFlags2 & VIEW_QUICK_REJECTED) == VIEW_QUICK_REJECTED) {`
	`9367`	`+ // View was rejected last time it was drawn by its parent; this may have changed`
	`9368`	`+ invalidateParentIfNeeded();`
	`9369`	`+ }`
`9311`	`9370`	`}`
`9312`	`9371`	`}`
`9313`	`9372`
`@@ -9345,6 +9404,10 @@ public void setTranslationY(float translationY) {`
`9345`	`9404`	`if (mDisplayList != null) {`
`9346`	`9405`	`mDisplayList.setTranslationY(translationY);`
`9347`	`9406`	`}`
	`9407`	`+ if ((mPrivateFlags2 & VIEW_QUICK_REJECTED) == VIEW_QUICK_REJECTED) {`
	`9408`	`+ // View was rejected last time it was drawn by its parent; this may have changed`
	`9409`	`+ invalidateParentIfNeeded();`
	`9410`	`+ }`
`9348`	`9411`	`}`
`9349`	`9412`	`}`
`9350`	`9413`
`@@ -12816,8 +12879,10 @@ boolean draw(Canvas canvas, ViewGroup parent, long drawingTime) {`
`12816`	`12879`
`12817`	`12880`	`if (!concatMatrix && canvas.quickReject(mLeft, mTop, mRight, mBottom, Canvas.EdgeType.BW) &&`
`12818`	`12881`	`(mPrivateFlags & DRAW_ANIMATION) == 0) {`
	`12882`	`+ mPrivateFlags2 \|= VIEW_QUICK_REJECTED;`
`12819`	`12883`	`return more;`
`12820`	`12884`	`}`
	`12885`	`+ mPrivateFlags2 &= ~VIEW_QUICK_REJECTED;`
`12821`	`12886`
`12822`	`12887`	`if (hardwareAccelerated) {`
`12823`	`12888`	`// Clear INVALIDATED flag to allow invalidation to occur during rendering, but`