Merge "Fixed single line state on TextView." into gingerbread (d2fbabad) · Commits · e / os / android_frameworks_base

core/java/android/inputmethodservice/ExtractEditText.java

+4 −3

Original line number	Diff line number	Diff line
		@@ -109,6 +109,7 @@ public class ExtractEditText extends EditText {
		/**
		* We are always considered to be an input method target.
		*/
		@Override
		public boolean isInputMethodTarget() {
		return true;
		}
		@@ -125,7 +126,7 @@ public class ExtractEditText extends EditText {
		* highlight and cursor will be displayed.
		*/
		@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.
		*/
		@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.
		*/
		@Override public boolean hasFocus() {
		return this.isEnabled() ? true : false;
		return this.isEnabled();
		}
		}

+6 −6

Original line number	Diff line number	Diff line
		@@ -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;