Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fixed single line state on TextView." into gingerbread

Browse Source
This commit is contained in:
Gilles Debunne
2010-08-31 16:18:06 -07:00
committed by Android (Google) Code Review
parent 307ed31c93 e67b58a347
commit d2fbabad1e
2 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/java/android/inputmethodservice/ExtractEditText.java
View File

@@ -109,6 +109,7 @@ public class ExtractEditText extends EditText {
/** /**
* We are always considered to be an input method target. * We are always considered to be an input method target.
*/ */
@Override
public boolean isInputMethodTarget() { public boolean isInputMethodTarget() {
return true; return true;
} }
@@ -125,7 +126,7 @@ public class ExtractEditText extends EditText {
* highlight and cursor will be displayed. * highlight and cursor will be displayed.
*/ */
@Override public boolean hasWindowFocus() { @Override public boolean hasWindowFocus() {
return this.isEnabled() ? true : false; return this.isEnabled();
} }
/** /**
@@ -133,7 +134,7 @@ public class ExtractEditText extends EditText {
* highlight and cursor will be displayed. * highlight and cursor will be displayed.
*/ */
@Override public boolean isFocused() { @Override public boolean isFocused() {
return this.isEnabled() ? true : false; return this.isEnabled();
} }
/** /**
@@ -141,6 +142,6 @@ public class ExtractEditText extends EditText {
* highlight and cursor will be displayed. * highlight and cursor will be displayed.
*/ */
@Override public boolean hasFocus() { @Override public boolean hasFocus() {
return this.isEnabled() ? true : false; return this.isEnabled();
} }
} }

12
core/java/android/widget/TextView.java
View File

@@ -710,10 +710,8 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
BufferType bufferType = BufferType.EDITABLE; BufferType bufferType = BufferType.EDITABLE;
if ((inputType&(EditorInfo.TYPE_MASK_CLASS if ((inputType & (EditorInfo.TYPE_MASK_CLASS | EditorInfo.TYPE_MASK_VARIATION))
|EditorInfo.TYPE_MASK_VARIATION)) == (EditorInfo.TYPE_CLASS_TEXT | EditorInfo.TYPE_TEXT_VARIATION_PASSWORD)) {
== (EditorInfo.TYPE_CLASS_TEXT
|EditorInfo.TYPE_TEXT_VARIATION_PASSWORD)) {
password = true; password = true;
} }
@@ -801,6 +799,9 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
} else if (editable) { } else if (editable) {
mInput = TextKeyListener.getInstance(); mInput = TextKeyListener.getInstance();
mInputType = EditorInfo.TYPE_CLASS_TEXT; mInputType = EditorInfo.TYPE_CLASS_TEXT;
if (!singleLine) {
mInputType |= EditorInfo.TYPE_TEXT_FLAG_MULTI_LINE;
}
} else { } else {
mInput = null; mInput = null;
@@ -2961,8 +2962,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
final int cls = type & EditorInfo.TYPE_MASK_CLASS; final int cls = type & EditorInfo.TYPE_MASK_CLASS;
KeyListener input; KeyListener input;
if (cls == EditorInfo.TYPE_CLASS_TEXT) { if (cls == EditorInfo.TYPE_CLASS_TEXT) {
boolean autotext = (type & EditorInfo.TYPE_TEXT_FLAG_AUTO_CORRECT) boolean autotext = (type & EditorInfo.TYPE_TEXT_FLAG_AUTO_CORRECT) != 0;
!= 0;
TextKeyListener.Capitalize cap; TextKeyListener.Capitalize cap;
if ((type & EditorInfo.TYPE_TEXT_FLAG_CAP_CHARACTERS) != 0) { if ((type & EditorInfo.TYPE_TEXT_FLAG_CAP_CHARACTERS) != 0) {
cap = TextKeyListener.Capitalize.CHARACTERS; cap = TextKeyListener.Capitalize.CHARACTERS;