diff options
| author | Gilles Debunne <debunne@google.com> | 2010-08-31 16:22:54 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-31 16:22:54 -0700 |
| commit | ff46a5c9bd55c492925ffcb608510a0a3dd8a969 (patch) | |
| tree | 19620097093b560207bce9e181f57b9512d9fbf2 /core/java/android/widget/TextView.java | |
| parent | df02df115a594553b3ebaa95a0a7f7185a8787d3 (diff) | |
| parent | d2fbabad1e1fa8de1f0809ec5a2653f8af25dbb3 (diff) | |
| download | frameworks_base-ff46a5c9bd55c492925ffcb608510a0a3dd8a969.zip frameworks_base-ff46a5c9bd55c492925ffcb608510a0a3dd8a969.tar.gz frameworks_base-ff46a5c9bd55c492925ffcb608510a0a3dd8a969.tar.bz2 | |
am d2fbabad: Merge "Fixed single line state on TextView." into gingerbread
Merge commit 'd2fbabad1e1fa8de1f0809ec5a2653f8af25dbb3' into gingerbread-plus-aosp
* commit 'd2fbabad1e1fa8de1f0809ec5a2653f8af25dbb3':
Fixed single line state on TextView.
Diffstat (limited to 'core/java/android/widget/TextView.java')
| -rw-r--r-- | core/java/android/widget/TextView.java | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java index 5cdd4f2..93f64b4 100644 --- a/core/java/android/widget/TextView.java +++ b/core/java/android/widget/TextView.java @@ -710,10 +710,8 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener BufferType bufferType = BufferType.EDITABLE; - if ((inputType&(EditorInfo.TYPE_MASK_CLASS - |EditorInfo.TYPE_MASK_VARIATION)) - == (EditorInfo.TYPE_CLASS_TEXT - |EditorInfo.TYPE_TEXT_VARIATION_PASSWORD)) { + if ((inputType & (EditorInfo.TYPE_MASK_CLASS | EditorInfo.TYPE_MASK_VARIATION)) + == (EditorInfo.TYPE_CLASS_TEXT | EditorInfo.TYPE_TEXT_VARIATION_PASSWORD)) { password = true; } @@ -801,6 +799,9 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener } else if (editable) { mInput = TextKeyListener.getInstance(); mInputType = EditorInfo.TYPE_CLASS_TEXT; + if (!singleLine) { + mInputType |= EditorInfo.TYPE_TEXT_FLAG_MULTI_LINE; + } } else { mInput = null; @@ -2961,8 +2962,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener final int cls = type & EditorInfo.TYPE_MASK_CLASS; KeyListener input; if (cls == EditorInfo.TYPE_CLASS_TEXT) { - boolean autotext = (type & EditorInfo.TYPE_TEXT_FLAG_AUTO_CORRECT) - != 0; + boolean autotext = (type & EditorInfo.TYPE_TEXT_FLAG_AUTO_CORRECT) != 0; TextKeyListener.Capitalize cap; if ((type & EditorInfo.TYPE_TEXT_FLAG_CAP_CHARACTERS) != 0) { cap = TextKeyListener.Capitalize.CHARACTERS; |