[Android] Adding Smart GO/NEXT feature in Chrome

content/public/android/java/src/org/chromium/content/browser/input/ImeUtils.java

Index: content/public/android/java/src/org/chromium/content/browser/input/ImeUtils.java
diff --git a/content/public/android/java/src/org/chromium/content/browser/input/ImeUtils.java b/content/public/android/java/src/org/chromium/content/browser/input/ImeUtils.java
index 8d44066f49df260b529a4af8fdc6d3f90b2c664b..9b022252d09d1944ced433f64c0b7e1664d53706 100644
--- a/content/public/android/java/src/org/chromium/content/browser/input/ImeUtils.java
+++ b/content/public/android/java/src/org/chromium/content/browser/input/ImeUtils.java
@@ -49,7 +49,6 @@ public class ImeUtils {
         if (inputMode == WebTextInputMode.kDefault) {
             if (inputType == TextInputType.TEXT) {
                 // Normal text field
-                imeAction = EditorInfo.IME_ACTION_GO;
                 if ((inputFlags & WebTextInputFlags.AutocorrectOff) == 0) {
                     outAttrs.inputType |= EditorInfo.TYPE_TEXT_FLAG_AUTO_CORRECT;
                 }
@@ -59,33 +58,27 @@ public class ImeUtils {
                 if ((inputFlags & WebTextInputFlags.AutocorrectOff) == 0) {
                     outAttrs.inputType |= EditorInfo.TYPE_TEXT_FLAG_AUTO_CORRECT;
                 }
-                imeAction = EditorInfo.IME_ACTION_NONE;
             } else if (inputType == TextInputType.PASSWORD) {
                 outAttrs.inputType =
                         InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_WEB_PASSWORD;
-                imeAction = EditorInfo.IME_ACTION_GO;
             } else if (inputType == TextInputType.SEARCH) {
                 imeAction = EditorInfo.IME_ACTION_SEARCH;
             } else if (inputType == TextInputType.URL) {
                 outAttrs.inputType = InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_URI;
-                imeAction = EditorInfo.IME_ACTION_GO;
             } else if (inputType == TextInputType.EMAIL) {
                 // Email
                 outAttrs.inputType =
                         InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_WEB_EMAIL_ADDRESS;
-                imeAction = EditorInfo.IME_ACTION_GO;
             } else if (inputType == TextInputType.TELEPHONE) {
                 // Telephone
                 // Number and telephone do not have both a Tab key and an
                 // action in default OSK, so set the action to NEXT
                 outAttrs.inputType = InputType.TYPE_CLASS_PHONE;
-                imeAction = EditorInfo.IME_ACTION_NEXT;
             } else if (inputType == TextInputType.NUMBER) {
                 // Number
                 outAttrs.inputType = InputType.TYPE_CLASS_NUMBER
                         | InputType.TYPE_NUMBER_VARIATION_NORMAL
                         | InputType.TYPE_NUMBER_FLAG_DECIMAL;
-                imeAction = EditorInfo.IME_ACTION_NEXT;
             }
         } else {
             switch (inputMode) {
@@ -128,6 +121,34 @@ public class ImeUtils {
         }
 
         outAttrs.imeOptions |= imeAction;
+
+        boolean enterKeyAction = false;
+        // For multiline text or any text input with key event listeners, Enter key is needed.
+        if (((outAttrs.inputType & EditorInfo.TYPE_TEXT_FLAG_MULTI_LINE)
+                    == EditorInfo.TYPE_TEXT_FLAG_MULTI_LINE)
+                || (inputFlags & WebTextInputFlags.ListeningToKeyboardEvents) != 0) {
+            // TODO(ajith.v) Find an option to remove Enter Key from IME (assume by default
+            // ENTER key is shown)
+            // TODO(ajith.v) For text area with implicit form submission how do we handle,
+            // we need to show both GO and ENTER key at same time.
+            outAttrs.imeOptions |= EditorInfo.IME_ACTION_GO;
+            enterKeyAction = true;
+        }
+
+        boolean nextKeyAction = false;
+        // If ENTER key is already applied, then don't apply NEXT as it can result display issues in
+        // IME
+        if (!enterKeyAction && (inputFlags & WebTextInputFlags.HaveNextFocusableElement) != 0) {
+            outAttrs.imeOptions |= EditorInfo.IME_ACTION_NEXT;
+            nextKeyAction = true;
+        }
+        // If ENTER/NEXT key is already applied, then don't apply PREVIOUS as it can result display
+        // issues in IME
+        if (!enterKeyAction && !nextKeyAction
+                && (inputFlags & WebTextInputFlags.HavePreviousFocusableElement) != 0) {
+            outAttrs.imeOptions |= EditorInfo.IME_ACTION_PREVIOUS;
+        }
+
         // Handling of autocapitalize. Blink will send the flag taking into account the element's
         // type. This is not using AutocapitalizeNone because Android does not autocapitalize by
         // default and there is no way to express no capitalization.