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

Merge "Revert tab key behavior on multiline EditTexts." into rvc-dev am: 4d857ccce5

Browse Source 
Change-Id: I0a28c5d0f1add81ad3d0c1803340c98c096a20a5
This commit is contained in:
TreeHugger Robot
2020-05-13 22:43:06 +00:00
committed by Automerger Merge Worker
parent 2b9c12b289 4d857ccce5
commit 2980d35ee8
1 changed files with 2 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -8315,23 +8315,6 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
return false;
}
/**
* Returns true if pressing TAB in this field advances focus instead
* of inserting the character. Insert tabs only in multi-line editors.
*/
private boolean shouldAdvanceFocusOnTab() {
if (getKeyListener() != null && !mSingleLine && mEditor != null
&& (mEditor.mInputType & EditorInfo.TYPE_MASK_CLASS)
== EditorInfo.TYPE_CLASS_TEXT) {
int multilineFlags = EditorInfo.TYPE_TEXT_FLAG_IME_MULTI_LINE
| EditorInfo.TYPE_TEXT_FLAG_MULTI_LINE;
if ((mEditor.mInputType & multilineFlags) != 0) {
return false;
}
}
return true;
}
private boolean isDirectionalNavigationKey(int keyCode) {
switch(keyCode) {
case KeyEvent.KEYCODE_DPAD_UP:
@@ -8400,9 +8383,8 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
case KeyEvent.KEYCODE_TAB:
if (event.hasNoModifiers() || event.hasModifiers(KeyEvent.META_SHIFT_ON)) {
if (shouldAdvanceFocusOnTab()) {
return KEY_EVENT_NOT_HANDLED;
}
// Tab is used to move focus.
return KEY_EVENT_NOT_HANDLED;
}
break;