[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 401 matching lines @@
         mViewEmbedder.onImeEvent();
 
         String textStr = text.toString();
         int keyCode = shouldSendKeyEventWithKeyCode(textStr);
         long timeStampMs = SystemClock.uptimeMillis();
 
         if (keyCode != COMPOSITION_KEY_CODE) {
             sendKeyEventWithKeyCode(keyCode,
                     KeyEvent.FLAG_SOFT_KEYBOARD | KeyEvent.FLAG_KEEP_TOUCH_MODE);
         } else {
-            KeyEvent keyEvent = getTypedKeyEventGuess(mLastComposeText, textStr);
             int modifiers = 0;

[James Su, 2015/01/12 11:08:02]

This variable is not necessary, as it'll always be 0 when reaching the code
referencing it.

[huangs, 2015/01/12 18:45:48]

Done.

-            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
-            // composition below.
-            if (keyCode > 0 && isCommit && mLastComposeText == null) {
-                mLastSyntheticKeyCode = keyCode;
-                return translateAndSendNativeEvents(keyEvent, 0)
-                        && translateAndSendNativeEvents(
-                                KeyEvent.changeAction(keyEvent, KeyEvent.ACTION_UP), 0);
+            // Handle single-character commits where the character is recognizable as keyCode.
+            if (isCommit && mLastComposeText == null && textStr.length() == 1) {
+                KeyEvent keyEvent = getTypedKeyEventGuess(mLastComposeText, textStr);

[huangs, 2015/01/12 09:53:17]

Note that we can in fact replace this line with

KeyEvent keyEvent = androidKeyEventForCharacter(textStr.charAt(0))

and then remove getTypedKeyEventGuess() + test. However, I want to make the
delta small for the Beta merge.

+                if (keyEvent != null) {
+                    modifiers = getModifiers(keyEvent.getMetaState());
+                    mLastSyntheticKeyCode = keyCode;
+                    return translateAndSendNativeEvents(keyEvent, 0)
+                            && translateAndSendNativeEvents(
+                                    KeyEvent.changeAction(keyEvent, KeyEvent.ACTION_UP), 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.
             //
             // An alternative is to *not* call nativeSetComposingText() in the non-commit case
             // below.  This avoids the restart of composition described above but fails to send
             // an update to the composition while in composition which, strictly speaking,
             // does not match the spec.
             //
             // For now, the solution is to endure the restarting of composition and only dive
             // into the alternate solution should there be problems in the field.  --bcwhite
 
             if (keyCode >= 0) {
                 nativeSendSyntheticKeyEvent(mNativeImeAdapterAndroid, sEventTypeRawKeyDown,
                         timeStampMs, keyCode, modifiers, 0);

[James Su, 2015/01/12 11:08:02]

modifiers is always 0.

[huangs, 2015/01/12 18:45:48]

Done.

             }
 
             if (isCommit) {
                 nativeCommitText(mNativeImeAdapterAndroid, textStr);
                 textStr = null;
             } else {
                 nativeSetComposingText(mNativeImeAdapterAndroid, text, textStr, newCursorPosition);
             }
 
             if (keyCode >= 0) {
                 nativeSendSyntheticKeyEvent(mNativeImeAdapterAndroid, sEventTypeKeyUp,
                         timeStampMs, keyCode, modifiers, 0);

[James Su, 2015/01/12 11:08:02]

ditto

[huangs, 2015/01/12 18:45:48]

Done.

             }
 
             mLastSyntheticKeyCode = keyCode;
         }
 
         mLastComposeText = textStr;
         return true;
     }
 
     void finishComposingText() {
@@ skipping 224 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);
 }