Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Revert "IME action (done, next...) correctly handled"" into ics-mr1

Browse Source
This commit is contained in:
Gilles Debunne
2011-12-01 10:21:59 -08:00
committed by Android (Google) Code Review
parent 2c2ed7bef9 8bfcd133a2
commit b2aa672f24
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/widget/TextView.java
View File

@@ -3785,7 +3785,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
return; return;
} }
} }
// This is the handling for some default action. // This is the handling for some default action.
// Note that for backwards compatibility we don't do this // Note that for backwards compatibility we don't do this
// default handling if explicit ime options have not been given, // 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; outAttrs.extras = mInputContentType.extras;
} else { } else {
outAttrs.imeOptions = EditorInfo.IME_NULL; outAttrs.imeOptions = EditorInfo.IME_NULL;
// May not be defined otherwise and needed by onEditorAction
mInputContentType = new InputContentType();
} }
if (focusSearch(FOCUS_DOWN) != null) { if (focusSearch(FOCUS_DOWN) != null) {
outAttrs.imeOptions |= EditorInfo.IME_FLAG_NAVIGATE_NEXT; outAttrs.imeOptions |= EditorInfo.IME_FLAG_NAVIGATE_NEXT;