am 45dfa63a: Merge change 25640 into eclair
Merge commit '45dfa63af3c279ed1ed456a30bea4bf8cca67f83' into eclair-plus-aosp
* commit '45dfa63af3c279ed1ed456a30bea4bf8cca67f83':
Make the EditText error popup correctly resize when the view resizes.
diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java
index e98fd13..2e3364b 100644
--- a/core/java/android/widget/TextView.java
+++ b/core/java/android/widget/TextView.java
@@ -3408,7 +3408,8 @@
if (mPopup != null) {
TextView tv = (TextView) mPopup.getContentView();
chooseSize(mPopup, mError, tv);
- mPopup.update(this, getErrorX(), getErrorY(), -1, -1);
+ mPopup.update(this, getErrorX(), getErrorY(),
+ mPopup.getWidth(), mPopup.getHeight());
}
restartMarqueeIfNeeded();