[Clank IME] Make keyCode detection sensitive to autocomplete=on|off.

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

 // Copyright 2012 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.Handler;
 import android.os.ResultReceiver;
 import android.os.SystemClock;
 import android.text.Editable;
@@ skipping 412 matching lines @@
             int modifiers = 0;
             if (keyEvent != null) {
                 keyCode = keyEvent.getKeyCode();
                 modifiers = getModifiers(keyEvent.getMetaState());
             } else if (!textStr.equals(mLastComposeText)) {
                 keyCode = KeyEvent.KEYCODE_UNKNOWN;
             } else {
                 keyCode = -1;
             }
 
-            // If this is a commit with no previous composition, then treat it as a native
-            // KeyDown/KeyUp pair with no composition rather than a synthetic pair with
+            // If this is a single-character commit with no previous composition, then treat it as
+            // a native KeyDown/KeyUp pair with no composition rather than a synthetic pair with
             // composition below.
-            if (keyCode > 0 && isCommit && mLastComposeText == null) {
+            if (keyCode > 0 && isCommit && mLastComposeText == null && textStr.length() == 1) {
                 mLastSyntheticKeyCode = keyCode;
                 return translateAndSendNativeEvents(keyEvent, 0)
                         && translateAndSendNativeEvents(
                                 KeyEvent.changeAction(keyEvent, KeyEvent.ACTION_UP), 0);
             }
 
+            // FIXME: Use WebTextInputFlags.AutocompleteOff. We need this hack to enable merge into

[bcwhite, 2015/01/13 15:32:08]

Dev should have used WebTextInputFlags.AutocompleteOFf and the merge to beta
used sTextInputFlagAutocompleteOff.

+            // into Beta to fix http://crbug.com/422685 .
+            final int textInputFlagAutocompleteOff = 1 << 1;
+
+            // If we do not have autocomplete=off, then always send compose events rather than a
+            // guessed keyCode. This addresses http://crbug.com/422685 .
+            if ((mTextInputFlags & textInputFlagAutocompleteOff) == 0) {
+                keyCode = COMPOSITION_KEY_CODE;
+                modifiers = 0;
+            }
+
             // When typing, there is no issue sending KeyDown and KeyUp events around the
             // composition event because those key events do nothing (other than call JS
             // handlers).  Typing does not cause changes outside of a KeyPress event which
             // we don't call here.  However, if the key-code is a control key such as
             // KEYCODE_DEL then there never is an associated KeyPress event and the KeyDown
             // event itself causes the action.  The net result below is that the Renderer calls
             // cancelComposition() and then Android starts anew with setComposingRegion().
             // This stopping and restarting of composition could be a source of problems
             // with 3rd party keyboards.
             //
@@ skipping 257 matching lines @@
     private native void nativeDeleteSurroundingText(long nativeImeAdapterAndroid,
             int before, int after);
 
     private native void nativeUnselect(long nativeImeAdapterAndroid);
     private native void nativeSelectAll(long nativeImeAdapterAndroid);
     private native void nativeCut(long nativeImeAdapterAndroid);
     private native void nativeCopy(long nativeImeAdapterAndroid);
     private native void nativePaste(long nativeImeAdapterAndroid);
     private native void nativeResetImeAdapter(long nativeImeAdapterAndroid);
 }