From 6704abbc66942c6318f229d4b34f1444f7d27d8b Mon Sep 17 00:00:00 2001
From: Vladimir Enchev <vladimir.enchev@telerik.com>
Date: Wed, 9 Mar 2016 11:58:29 +0200
Subject: [PATCH] TextField returnPress event will be raised if event KeyCode
 is ENTER

---
 ui/editable-text-base/editable-text-base.android.ts | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/ui/editable-text-base/editable-text-base.android.ts b/ui/editable-text-base/editable-text-base.android.ts
index eca950091..b24c23cca 100644
--- a/ui/editable-text-base/editable-text-base.android.ts
+++ b/ui/editable-text-base/editable-text-base.android.ts
@@ -84,15 +84,9 @@ export class EditableTextBase extends common.EditableTextBase {
         var editorActionListener = new android.widget.TextView.OnEditorActionListener({
             onEditorAction: function (textView: android.widget.TextView, actionId: number, event: android.view.KeyEvent): boolean {
                 var owner = that.get();
-                if (owner) {
-                    if (actionId === android.view.inputmethod.EditorInfo.IME_ACTION_DONE ||
-                        actionId === android.view.inputmethod.EditorInfo.IME_ACTION_GO ||
-                        actionId === android.view.inputmethod.EditorInfo.IME_ACTION_SEARCH ||
-                        actionId === android.view.inputmethod.EditorInfo.IME_ACTION_SEND ||
-                        actionId === android.view.inputmethod.EditorInfo.IME_ACTION_NEXT) {
-                        owner.dismissSoftInput();
-                        owner._onReturnPress();
-                    }
+                if (owner && event.getKeyCode() === android.view.KeyEvent.KEYCODE_ENTER) {
+                      owner.dismissSoftInput();
+                      owner._onReturnPress();
                 }
 
                 return false;