Automated import from //branches/cupcake/...@142788,142788

1 files changed, 8 insertions, 2 deletions

diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java
index 81516b9158dc..9c810e1c426d 100644
--- a/core/java/android/widget/TextView.java
+++ b/core/java/android/widget/TextView.java
@@ -3359,12 +3359,16 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
             mPopup.update(this, getErrorX(), getErrorY(), -1, -1);
         }
 
+        restartMarqueeIfNeeded();
+
+        return result;
+    }
+
+    private void restartMarqueeIfNeeded() {
         if (mRestartMarquee && mEllipsize == TextUtils.TruncateAt.MARQUEE) {
             mRestartMarquee = false;
             startMarquee();
         }
-
-        return result;
     }
 
     /**
@@ -3674,6 +3678,8 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
 
     @Override
     protected void onDraw(Canvas canvas) {
+        restartMarqueeIfNeeded();
+
         // Draw the background for this view
         super.onDraw(canvas);