Split Date/Time picker values from IME processing since date/time related form values have been com…

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

 // Copyright (c) 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;
 
 import android.content.Context;
 import android.os.Handler;
 import android.os.ResultReceiver;
 import android.text.Editable;
 import android.text.InputType;
 import android.text.Selection;
 import android.view.KeyEvent;
 import android.view.View;
 import android.view.inputmethod.BaseInputConnection;
 import android.view.inputmethod.EditorInfo;
 import android.view.inputmethod.ExtractedText;
 import android.view.inputmethod.ExtractedTextRequest;
 import android.view.inputmethod.InputMethodManager;
 
 import org.chromium.base.CalledByNative;
 import org.chromium.base.JNINamespace;
 
-// We have to adapt and plumb android IME service and chrome text input API.
-// ImeAdapter provides an interface in both ways native <-> java:
-// 1. InputConnectionAdapter notifies native code of text composition state and
-//    dispatch key events from java -> WebKit.
-// 2. Native ImeAdapter notifies java side to clear composition text.
-//
-// The basic flow is:
-// 1. Intercept dispatchKeyEventPreIme() to record the current key event, but do
-//    nothing else.
-// 2. When InputConnectionAdapter gets called with composition or result text:
-//    a) If a key event has been recorded in dispatchKeyEventPreIme() and we
-//       receive a result text with single character, then we probably need to
-//       send the result text as a Char event rather than a ConfirmComposition
-//       event. So we need to dispatch the recorded key event followed by a
-//       synthetic Char event.
-//    b) If we receive a composition text or a result text with more than one
-//       characters, then no matter if we recorded a key event or not in
-//       dispatchKeyEventPreIme(), we just need to dispatch a synthetic key
-//       event with special keycode 229, and then dispatch the composition or
-//       result text.
-// 3. Intercept dispatchKeyEvent() method for key events not handled by IME, we
-//    need to dispatch them to webkit and check webkit's reply. Then inject a
-//    new key event for further processing if webkit didn't handle it.
+/**
+ We have to adapt and plumb android IME service and chrome text input API.
+ ImeAdapter provides an interface in both ways native <-> java:
+ 1. InputConnectionAdapter notifies native code of text composition state and
+    dispatch key events from java -> WebKit.
+ 2. Native ImeAdapter notifies java side to clear composition text.
+
+ The basic flow is:
+ 1. Intercept dispatchKeyEventPreIme() to record the current key event, but do
+    nothing else.
+ 2. When InputConnectionAdapter gets called with composition or result text:
+    a) If a key event has been recorded in dispatchKeyEventPreIme() and we
+       receive a result text with single character, then we probably need to
+       send the result text as a Char event rather than a ConfirmComposition
+       event. So we need to dispatch the recorded key event followed by a
+       synthetic Char event.
+    b) If we receive a composition text or a result text with more than one
+       characters, then no matter if we recorded a key event or not in
+       dispatchKeyEventPreIme(), we just need to dispatch a synthetic key
+       event with special keycode 229, and then dispatch the composition or
+       result text.
+ 3. Intercept dispatchKeyEvent() method for key events not handled by IME, we
+    need to dispatch them to WebKit and check webkit's reply. Then inject a
+    new key event for further processing if WebKit didn't handle it.
+*/
 @JNINamespace("content")
 class ImeAdapter {
     interface ViewEmbedder {
         /**
-         * @param isFinish whether the event is occuring because input is finished.
+         * @param isFinish whether the event is occurring because input is finished.
          */
         public void onImeEvent(boolean isFinish);
         public void onSetFieldValue();
         public void onDismissInput();
         public View getAttachedView();
         public ResultReceiver getNewShowKeyboardReceiver();
     }
 
     static final int COMPOSITION_KEY_CODE = 229;
 
@@ skipping 42 matching lines @@
         sTextInputTypeText = textInputTypeText;
         sTextInputTypeTextArea = textInputTypeTextArea;
         sTextInputTypePassword = textInputTypePassword;
         sTextInputTypeSearch = textInputTypeSearch;
         sTextInputTypeUrl = textInputTypeUrl;
         sTextInputTypeEmail = textInputTypeEmail;
         sTextInputTypeTel = textInputTypeTel;
         sTextInputTypeNumber = textInputTypeNumber;
         sTextInputTypeWeek = textInputTypeWeek;
         sTextInputTypeContentEditable = textInputTypeContentEditable;
-        InputDialogContainer.initializeInputTypes(textInputTypeDate, textInputTypeDateTime,
-                textInputTypeDateTimeLocal, textInputTypeMonth, textInputTypeTime);
     }
 
     private int mNativeImeAdapterAndroid;
     private int mTextInputType;
     private int mPreImeEventCount;
 
     private Context mContext;
     private SelectionHandleController mSelectionHandleController;
     private InsertionHandleController mInsertionHandleController;
     private AdapterInputConnection mInputConnection;
     private ViewEmbedder mViewEmbedder;
     private Handler mHandler;
-    private InputDialogContainer mInputDialogContainer;
 
     private class DelayedDismissInput implements Runnable {
         private int mNativeImeAdapter;
 
         DelayedDismissInput(int nativeImeAdapter) {
             mNativeImeAdapter = nativeImeAdapter;
         }
 
         @Override
         public void run() {
@@ skipping 12 matching lines @@
     private static final int INPUT_DISMISS_DELAY = 150;
 
     ImeAdapter(Context context, SelectionHandleController selectionHandleController,
             InsertionHandleController insertionHandleController, ViewEmbedder embedder) {
         mPreImeEventCount = 0;
         mContext = context;
         mSelectionHandleController = selectionHandleController;
         mInsertionHandleController = insertionHandleController;
         mViewEmbedder = embedder;
         mHandler = new Handler();
-        mInputDialogContainer = new InputDialogContainer(context,
-                new InputDialogContainer.InputActionDelegate() {
-
-                    @Override
-                    public void replaceDateTime(String text) {
-                        mViewEmbedder.onSetFieldValue();
-                        nativeReplaceDateTime(mNativeImeAdapterAndroid, text);
-                    }
-
-                    @Override
-                    public void cancelDateTimeDialog() {
-                        nativeCancelDialog(mNativeImeAdapterAndroid);
-                    }
-                });
     }
 
     boolean isFor(int nativeImeAdapter, int textInputType) {
         return mNativeImeAdapterAndroid == nativeImeAdapter &&
                mTextInputType == textInputType;
     }
 
     void attachAndShowIfNeeded(int nativeImeAdapter, int textInputType,
             String text, boolean showIfNeeded) {
         mHandler.removeCallbacks(mDismissInput);
@@ skipping 12 matching lines @@
                 mHandler.postDelayed(mDismissInput, INPUT_DISMISS_DELAY);
                 return;
             }
 
             int previousType = mTextInputType;
             attach(nativeImeAdapter, textInputType);
 
             InputMethodManager manager = (InputMethodManager)
                     mContext.getSystemService(Context.INPUT_METHOD_SERVICE);
 
-            if (hasTextInputType()) {
-                manager.restartInput(mViewEmbedder.getAttachedView());
-                // If type has changed from dialog to text, show even if showIfNeeded is not true.
-                if (showIfNeeded || mInputDialogContainer.isDialogShowing()) {
-                    showKeyboard();
-                }
-            } else if (hasDialogInputType()) {
-                // If type has changed from text to dialog, show even if showIfNeeded is not true.
-                if (showIfNeeded || isTextInputType(previousType)) {
-                    // Make sure the keyboard is dismissed before displaying the dialog.
-                    dismissInput(false);
-                    mInsertionHandleController.hideAndDisallowAutomaticShowing();
-                    mInputDialogContainer.showDialog(text, textInputType);
-                }
+            manager.restartInput(mViewEmbedder.getAttachedView());
+            if (showIfNeeded) {
+                showKeyboard();
             }
         } else if (hasInputType()) {
-            if (!mInputDialogContainer.isDialogShowing() && showIfNeeded) {
-                if (hasDialogInputType()) {
-                    mInsertionHandleController.hideAndDisallowAutomaticShowing();
-                    mInputDialogContainer.showDialog(text, textInputType);
-                } else {
-                    showKeyboard();
-                }
-            }
+            showKeyboard();
         }
     }
 
     void attach(int nativeImeAdapter, int textInputType) {
         mNativeImeAdapterAndroid = nativeImeAdapter;
         mTextInputType = textInputType;
         nativeAttachImeAdapter(mNativeImeAdapterAndroid);
     }
 
     /**
@@ skipping 10 matching lines @@
 
     /**
      * Used to check whether the native counterpart of the ImeAdapter has been attached yet.
      * @return Whether native ImeAdapter has been attached and its pointer is currently nonzero.
      */
     boolean isNativeImeAdapterAttached() {
         return mNativeImeAdapterAndroid != 0;
     }
 
     private void showKeyboard() {
-        mInputDialogContainer.dismissDialog();
         InputMethodManager manager = (InputMethodManager)
                 mContext.getSystemService(Context.INPUT_METHOD_SERVICE);
         manager.showSoftInput(mViewEmbedder.getAttachedView(), 0,
                 mViewEmbedder.getNewShowKeyboardReceiver());
     }
 
     private void dismissInput(boolean unzoomIfNeeded) {
         hideKeyboard(unzoomIfNeeded);
         mViewEmbedder.onDismissInput();
     }
@@ skipping 19 matching lines @@
     }
 
     static boolean isTextInputType(int type) {
         return type != sTextInputTypeNone && !InputDialogContainer.isDialogInputType(type);
     }
 
     boolean hasTextInputType() {
         return isTextInputType(mTextInputType);
     }
 
-    boolean hasDialogInputType() {
-        return InputDialogContainer.isDialogInputType(mTextInputType);
-    }
-
     void dispatchKeyEventPreIme(KeyEvent event) {
         // We only register that a key was pressed, but we don't actually intercept
         // it.
         ++mPreImeEventCount;
     }
 
     boolean dispatchKeyEvent(KeyEvent event) {
         mPreImeEventCount = 0;
         return translateAndSendNativeEvents(event);
     }
@@ skipping 456 matching lines @@
             int action, int modifiers, long timestampMs, int keyCode, boolean isSystemKey,
             int unicodeChar);
 
     private native void nativeSetComposingText(int nativeImeAdapterAndroid, String text,
             int newCursorPosition);
 
     private native void nativeCommitText(int nativeImeAdapterAndroid, String text);
 
     private native void nativeAttachImeAdapter(int nativeImeAdapterAndroid);
 
-    private native void nativeReplaceDateTime(int nativeImeAdapterAndroid, String text);
-
-    private native void nativeCancelDialog(int nativeImeAdapterAndroid);
-
     private native void nativeSetEditableSelectionOffsets(int nativeImeAdapterAndroid,
             int start, int end);
 
     private native void nativeSetComposingRegion(int nativeImeAdapterAndroid, int start, int end);
 
     private native void nativeDeleteSurroundingText(int nativeImeAdapterAndroid,
             int before, int after);
 
     private native void nativeUnselect(int nativeImeAdapterAndroid);
     private native void nativeSelectAll(int nativeImeAdapterAndroid);
     private native void nativeCut(int nativeImeAdapterAndroid);
     private native void nativeCopy(int nativeImeAdapterAndroid);
     private native void nativePaste(int nativeImeAdapterAndroid);
 }