diff options
| author | Gilles Debunne <debunne@google.com> | 2011-12-01 10:21:59 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-12-01 10:21:59 -0800 |
| commit | b2aa672f24ea0d746f3b96c24e376d5e2c041dc3 (patch) | |
| tree | 1d6ba218a8d8fbe8be5416e08d0b89b16f2118ec | |
| parent | 2c2ed7bef931f43dc0701ab723beb0cbed2cb630 (diff) | |
| parent | 8bfcd133a2a326d3fddb87834fedb1cf18edc59f (diff) | |
| download | frameworks_base-b2aa672f24ea0d746f3b96c24e376d5e2c041dc3.zip frameworks_base-b2aa672f24ea0d746f3b96c24e376d5e2c041dc3.tar.gz frameworks_base-b2aa672f24ea0d746f3b96c24e376d5e2c041dc3.tar.bz2 | |
Merge "Revert "IME action (done, next...) correctly handled"" into ics-mr1
| -rw-r--r-- | core/java/android/widget/TextView.java | 4 |
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; |