diff options
Diffstat (limited to 'core/java/android/widget/TextView.java')
| -rw-r--r-- | core/java/android/widget/TextView.java | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java index f3243aaf5b7d..ec4b7f9acab3 100644 --- a/core/java/android/widget/TextView.java +++ b/core/java/android/widget/TextView.java @@ -11763,13 +11763,8 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener if (isTextEditable() && isFocused()) { CharSequence imeActionLabel = mContext.getResources().getString( com.android.internal.R.string.keyboardview_keycode_enter); - if (getImeActionId() != 0 && getImeActionLabel() != null) { + if (getImeActionLabel() != null) { imeActionLabel = getImeActionLabel(); - final int imeActionId = getImeActionId(); - // put ime action id into the extra data with ACTION_ARGUMENT_IME_ACTION_ID_INT. - final Bundle argument = info.getExtras(); - argument.putInt(AccessibilityNodeInfo.ACTION_ARGUMENT_IME_ACTION_ID_INT, - imeActionId); } AccessibilityNodeInfo.AccessibilityAction action = new AccessibilityNodeInfo.AccessibilityAction( @@ -12100,13 +12095,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener } return true; case R.id.accessibilityActionImeEnter: { if (isFocused() && isTextEditable()) { - final int imeActionId = (arguments != null) ? arguments.getInt( - AccessibilityNodeInfo.ACTION_ARGUMENT_IME_ACTION_ID_INT, - EditorInfo.IME_ACTION_UNSPECIFIED) - : EditorInfo.IME_ACTION_UNSPECIFIED; - if (imeActionId == getImeActionId()) { - onEditorAction(imeActionId); - } + onEditorAction(getImeActionId()); } } return true; default: { |