Send correct key-codes when doing composition events instead of always 0.

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 106 matching lines @@
     static int sModifierCapsLockOn;
     static int sModifierNumLockOn;
 
     private long mNativeImeAdapterAndroid;
     private InputMethodManagerWrapper mInputMethodManagerWrapper;
     private AdapterInputConnection mInputConnection;
     private final ImeAdapterDelegate mViewEmbedder;
     private final Handler mHandler;
     private DelayedDismissInput mDismissInput = null;
     private int mTextInputType;
+    private String mLastComposeText;
+
+    @VisibleForTesting
+    int mLastComposeKeyCode;
 
     @VisibleForTesting
     boolean mIsShowWithoutHideOutstanding = false;
 
     /**
      * @param wrapper InputMethodManagerWrapper that should receive all the call directed to
      *                InputMethodManager.
      * @param embedder The view that is used for callbacks from ImeAdapter.
      */
     public ImeAdapter(InputMethodManagerWrapper wrapper, ImeAdapterDelegate embedder) {
@@ skipping 173 matching lines @@
     }
 
     private int shouldSendKeyEventWithKeyCode(String text) {
         if (text.length() != 1) return COMPOSITION_KEY_CODE;
 
         if (text.equals("\n")) return KeyEvent.KEYCODE_ENTER;
         else if (text.equals("\t")) return KeyEvent.KEYCODE_TAB;
         else return COMPOSITION_KEY_CODE;
     }
 
+    private int androidKeyCodeForCharacter(char chr) {
+        // This is currently only called for letters due to the nature of
+        // composition on Android.
+        switch (chr) {
+        case 'A':
+        case 'a':
+            return KeyEvent.KEYCODE_A;
+        case 'B':
+        case 'b':
+            return KeyEvent.KEYCODE_B;
+        case 'C':
+        case 'c':
+            return KeyEvent.KEYCODE_C;
+        case 'D':
+        case 'd':
+            return KeyEvent.KEYCODE_D;
+        case 'E':
+        case 'e':
+            return KeyEvent.KEYCODE_E;
+        case 'F':
+        case 'f':
+            return KeyEvent.KEYCODE_F;
+        case 'G':
+        case 'g':
+            return KeyEvent.KEYCODE_G;
+        case 'H':
+        case 'h':
+            return KeyEvent.KEYCODE_H;
+        case 'I':
+        case 'i':
+            return KeyEvent.KEYCODE_I;
+        case 'J':
+        case 'j':
+            return KeyEvent.KEYCODE_J;
+        case 'K':
+        case 'k':
+            return KeyEvent.KEYCODE_K;
+        case 'L':
+        case 'l':
+            return KeyEvent.KEYCODE_L;
+        case 'M':
+        case 'm':
+            return KeyEvent.KEYCODE_M;
+        case 'N':
+        case 'n':
+            return KeyEvent.KEYCODE_N;
+        case 'O':
+        case 'o':
+            return KeyEvent.KEYCODE_O;
+        case 'P':
+        case 'p':
+            return KeyEvent.KEYCODE_P;
+        case 'Q':
+        case 'q':
+            return KeyEvent.KEYCODE_Q;
+        case 'R':
+        case 'r':
+            return KeyEvent.KEYCODE_R;
+        case 'S':
+        case 's':
+            return KeyEvent.KEYCODE_S;
+        case 'T':
+        case 't':
+            return KeyEvent.KEYCODE_T;
+        case 'U':
+        case 'u':
+            return KeyEvent.KEYCODE_U;
+        case 'V':
+        case 'v':
+            return KeyEvent.KEYCODE_V;
+        case 'W':
+        case 'w':
+            return KeyEvent.KEYCODE_W;
+        case 'X':
+        case 'x':
+            return KeyEvent.KEYCODE_X;
+        case 'Y':
+        case 'y':
+            return KeyEvent.KEYCODE_Y;
+        case 'Z':
+        case 'z':
+            return KeyEvent.KEYCODE_Z;
+
+        default:
+            return 0;
+        }
+    }
+
     void sendKeyEventWithKeyCode(int keyCode, int flags) {
         long eventTime = SystemClock.uptimeMillis();
         translateAndSendNativeEvents(new KeyEvent(eventTime, eventTime,
                 KeyEvent.ACTION_DOWN, keyCode, 0, 0,
                 KeyCharacterMap.VIRTUAL_KEYBOARD, 0,
                 flags));
         translateAndSendNativeEvents(new KeyEvent(SystemClock.uptimeMillis(), eventTime,
                 KeyEvent.ACTION_UP, keyCode, 0, 0,
                 KeyCharacterMap.VIRTUAL_KEYBOARD, 0,
                 flags));
     }
 
     // Calls from Java to C++
 
     boolean checkCompositionQueueAndCallNative(CharSequence text, int newCursorPosition,
             boolean isCommit) {
         if (mNativeImeAdapterAndroid == 0) return false;
         String textStr = text.toString();
 
         // Committing an empty string finishes the current composition.
         boolean isFinish = textStr.isEmpty();
         mViewEmbedder.onImeEvent(isFinish);
         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 {
+            if (mLastComposeText == null) {
+                if (textStr.length() == 1)
+                    keyCode = androidKeyCodeForCharacter(textStr.charAt(0));

[aurimas (slooooooooow), 2014/07/07 17:05:20]

Android already has tools to convert characters to KeyEvents. See an example of
what the old WebView used to do here:
https://android.googlesource.com/platform/frameworks/base/+/435e6f5/core/java...

[bcwhite, 2014/07/08 18:56:03]

A little convoluted what with creating the event and then extracting the
key-code just to create another event with it.

But done.

[jdduke (slow), 2014/07/08 19:53:54]

Hmm, should we be using that function even though it's been deprecated for some
time? The comments for the function are a bit scary:
"This function is primarily offered for instrumentation and testing purposes."
"It may fail to map characters to key codes."
"For robust text entry, do not use this function."

+            } else {
+                if (textStr.length() == mLastComposeText.length() + 1)
+                    keyCode = androidKeyCodeForCharacter(textStr.charAt(textStr.length() - 1));
+                else if (textStr.length() == mLastComposeText.length() - 1)
+                    keyCode = KeyEvent.KEYCODE_DEL;
+            }

[guohui, 2014/07/04 21:56:13]

we can get more accurate results if you check both the length and the content.

+            mLastComposeText = textStr;
+            mLastComposeKeyCode = keyCode;
+
             nativeSendSyntheticKeyEvent(mNativeImeAdapterAndroid, sEventTypeRawKeyDown,
                     timeStampMs, keyCode, 0);
             if (isCommit) {
                 nativeCommitText(mNativeImeAdapterAndroid, textStr);
             } else {
                 nativeSetComposingText(mNativeImeAdapterAndroid, text, textStr, newCursorPosition);
             }
             nativeSendSyntheticKeyEvent(mNativeImeAdapterAndroid, sEventTypeKeyUp,
                     timeStampMs, keyCode, 0);
         }
 
         return true;
     }
 
     void finishComposingText() {
         if (mNativeImeAdapterAndroid == 0) return;
+        mLastComposeText = null;
         nativeFinishComposingText(mNativeImeAdapterAndroid);
     }
 
     boolean translateAndSendNativeEvents(KeyEvent event) {
         if (mNativeImeAdapterAndroid == 0) return false;
 
         int action = event.getAction();
         if (action != KeyEvent.ACTION_DOWN &&
             action != KeyEvent.ACTION_UP) {
             // action == KeyEvent.ACTION_MULTIPLE
@@ skipping 171 matching lines @@
             } else if (span instanceof UnderlineSpan) {
                 nativeAppendUnderlineSpan(underlines, spannableString.getSpanStart(span),
                         spannableString.getSpanEnd(span));
             }
         }
     }
 
     @CalledByNative
     private void cancelComposition() {
         if (mInputConnection != null) mInputConnection.restartInput();
+        mLastComposeText = null;
     }
 
     @CalledByNative
     void detach() {
         if (mDismissInput != null) mHandler.removeCallbacks(mDismissInput);
         mNativeImeAdapterAndroid = 0;
         mTextInputType = 0;
     }
 
     private native boolean nativeSendSyntheticKeyEvent(long nativeImeAdapterAndroid,
@@ skipping 25 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);
 }