From 2c8d57deaff921821e24168135daf90b89502df8 Mon Sep 17 00:00:00 2001
From: Vladimir Enchev <vladimir.enchev@telerik.com>
Date: Fri, 11 Mar 2016 15:30:16 +0200
Subject: [PATCH] returnPress event fixed

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

diff --git a/ui/editable-text-base/editable-text-base.android.ts b/ui/editable-text-base/editable-text-base.android.ts
index b24c23cca..e94d502d4 100644
--- a/ui/editable-text-base/editable-text-base.android.ts
+++ b/ui/editable-text-base/editable-text-base.android.ts
@@ -84,9 +84,18 @@ 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 && event.getKeyCode() === android.view.KeyEvent.KEYCODE_ENTER) {
-                      owner.dismissSoftInput();
-                      owner._onReturnPress();
+                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();
+                    }
+                    
+                    if (event && event.getKeyCode() === android.view.KeyEvent.KEYCODE_ENTER) {
+                        owner._onReturnPress();
+                    }
                 }
 
                 return false;