Revert of [Android] Adding Smart GO/NEXT feature in Chrome

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

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.content.browser.input;
 
 import android.text.Editable;
 import android.text.InputType;
 import android.text.Selection;
 import android.util.StringBuilderPrinter;
@@ skipping 30 matching lines @@
                 EditorInfo.TYPE_CLASS_TEXT | EditorInfo.TYPE_TEXT_VARIATION_WEB_EDIT_TEXT;
 
         if ((inputFlags & WebTextInputFlags.AUTOCOMPLETE_OFF) != 0) {
             outAttrs.inputType |= EditorInfo.TYPE_TEXT_FLAG_NO_SUGGESTIONS;
         }
 
         int imeAction = 0;
         if (inputMode == WebTextInputMode.DEFAULT) {
             if (inputType == TextInputType.TEXT) {
                 // Normal text field
+                imeAction = EditorInfo.IME_ACTION_GO;
                 if ((inputFlags & WebTextInputFlags.AUTOCORRECT_OFF) == 0) {
                     outAttrs.inputType |= EditorInfo.TYPE_TEXT_FLAG_AUTO_CORRECT;
                 }
             } else if (inputType == TextInputType.TEXT_AREA
                     || inputType == TextInputType.CONTENT_EDITABLE) {
                 outAttrs.inputType |= EditorInfo.TYPE_TEXT_FLAG_MULTI_LINE;
                 if ((inputFlags & WebTextInputFlags.AUTOCORRECT_OFF) == 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) {
                 default:
                 case WebTextInputMode.DEFAULT:
                 case WebTextInputMode.VERBATIM:
                 case WebTextInputMode.LATIN:
                 case WebTextInputMode.LATIN_NAME:
                 case WebTextInputMode.LATIN_PROSE:
                 case WebTextInputMode.FULL_WIDTH_LATIN:
                 case WebTextInputMode.KANA:
                 case WebTextInputMode.KANA_NAME:
                 case WebTextInputMode.KATA_KANA:
                     outAttrs.inputType |= EditorInfo.TYPE_TEXT_FLAG_MULTI_LINE;
                     if ((inputFlags & WebTextInputFlags.AUTOCORRECT_OFF) == 0) {
                         outAttrs.inputType |= EditorInfo.TYPE_TEXT_FLAG_AUTO_CORRECT;
                     }
+                    imeAction = EditorInfo.IME_ACTION_NONE;
                     break;
                 case WebTextInputMode.NUMERIC:
                     outAttrs.inputType =
                             InputType.TYPE_CLASS_NUMBER | InputType.TYPE_NUMBER_VARIATION_NORMAL;
+                    imeAction = EditorInfo.IME_ACTION_NEXT;
                     break;
                 case WebTextInputMode.TEL:
                     outAttrs.inputType = InputType.TYPE_CLASS_PHONE;
+                    imeAction = EditorInfo.IME_ACTION_NEXT;
                     break;
                 case WebTextInputMode.EMAIL:
                     outAttrs.inputType = InputType.TYPE_CLASS_TEXT
                             | InputType.TYPE_TEXT_VARIATION_WEB_EMAIL_ADDRESS;
+                    imeAction = EditorInfo.IME_ACTION_GO;
                     break;
                 case WebTextInputMode.URL:
                     outAttrs.inputType =
                             InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_URI;
+                    imeAction = EditorInfo.IME_ACTION_NEXT;
                     break;
             }
         }
 
-        if (inputMode == WebTextInputMode.DEFAULT && inputType == TextInputType.SEARCH) {
-            imeAction |= EditorInfo.IME_ACTION_SEARCH;
-        } else if ((outAttrs.inputType & EditorInfo.TYPE_TEXT_FLAG_MULTI_LINE) != 0) {
-            // For textarea that sends you to another webpage on enter key press using
-            // JavaScript, we will only show ENTER.
-            imeAction |= EditorInfo.IME_ACTION_NONE;
-        } else if ((inputFlags & WebTextInputFlags.HAVE_NEXT_FOCUSABLE_ELEMENT) != 0) {
-            imeAction |= EditorInfo.IME_ACTION_NEXT;
-        } else {
-            // For last element inside form, we should give preference to GO key as PREVIOUS
-            // has less importance in those cases.
-            imeAction |= EditorInfo.IME_ACTION_GO;
-        }
-
         outAttrs.imeOptions |= imeAction;
-
         // 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.
         // Autocapitalize is meant as a hint to the virtual keyboard.
         if ((inputFlags & WebTextInputFlags.AUTOCAPITALIZE_CHARACTERS) != 0) {
             outAttrs.inputType |= InputType.TYPE_TEXT_FLAG_CAP_CHARACTERS;
         } else if ((inputFlags & WebTextInputFlags.AUTOCAPITALIZE_WORDS) != 0) {
             outAttrs.inputType |= InputType.TYPE_TEXT_FLAG_CAP_WORDS;
         } else if ((inputFlags & WebTextInputFlags.AUTOCAPITALIZE_SENTENCES) != 0) {
             outAttrs.inputType |= InputType.TYPE_TEXT_FLAG_CAP_SENTENCES;
@@ skipping 56 matching lines @@
         if (!condition) throw new AssertionError(msg);
     }
 
     /**
      * Check that the current thread is UI thread, and raise an error if it is not.
      */
     static void checkOnUiThread() {
         checkCondition("Should be on UI thread.", ThreadUtils.runningOnUiThread());
     }
 }