From 8bfcd133a2a326d3fddb87834fedb1cf18edc59f Mon Sep 17 00:00:00 2001 From: Gilles Debunne Date: Wed, 30 Nov 2011 15:40:28 -0800 Subject: Revert "IME action (done, next...) correctly handled" This reverts commit efbad5fb90fe990d42bf30c63e42558bd9bdb5d8. --- core/java/android/widget/TextView.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'core') diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java index 0f1b43b..060fb24 100644 --- a/core/java/android/widget/TextView.java +++ b/core/java/android/widget/TextView.java @@ -3785,7 +3785,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener return; } } - + // This is the handling for some default action. // Note that for backwards compatibility we don't do this // default handling if explicit ime options have not been given, @@ -5594,8 +5594,6 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener outAttrs.extras = mInputContentType.extras; } else { outAttrs.imeOptions = EditorInfo.IME_NULL; - // May not be defined otherwise and needed by onEditorAction - mInputContentType = new InputContentType(); } if (focusSearch(FOCUS_DOWN) != null) { outAttrs.imeOptions |= EditorInfo.IME_FLAG_NAVIGATE_NEXT; -- cgit v1.1