DO NOT SUBMIT: Fix input action type for Android

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 27 matching lines @@
         outAttrs.imeOptions = EditorInfo.IME_FLAG_NO_FULLSCREEN | EditorInfo.IME_FLAG_NO_EXTRACT_UI;
         outAttrs.inputType =
                 EditorInfo.TYPE_CLASS_TEXT | EditorInfo.TYPE_TEXT_VARIATION_WEB_EDIT_TEXT;
 
         if ((inputFlags & WebTextInputFlags.AutocompleteOff) != 0) {
             outAttrs.inputType |= EditorInfo.TYPE_TEXT_FLAG_NO_SUGGESTIONS;
         }
 
         if (inputType == TextInputType.TEXT) {
             // Normal text field
-            outAttrs.imeOptions |= EditorInfo.IME_ACTION_GO;
             if ((inputFlags & WebTextInputFlags.AutocorrectOff) == 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.AutocorrectOff) == 0) {
                 outAttrs.inputType |= EditorInfo.TYPE_TEXT_FLAG_AUTO_CORRECT;
             }
-            outAttrs.imeOptions |= EditorInfo.IME_ACTION_NONE;
         } else if (inputType == TextInputType.PASSWORD) {
             outAttrs.inputType =
                     InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_WEB_PASSWORD;
-            outAttrs.imeOptions |= EditorInfo.IME_ACTION_GO;
         } else if (inputType == TextInputType.SEARCH) {
-            outAttrs.imeOptions |= EditorInfo.IME_ACTION_SEARCH;
         } else if (inputType == TextInputType.URL) {
             outAttrs.inputType = InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_URI;
-            outAttrs.imeOptions |= EditorInfo.IME_ACTION_GO;
         } else if (inputType == TextInputType.EMAIL) {
             // Email
             outAttrs.inputType =
                     InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_WEB_EMAIL_ADDRESS;
-            outAttrs.imeOptions |= 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;
-            outAttrs.imeOptions |= 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;
-            outAttrs.imeOptions |= EditorInfo.IME_ACTION_NEXT;
         }
 
         // 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.AutocapitalizeCharacters) != 0) {
             outAttrs.inputType |= InputType.TYPE_TEXT_FLAG_CAP_CHARACTERS;
         } else if ((inputFlags & WebTextInputFlags.AutocapitalizeWords) != 0) {
             outAttrs.inputType |= InputType.TYPE_TEXT_FLAG_CAP_WORDS;
         } else if ((inputFlags & WebTextInputFlags.AutocapitalizeSentences) != 0) {
             outAttrs.inputType |= InputType.TYPE_TEXT_FLAG_CAP_SENTENCES;
         }
         // Content editable doesn't use autocapitalize so we need to set it manually.
         if (inputType == TextInputType.CONTENT_EDITABLE) {
             outAttrs.inputType |= InputType.TYPE_TEXT_FLAG_CAP_SENTENCES;
         }
 
+        if (inputType == TextInputType.SEARCH) {
+            outAttrs.imeOptions |= EditorInfo.IME_ACTION_SEARCH;
+        } else if ((inputFlags & WebTextInputFlags.ActionNone) != 0) {
+            outAttrs.imeOptions |= EditorInfo.IME_ACTION_NONE;
+        } else if ((inputFlags & WebTextInputFlags.ActionNext) != 0) {
+            outAttrs.imeOptions |= EditorInfo.IME_ACTION_NEXT;
+        } else if ((inputFlags & WebTextInputFlags.ActionGo) != 0) {
+            outAttrs.imeOptions |= EditorInfo.IME_ACTION_GO;
+        }
+
         outAttrs.initialSelStart = initialSelStart;
         outAttrs.initialSelEnd = initialSelEnd;
     }
 
     /**
      * @param editorInfo The EditorInfo
      * @return Debug string for the given {@EditorInfo}.
      */
     static String getEditorInfoDebugString(EditorInfo editorInfo) {
         StringBuilder builder = new StringBuilder();
@@ skipping 40 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());
     }
 }