summaryrefslogtreecommitdiff
path: root/core/java/android/widget/EditText.java
diff options
context:
space:
mode:
authorThe Android Open Source Project <initial-contribution@android.com>2008-12-17 18:05:43 -0800
committerThe Android Open Source Project <initial-contribution@android.com>2008-12-17 18:05:43 -0800
commitf013e1afd1e68af5e3b868c26a653bbfb39538f8 (patch)
tree7ad6c8fd9c7b55f4b4017171dec1cb760bbd26bf /core/java/android/widget/EditText.java
parente70cfafe580c6f2994c4827cd8a534aabf3eb05c (diff)
Code drop from //branches/cupcake/...@124589
Diffstat (limited to 'core/java/android/widget/EditText.java')
-rw-r--r--core/java/android/widget/EditText.java10
1 files changed, 9 insertions, 1 deletions
diff --git a/core/java/android/widget/EditText.java b/core/java/android/widget/EditText.java
index e89a2bd02cb9..57aca240502b 100644
--- a/core/java/android/widget/EditText.java
+++ b/core/java/android/widget/EditText.java
@@ -19,7 +19,6 @@ package android.widget;
import android.text.*;
import android.text.method.*;
import android.content.Context;
-import android.content.res.Resources;
import android.util.AttributeSet;
@@ -99,4 +98,13 @@ public class EditText extends TextView {
public void extendSelection(int index) {
Selection.extendSelection(getText(), index);
}
+
+ @Override
+ public void setEllipsize(TextUtils.TruncateAt ellipsis) {
+ if (ellipsis == TextUtils.TruncateAt.MARQUEE) {
+ throw new IllegalArgumentException("EditText cannot use the ellipsize mode "
+ + "TextUtils.TruncateAt.MARQUEE");
+ }
+ super.setEllipsize(ellipsis);
+ }
}