am 371d4ccc: am 339ac854: Merge "Fix quickReject logic to account for setClipChildren() setting" into jb-mr2-dev

* commit '371d4cccde56ec4d26e51f8e82ef68f196169a3d':
  Fix quickReject logic to account for setClipChildren() setting

5 files changed, 9 insertions, 9 deletions

diff --git a/core/java/android/view/DisplayList.java b/core/java/android/view/DisplayList.java
index 3bad98ef6770..2d24c1ea42fa 100644
--- a/core/java/android/view/DisplayList.java
+++ b/core/java/android/view/DisplayList.java
@@ -285,9 +285,9 @@ public abstract class DisplayList {
      * Set whether the display list should clip itself to its bounds. This property is controlled by
      * the view's parent.
      *
-     * @param clipChildren true if the display list should clip to its bounds
+     * @param clipToBounds true if the display list should clip to its bounds
      */
-    public abstract void setClipChildren(boolean clipChildren);
+    public abstract void setClipToBounds(boolean clipToBounds);
 
     /**
      * Set the static matrix on the display list. The specified matrix is combined with other
diff --git a/core/java/android/view/GLES20DisplayList.java b/core/java/android/view/GLES20DisplayList.java
index 9c5cdb2bd2c4..3272504fbfa6 100644
--- a/core/java/android/view/GLES20DisplayList.java
+++ b/core/java/android/view/GLES20DisplayList.java
@@ -137,9 +137,9 @@ class GLES20DisplayList extends DisplayList {
     }
 
     @Override
-    public void setClipChildren(boolean clipChildren) {
+    public void setClipToBounds(boolean clipToBounds) {
         if (hasNativeDisplayList()) {
-            nSetClipChildren(mFinalizer.mNativeDisplayList, clipChildren);
+            nSetClipToBounds(mFinalizer.mNativeDisplayList, clipToBounds);
         }
     }
 
@@ -450,7 +450,7 @@ class GLES20DisplayList extends DisplayList {
     private static native void nSetPivotY(int displayList, float pivotY);
     private static native void nSetPivotX(int displayList, float pivotX);
     private static native void nSetCaching(int displayList, boolean caching);
-    private static native void nSetClipChildren(int displayList, boolean clipChildren);
+    private static native void nSetClipToBounds(int displayList, boolean clipToBounds);
     private static native void nSetAlpha(int displayList, float alpha);
     private static native void nSetHasOverlappingRendering(int displayList,
             boolean hasOverlappingRendering);
diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java
index 17ef58ad8429..d658aac5215e 100644
--- a/core/java/android/view/View.java
+++ b/core/java/android/view/View.java
@@ -13515,8 +13515,8 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
             displayList.setLeftTopRightBottom(mLeft, mTop, mRight, mBottom);
             displayList.setHasOverlappingRendering(hasOverlappingRendering());
             if (mParent instanceof ViewGroup) {
-                displayList.setClipChildren(
-                        (((ViewGroup)mParent).mGroupFlags & ViewGroup.FLAG_CLIP_CHILDREN) != 0);
+                displayList.setClipToBounds(
+                        (((ViewGroup) mParent).mGroupFlags & ViewGroup.FLAG_CLIP_CHILDREN) != 0);
             }
             float alpha = 1;
             if (mParent instanceof ViewGroup && (((ViewGroup) mParent).mGroupFlags &
diff --git a/core/java/android/view/ViewGroup.java b/core/java/android/view/ViewGroup.java
index a8c83f7f681c..931c7333d736 100644
--- a/core/java/android/view/ViewGroup.java
+++ b/core/java/android/view/ViewGroup.java
@@ -3119,7 +3119,7 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager
             for (int i = 0; i < mChildrenCount; ++i) {
                 View child = getChildAt(i);
                 if (child.mDisplayList != null) {
-                    child.mDisplayList.setClipChildren(clipChildren);
+                    child.mDisplayList.setClipToBounds(clipChildren);
                 }
             }
         }
diff --git a/core/java/android/widget/Editor.java b/core/java/android/widget/Editor.java
index 0c1a80e565e8..4312dee848f9 100644
--- a/core/java/android/widget/Editor.java
+++ b/core/java/android/widget/Editor.java
@@ -1367,7 +1367,7 @@ public class Editor {
                         } finally {
                             blockDisplayList.end();
                             // Same as drawDisplayList below, handled by our TextView's parent
-                            blockDisplayList.setClipChildren(false);
+                            blockDisplayList.setClipToBounds(false);
                         }
                     }