Implementation of Smart GO NEXT feature in Android Chrome

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

 // Copyright 2013 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.os.SystemClock;
 import android.text.Editable;
 import android.text.InputType;
 import android.text.Selection;
@@ skipping 59 matching lines @@
                 | EditorInfo.TYPE_TEXT_VARIATION_WEB_EDIT_TEXT;
 
         int inputType = imeAdapter.getTextInputType();
         int inputFlags = imeAdapter.getTextInputFlags();
         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;
             mSingleLine = false;
         } else if (inputType == TextInputType.PASSWORD) {
             // Password
             outAttrs.inputType = InputType.TYPE_CLASS_TEXT
                     | InputType.TYPE_TEXT_VARIATION_WEB_PASSWORD;
-            outAttrs.imeOptions |= EditorInfo.IME_ACTION_GO;
         } else if (inputType == TextInputType.SEARCH) {
             // Search
             outAttrs.imeOptions |= EditorInfo.IME_ACTION_SEARCH;
         } else if (inputType == TextInputType.URL) {
             // 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;
+        }
+
+        boolean haveNextInput = false;
+        if ((inputFlags & WebTextInputFlags.HaveNextFocusableElement) != 0) {
             outAttrs.imeOptions |= EditorInfo.IME_ACTION_NEXT;
+            haveNextInput = true;
+        }
+        if ((inputFlags & WebTextInputFlags.HavePreviousFocusableElement) != 0) {
+            outAttrs.imeOptions |= EditorInfo.IME_ACTION_PREVIOUS;
+        }
+        if (mSingleLine && (inputFlags & WebTextInputFlags.ListeningToKeyboardEvents) == 0) {
+            // TODO(AKV) Find an option to remove Enter Key from IME
+            if (!haveNextInput) outAttrs.imeOptions |= EditorInfo.IME_ACTION_GO;
         }
 
         // 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;
@@ skipping 142 matching lines @@
         return mImeAdapter.checkCompositionQueueAndCallNative(text, newCursorPosition,
                 text.length() > 0);
     }
 
     /**
      * @see BaseInputConnection#performEditorAction(int)
      */
     @Override
     public boolean performEditorAction(int actionCode) {
         if (DEBUG) Log.w(TAG, "performEditorAction [" + actionCode + "]");
-        if (actionCode == EditorInfo.IME_ACTION_NEXT) {
-            restartInput();
-            // Send TAB key event
-            long timeStampMs = SystemClock.uptimeMillis();
-            mImeAdapter.sendSyntheticKeyEvent(
-                    WebInputEventType.RawKeyDown, timeStampMs, KeyEvent.KEYCODE_TAB, 0, 0);
-        } else {
-            mImeAdapter.sendKeyEventWithKeyCode(KeyEvent.KEYCODE_ENTER,
-                    KeyEvent.FLAG_SOFT_KEYBOARD | KeyEvent.FLAG_KEEP_TOUCH_MODE
-                    | KeyEvent.FLAG_EDITOR_ACTION);
+        switch (actionCode) {
+            case EditorInfo.IME_ACTION_NEXT:
+                restartInput();
+                mImeAdapter.advanceFocusToNextFormControl(true);
+                break;
+            case EditorInfo.IME_ACTION_PREVIOUS:
+                restartInput();
+                mImeAdapter.advanceFocusToNextFormControl(false);
+                break;
+            default:
+                mImeAdapter.sendKeyEventWithKeyCode(
+                        KeyEvent.KEYCODE_ENTER, KeyEvent.FLAG_SOFT_KEYBOARD
+                                | KeyEvent.FLAG_KEEP_TOUCH_MODE | KeyEvent.FLAG_EDITOR_ACTION);
+                break;
         }
         return true;
     }
 
     /**
      * @see BaseInputConnection#performContextMenuAction(int)
      */
     @Override
     public boolean performContextMenuAction(int id) {
         if (DEBUG) Log.w(TAG, "performContextMenuAction [" + id + "]");
@@ skipping 318 matching lines @@
     @VisibleForTesting
     ImeState getImeStateForTesting() {
         String text = mEditable.toString();
         int selectionStart = Selection.getSelectionStart(mEditable);
         int selectionEnd = Selection.getSelectionEnd(mEditable);
         int compositionStart = getComposingSpanStart(mEditable);
         int compositionEnd = getComposingSpanEnd(mEditable);
         return new ImeState(text, selectionStart, selectionEnd, compositionStart, compositionEnd);
     }
 }