summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorGilles Debunne <debunne@google.com>2011-11-30 15:40:28 -0800
committerGilles Debunne <debunne@google.com>2011-11-30 15:40:28 -0800
commit8bfcd133a2a326d3fddb87834fedb1cf18edc59f (patch)
treee6a599147e06393d9efb813c653ba0e44b77ace9 /core
parent88f10c6ce5a97b1990934148deb8ed6aa6ef7a48 (diff)
downloadframeworks_base-8bfcd133a2a326d3fddb87834fedb1cf18edc59f.zip
frameworks_base-8bfcd133a2a326d3fddb87834fedb1cf18edc59f.tar.gz
frameworks_base-8bfcd133a2a326d3fddb87834fedb1cf18edc59f.tar.bz2
Revert "IME action (done, next...) correctly handled"
This reverts commit efbad5fb90fe990d42bf30c63e42558bd9bdb5d8.
Diffstat (limited to 'core')
-rw-r--r--core/java/android/widget/TextView.java4
1 files changed, 1 insertions, 3 deletions
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;