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

Merge "Require onCheckIsTextEditor() for IME_FLAG_NAVIGATE_{NEXT,PREVIOUS}"

Browse Source
This commit is contained in:
TreeHugger Robot
2021-10-28 21:16:04 +00:00
committed by Android (Google) Code Review
parent 88c8c7bb25 4bd98255ed
commit 4f7df47ee6
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -8751,6 +8751,11 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
return mEditor != null && mEditor.mInputType != EditorInfo.TYPE_NULL;
}
private boolean hasEditorInFocusSearchDirection(@FocusRealDirection int direction) {
final View nextView = focusSearch(direction);
return nextView != null && nextView.onCheckIsTextEditor();
}
@Override
public InputConnection onCreateInputConnection(EditorInfo outAttrs) {
if (onCheckIsTextEditor() && isEnabled()) {
@@ -8767,10 +8772,10 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
outAttrs.imeOptions = EditorInfo.IME_NULL;
outAttrs.hintLocales = null;
}
if (focusSearch(FOCUS_DOWN) != null) {
if (hasEditorInFocusSearchDirection(FOCUS_DOWN)) {
outAttrs.imeOptions |= EditorInfo.IME_FLAG_NAVIGATE_NEXT;
}
if (focusSearch(FOCUS_UP) != null) {
if (hasEditorInFocusSearchDirection(FOCUS_UP)) {
outAttrs.imeOptions |= EditorInfo.IME_FLAG_NAVIGATE_PREVIOUS;
}
if ((outAttrs.imeOptions & EditorInfo.IME_MASK_ACTION)