diff options
| author | Gilles Debunne <debunne@google.com> | 2011-12-01 11:59:07 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-12-01 11:59:07 -0800 |
| commit | ad79297a4118e73e7828f08545963e9795407df1 (patch) | |
| tree | 92c665dc3fa5831a9ba909ced866647bd120538f /core/java/android/widget/TextView.java | |
| parent | de5b3a0933e17218f75ec42a244f482f7ead2d37 (diff) | |
| parent | d732efa2972eaaa22ff921c39744ec969598bcd0 (diff) | |
| download | frameworks_base-ad79297a4118e73e7828f08545963e9795407df1.zip frameworks_base-ad79297a4118e73e7828f08545963e9795407df1.tar.gz frameworks_base-ad79297a4118e73e7828f08545963e9795407df1.tar.bz2 | |
am d732efa2: am b2aa672f: Merge "Revert "IME action (done, next...) correctly handled"" into ics-mr1
* commit 'd732efa2972eaaa22ff921c39744ec969598bcd0':
Revert "IME action (done, next...) correctly handled"
Diffstat (limited to 'core/java/android/widget/TextView.java')
| -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 c24d928..907aede 100644 --- a/core/java/android/widget/TextView.java +++ b/core/java/android/widget/TextView.java @@ -3799,7 +3799,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, @@ -5608,8 +5608,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; |