commit 99f0f3676f50640dbb22bd12960f771fc414862e
author Adam Powell <adamp@google.com> Fri Sep 17 19:30:03 2010 -0700
committer Android Git Automerger <android-git-automerger@android.com> Fri Sep 17 19:30:03 2010 -0700
tree 9e70c7cc5fa052ba84fe67e478411bee3a6c83cf
parent a8d95248bdbb8ea0933ecf86d2859964324978a7
parent 4258bfb7a9fb18907fbfbe79ec0a937b4e7382b1

am 4258bfb7: Merge "Fix some drawing artifacts/bugs around overlays/text anchors" into gingerbread

Merge commit '4258bfb7a9fb18907fbfbe79ec0a937b4e7382b1' into gingerbread-plus-aosp

* commit '4258bfb7a9fb18907fbfbe79ec0a937b4e7382b1':
  Fix some drawing artifacts/bugs around overlays/text anchors

core/java/android/view/ViewGroup.java

diff --git a/core/java/android/view/ViewGroup.java b/core/java/android/view/ViewGroup.java
index fd6769c..deba70c 100644
--- a/core/java/android/view/ViewGroup.java
+++ b/core/java/android/view/ViewGroup.java
@@ -3542,10 +3542,10 @@
             for (int i = 0; i < childCount; i++) {
                 final View child = getChildAt(i);
                 if (child.isOverlayEnabled()) {
-                    canvas.translate(child.mLeft + child.mScrollX, child.mTop + child.mScrollY);
+                    canvas.translate(child.mLeft - child.mScrollX, child.mTop - child.mScrollY);
                     child.onDrawOverlay(canvas);
-                    canvas.translate(-(child.mLeft + child.mScrollX),
-                            -(child.mTop + child.mScrollY));
+                    canvas.translate(-(child.mLeft - child.mScrollX),
+                            -(child.mTop - child.mScrollY));
                 }
             }
         }

core/java/android/widget/TextView.java

diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java
index 54b2c00..07b22ea 100644
--- a/core/java/android/widget/TextView.java
+++ b/core/java/android/widget/TextView.java
@@ -7732,8 +7732,9 @@
             bounds.bottom = bounds.top + drawableHeight;
 
             convertFromViewportToContentCoordinates(bounds);
+            invalidate();
             mDrawable.setBounds(bounds);
-            postInvalidate();
+            invalidate();
         }
 
         boolean hasFingerOn(float x, float y) {
@@ -7750,9 +7751,16 @@
             return Rect.intersects(mDrawable.getBounds(), fingerRect);
         }
 
+        void invalidate() {
+            final Rect bounds = mDrawable.getBounds();
+            TextView.this.invalidate(bounds.left, bounds.top,
+                    bounds.right, bounds.bottom);
+        }
+
         void postInvalidate() {
             final Rect bounds = mDrawable.getBounds();
-            TextView.this.postInvalidate(bounds.left, bounds.top, bounds.right, bounds.bottom);
+            TextView.this.postInvalidate(bounds.left, bounds.top,
+                    bounds.right, bounds.bottom);
         }
 
         void postInvalidateDelayed(long delay) {