From b2676f76b6dd078604754b0a7b3fc3095835570e Mon Sep 17 00:00:00 2001 From: John Reck Date: Fri, 2 Mar 2012 14:13:06 -0800 Subject: Delete more navcache stuff Change-Id: Ic32559948b90abb3e8e755c5eb533dd9e83b3190 --- core/java/android/webkit/WebTextView.java | 1146 +------------------ core/java/android/webkit/WebViewClassic.java | 1566 ++++---------------------- core/java/android/webkit/WebViewCore.java | 142 +-- core/java/android/webkit/ZoomManager.java | 14 - 4 files changed, 256 insertions(+), 2612 deletions(-) diff --git a/core/java/android/webkit/WebTextView.java b/core/java/android/webkit/WebTextView.java index a01c42dd7c7e..911073da4d6f 100644 --- a/core/java/android/webkit/WebTextView.java +++ b/core/java/android/webkit/WebTextView.java @@ -16,148 +16,15 @@ package android.webkit; -import android.content.Context; -import android.graphics.Canvas; -import android.graphics.Color; -import android.graphics.ColorFilter; -import android.graphics.Paint; -import android.graphics.Paint.Style; -import android.graphics.PixelFormat; -import android.graphics.Rect; -import android.graphics.drawable.ColorDrawable; -import android.graphics.drawable.Drawable; -import android.os.Bundle; -import android.os.Handler; -import android.os.Message; -import android.os.ResultReceiver; -import android.text.BoringLayout.Metrics; -import android.text.DynamicLayout; -import android.text.Editable; -import android.text.InputFilter; -import android.text.InputType; -import android.text.Layout; -import android.text.Selection; -import android.text.Spannable; -import android.text.TextPaint; -import android.text.TextUtils; -import android.text.method.MovementMethod; -import android.text.method.Touch; import android.util.Log; -import android.util.TypedValue; -import android.view.Gravity; -import android.view.KeyCharacterMap; -import android.view.KeyEvent; -import android.view.MotionEvent; -import android.view.View; -import android.view.ViewConfiguration; -import android.view.ViewGroup; -import android.view.inputmethod.EditorInfo; -import android.view.inputmethod.InputConnection; -import android.view.inputmethod.InputMethodManager; -import android.widget.AbsoluteLayout.LayoutParams; -import android.widget.AdapterView; -import android.widget.ArrayAdapter; -import android.widget.AutoCompleteTextView; -import android.widget.TextView; - -import junit.framework.Assert; import java.net.MalformedURLException; import java.net.URL; -import java.util.ArrayList; - -/** - * WebTextView is a specialized version of EditText used by WebView - * to overlay html textfields (and textareas) to use our standard - * text editing. - */ -/* package */ class WebTextView extends AutoCompleteTextView - implements AdapterView.OnItemClickListener { - - static final String LOGTAG = "webtextview"; - - private int mRingInset; - private WebViewClassic mWebView; - private boolean mSingle; - private int mWidthSpec; - private int mHeightSpec; - private int mNodePointer; - // FIXME: This is a hack for blocking unmatched key ups, in particular - // on the enter key. The method for blocking unmatched key ups prevents - // the shift key from working properly. - private boolean mGotEnterDown; - private int mMaxLength; - // Keep track of the text before the change so we know whether we actually - // need to send down the DOM events. - private String mPreChange; - // Variables for keeping track of the touch down, to send to the WebView - // when a drag starts - private float mDragStartX; - private float mDragStartY; - private long mDragStartTime; - private boolean mDragSent; - // True if the most recent drag event has caused either the TextView to - // scroll or the web page to scroll. Gets reset after a touch down. - private boolean mScrolled; - // Whether or not a selection change was generated from webkit. If it was, - // we do not need to pass the selection back to webkit. - private boolean mFromWebKit; - // Whether or not a selection change was generated from the WebTextView - // gaining focus. If it is, we do not want to pass it to webkit. This - // selection comes from the MovementMethod, but we behave differently. If - // WebTextView gained focus from a touch, webkit will determine the - // selection. - private boolean mFromFocusChange; - // Whether or not a selection change was generated from setInputType. We - // do not want to pass this change to webkit. - private boolean mFromSetInputType; - private boolean mGotTouchDown; - // Keep track of whether a long press has happened. Only meaningful after - // an ACTION_DOWN MotionEvent - private boolean mHasPerformedLongClick; - private boolean mInSetTextAndKeepSelection; - // Array to store the final character added in onTextChanged, so that its - // KeyEvents may be determined. - private char[] mCharacter = new char[1]; - // This is used to reset the length filter when on a textfield - // with no max length. - // FIXME: This can be replaced with TextView.NO_FILTERS if that - // is made public/protected. - private static final InputFilter[] NO_FILTERS = new InputFilter[0]; - // For keeping track of the fact that the delete key was pressed, so - // we can simply pass a delete key instead of calling deleteSelection. - private boolean mGotDelete; - private int mDelSelStart; - private int mDelSelEnd; +// TODO: Move these to a better place. +/* package */ abstract class WebTextView { - // Keep in sync with native constant in - // external/webkit/WebKit/android/WebCoreSupport/autofill/WebAutoFill.cpp - /* package */ static final int FORM_NOT_AUTOFILLABLE = -1; - - private boolean mAutoFillable; // Is this textview part of an autofillable form? - private int mQueryId; - private boolean mAutoFillProfileIsSet; - // Used to determine whether onFocusChanged was called as a result of - // calling remove(). - private boolean mInsideRemove; - private class MyResultReceiver extends ResultReceiver { - @Override - protected void onReceiveResult(int resultCode, Bundle resultData) { - if (resultCode == InputMethodManager.RESULT_SHOWN - && mWebView != null) { - mWebView.revealSelection(); - } - } - - /** - * @param handler - */ - public MyResultReceiver(Handler handler) { - super(handler); - } - } - private MyResultReceiver mReceiver; + private static final String LOGTAG = "WebTextView"; // Types used with setType. Keep in sync with CachedInput.h static final int NORMAL_TEXT_FIELD = 0; @@ -169,1006 +36,7 @@ import java.util.ArrayList; static final int TELEPHONE = 6; static final int URL = 7; - private static final int AUTOFILL_FORM = 100; - private Handler mHandler; - - /** - * Create a new WebTextView. - * @param context The Context for this WebTextView. - * @param webView The WebView that created this. - */ - /* package */ WebTextView(Context context, WebViewClassic webView, int autoFillQueryId) { - super(context, null, com.android.internal.R.attr.webTextViewStyle); - mWebView = webView; - mMaxLength = -1; - setAutoFillable(autoFillQueryId); - // Turn on subpixel text, and turn off kerning, so it better matches - // the text in webkit. - TextPaint paint = getPaint(); - int flags = paint.getFlags() & ~Paint.DEV_KERN_TEXT_FLAG - | Paint.SUBPIXEL_TEXT_FLAG | Paint.DITHER_FLAG; - paint.setFlags(flags); - - // Set the text color to black, regardless of the theme. This ensures - // that other applications that use embedded WebViews will properly - // display the text in password textfields. - setTextColor(DebugFlags.DRAW_WEBTEXTVIEW ? Color.RED : Color.BLACK); - setBackgroundDrawable(DebugFlags.DRAW_WEBTEXTVIEW ? null : new ColorDrawable(Color.WHITE)); - - // This helps to align the text better with the text in the web page. - setIncludeFontPadding(false); - - mHandler = new Handler() { - @Override - public void handleMessage(Message msg) { - switch (msg.what) { - case AUTOFILL_FORM: - mWebView.autoFillForm(mQueryId); - break; - } - } - }; - mReceiver = new MyResultReceiver(mHandler); - float ringWidth = 2f * context.getResources().getDisplayMetrics().density; - mRingInset = (int) ringWidth; - setBackgroundDrawable(new BackgroundDrawable(mRingInset)); - setPadding(getPaddingLeft(), getPaddingTop(), getPaddingRight(), - getPaddingBottom()); - } - - private static class BackgroundDrawable extends Drawable { - - private Paint mPaint = new Paint(); - private int mBorderWidth; - private Rect mInsetRect = new Rect(); - - public BackgroundDrawable(int width) { - mPaint = new Paint(); - mPaint.setStrokeWidth(width); - mBorderWidth = width; - } - - @Override - public void draw(Canvas canvas) { - mPaint.setColor(0x6633b5e5); - canvas.drawRect(getBounds(), mPaint); - mInsetRect.left = getBounds().left + mBorderWidth; - mInsetRect.top = getBounds().top + mBorderWidth; - mInsetRect.right = getBounds().right - mBorderWidth; - mInsetRect.bottom = getBounds().bottom - mBorderWidth; - mPaint.setColor(Color.WHITE); - canvas.drawRect(mInsetRect, mPaint); - } - - @Override - public void setAlpha(int alpha) { - } - - @Override - public void setColorFilter(ColorFilter cf) { - } - - @Override - public int getOpacity() { - return PixelFormat.TRANSLUCENT; - } - - } - - public void setAutoFillable(int queryId) { - mAutoFillable = mWebView.getSettings().getAutoFillEnabled() - && (queryId != FORM_NOT_AUTOFILLABLE); - mQueryId = queryId; - } - - @Override - public void setPadding(int left, int top, int right, int bottom) { - super.setPadding(left + mRingInset, top + mRingInset, - right + mRingInset, bottom + mRingInset); - } - - @Override - public boolean dispatchKeyEvent(KeyEvent event) { - if (event.isSystem()) { - return super.dispatchKeyEvent(event); - } - // Treat ACTION_DOWN and ACTION MULTIPLE the same - boolean down = event.getAction() != KeyEvent.ACTION_UP; - int keyCode = event.getKeyCode(); - - boolean isArrowKey = false; - switch(keyCode) { - case KeyEvent.KEYCODE_DPAD_LEFT: - case KeyEvent.KEYCODE_DPAD_RIGHT: - case KeyEvent.KEYCODE_DPAD_UP: - case KeyEvent.KEYCODE_DPAD_DOWN: - isArrowKey = true; - break; - } - - if (KeyEvent.KEYCODE_TAB == keyCode) { - if (down) { - onEditorAction(EditorInfo.IME_ACTION_NEXT); - } - return true; - } - Spannable text = (Spannable) getText(); - int oldStart = Selection.getSelectionStart(text); - int oldEnd = Selection.getSelectionEnd(text); - // Normally the delete key's dom events are sent via onTextChanged. - // However, if the cursor is at the beginning of the field, which - // includes the case where it has zero length, then the text is not - // changed, so send the events immediately. - if (KeyEvent.KEYCODE_DEL == keyCode) { - if (oldStart == 0 && oldEnd == 0) { - sendDomEvent(event); - return true; - } - if (down) { - mGotDelete = true; - mDelSelStart = oldStart; - mDelSelEnd = oldEnd; - } - } - - if (mSingle && (KeyEvent.KEYCODE_ENTER == keyCode - || KeyEvent.KEYCODE_NUMPAD_ENTER == keyCode)) { - if (isPopupShowing()) { - return super.dispatchKeyEvent(event); - } - if (!down) { - // Hide the keyboard, since the user has just submitted this - // form. The submission happens thanks to the two calls - // to sendDomEvent. - InputMethodManager.getInstance(mContext) - .hideSoftInputFromWindow(getWindowToken(), 0); - sendDomEvent(new KeyEvent(KeyEvent.ACTION_DOWN, keyCode)); - sendDomEvent(event); - } - return super.dispatchKeyEvent(event); - } else if (KeyEvent.KEYCODE_DPAD_CENTER == keyCode) { - // Note that this handles center key and trackball. - if (isPopupShowing()) { - return super.dispatchKeyEvent(event); - } - // Center key should be passed to a potential onClick - if (!down) { - mWebView.centerKeyPressOnTextField(); - } - // Pass to super to handle longpress. - return super.dispatchKeyEvent(event); - } - - // Ensure there is a layout so arrow keys are handled properly. - if (getLayout() == null) { - measure(mWidthSpec, mHeightSpec); - } - - int oldLength = text.length(); - boolean maxedOut = mMaxLength != -1 && oldLength == mMaxLength; - // If we are at max length, and there is a selection rather than a - // cursor, we need to store the text to compare later, since the key - // may have changed the string. - String oldText; - if (maxedOut && oldEnd != oldStart) { - oldText = text.toString(); - } else { - oldText = ""; - } - if (super.dispatchKeyEvent(event)) { - // If the WebTextView handled the key it was either an alphanumeric - // key, a delete, or a movement within the text. All of those are - // ok to pass to javascript. - - // UNLESS there is a max length determined by the html. In that - // case, if the string was already at the max length, an - // alphanumeric key will be erased by the LengthFilter, - // so do not pass down to javascript, and instead - // return true. If it is an arrow key or a delete key, we can go - // ahead and pass it down. - if (KeyEvent.KEYCODE_ENTER == keyCode - || KeyEvent.KEYCODE_NUMPAD_ENTER == keyCode) { - // For multi-line text boxes, newlines will - // trigger onTextChanged for key down (which will send both - // key up and key down) but not key up. - mGotEnterDown = true; - } - if (maxedOut && !isArrowKey && keyCode != KeyEvent.KEYCODE_DEL) { - if (oldEnd == oldStart) { - // Return true so the key gets dropped. - return true; - } else if (!oldText.equals(getText().toString())) { - // FIXME: This makes the text work properly, but it - // does not pass down the key event, so it may not - // work for a textfield that has the type of - // behavior of GoogleSuggest. That said, it is - // unlikely that a site would combine the two in - // one textfield. - Spannable span = (Spannable) getText(); - int newStart = Selection.getSelectionStart(span); - int newEnd = Selection.getSelectionEnd(span); - mWebView.replaceTextfieldText(0, oldLength, span.toString(), - newStart, newEnd); - return true; - } - } - /* FIXME: - * In theory, we would like to send the events for the arrow keys. - * However, the TextView can arbitrarily change the selection (i.e. - * long press followed by using the trackball). Therefore, we keep - * in sync with the TextView via onSelectionChanged. If we also - * send the DOM event, we lose the correct selection. - if (isArrowKey) { - // Arrow key does not change the text, but we still want to send - // the DOM events. - sendDomEvent(event); - } - */ - return true; - } - // Ignore the key up event for newlines. This prevents - // multiple newlines in the native textarea. - if (mGotEnterDown && !down) { - return true; - } - // if it is a navigation key, pass it to WebView - if (isArrowKey) { - // WebView check the trackballtime in onKeyDown to avoid calling - // native from both trackball and key handling. As this is called - // from WebTextView, we always want WebView to check with native. - // Reset trackballtime to ensure it. - mWebView.resetTrackballTime(); - return down ? mWebView.onKeyDown(keyCode, event) : mWebView - .onKeyUp(keyCode, event); - } - return false; - } - - void ensureLayout() { - if (getLayout() == null) { - // Ensure we have a Layout - measure(mWidthSpec, mHeightSpec); - LayoutParams params = (LayoutParams) getLayoutParams(); - if (params != null) { - layout(params.x, params.y, params.x + params.width, - params.y + params.height); - } - } - } - - /* package */ ResultReceiver getResultReceiver() { return mReceiver; } - - /** - * Determine whether this WebTextView currently represents the node - * represented by ptr. - * @param ptr Pointer to a node to compare to. - * @return boolean Whether this WebTextView already represents the node - * pointed to by ptr. - */ - /* package */ boolean isSameTextField(int ptr) { - return ptr == mNodePointer; - } - - /** - * Ensure that the underlying text field/area is lined up with the WebTextView. - */ - private void lineUpScroll() { - Layout layout = getLayout(); - if (mWebView != null && layout != null) { - if (mSingle) { - // textfields only need to be lined up horizontally. - float maxScrollX = layout.getLineRight(0) - getWidth(); - if (DebugFlags.WEB_TEXT_VIEW) { - Log.v(LOGTAG, "onTouchEvent x=" + mScrollX + " y=" - + mScrollY + " maxX=" + maxScrollX); - } - mWebView.scrollFocusedTextInputX(maxScrollX > 0 ? - mScrollX / maxScrollX : 0); - } else { - // textareas only need to be lined up vertically. - mWebView.scrollFocusedTextInputY(mScrollY); - } - } - } - - @Override - protected void makeNewLayout(int w, int hintWidth, Metrics boring, - Metrics hintBoring, int ellipsisWidth, boolean bringIntoView) { - // Necessary to get a Layout to work with, and to do the other work that - // makeNewLayout does. - super.makeNewLayout(w, hintWidth, boring, hintBoring, ellipsisWidth, - bringIntoView); - lineUpScroll(); - } - - /** - * Custom layout which figures out its line spacing. If -1 is passed in for - * the height, it will use the ascent and descent from the paint to - * determine the line spacing. Otherwise it will use the spacing provided. - */ - private static class WebTextViewLayout extends DynamicLayout { - private float mLineHeight; - private float mDifference; - public WebTextViewLayout(CharSequence base, CharSequence display, - TextPaint paint, - int width, Alignment align, - float spacingMult, float spacingAdd, - boolean includepad, - TextUtils.TruncateAt ellipsize, int ellipsizedWidth, - float lineHeight) { - super(base, display, paint, width, align, spacingMult, spacingAdd, - includepad, ellipsize, ellipsizedWidth); - float paintLineHeight = paint.descent() - paint.ascent(); - if (lineHeight == -1f) { - mLineHeight = paintLineHeight; - mDifference = 0f; - } else { - mLineHeight = lineHeight; - // Through trial and error, I found this calculation to improve - // the accuracy of line placement. - mDifference = (lineHeight - paintLineHeight) / 2; - } - } - - @Override - public int getLineTop(int line) { - return Math.round(mLineHeight * line - mDifference); - } - } - - @Override public InputConnection onCreateInputConnection( - EditorInfo outAttrs) { - InputConnection connection = super.onCreateInputConnection(outAttrs); - if (mWebView != null) { - // Use the name of the textfield + the url. Use backslash as an - // arbitrary separator. - outAttrs.fieldName = mWebView.nativeFocusCandidateName() + "\\" - + mWebView.getUrl(); - } - return connection; - } - - @Override - public void onEditorAction(int actionCode) { - switch (actionCode) { - case EditorInfo.IME_ACTION_NEXT: - if (mWebView.nativeMoveCursorToNextTextInput()) { - // Preemptively rebuild the WebTextView, so that the action will - // be set properly. - mWebView.rebuildWebTextView(); - setDefaultSelection(); - mWebView.invalidate(); - } - break; - case EditorInfo.IME_ACTION_DONE: - super.onEditorAction(actionCode); - break; - case EditorInfo.IME_ACTION_GO: - case EditorInfo.IME_ACTION_SEARCH: - // Send an enter and hide the soft keyboard - InputMethodManager.getInstance(mContext) - .hideSoftInputFromWindow(getWindowToken(), 0); - sendDomEvent(new KeyEvent(KeyEvent.ACTION_DOWN, - KeyEvent.KEYCODE_ENTER)); - sendDomEvent(new KeyEvent(KeyEvent.ACTION_UP, - KeyEvent.KEYCODE_ENTER)); - - default: - break; - } - } - - @Override - protected void onFocusChanged(boolean focused, int direction, - Rect previouslyFocusedRect) { - mFromFocusChange = true; - super.onFocusChanged(focused, direction, previouslyFocusedRect); - if (focused) { - mWebView.setActive(true); - } else if (!mInsideRemove) { - mWebView.setActive(false); - } - mFromFocusChange = false; - } - - // AdapterView.OnItemClickListener implementation - - @Override - public void onItemClick(AdapterView parent, View view, int position, long id) { - if (id == 0 && position == 0) { - // Blank out the text box while we wait for WebCore to fill the form. - replaceText(""); - WebSettings settings = mWebView.getSettings(); - if (mAutoFillProfileIsSet) { - // Call a webview method to tell WebCore to autofill the form. - mWebView.autoFillForm(mQueryId); - } else { - // There is no autofill profile setup yet and the user has - // elected to try and set one up. Call through to the - // embedder to action that. - mWebView.getWebChromeClient().setupAutoFill( - mHandler.obtainMessage(AUTOFILL_FORM)); - } - } - } - - @Override - protected void onScrollChanged(int l, int t, int oldl, int oldt) { - super.onScrollChanged(l, t, oldl, oldt); - lineUpScroll(); - } - - @Override - protected void onSelectionChanged(int selStart, int selEnd) { - if (!mFromWebKit && !mFromFocusChange && !mFromSetInputType - && mWebView != null && !mInSetTextAndKeepSelection) { - if (DebugFlags.WEB_TEXT_VIEW) { - Log.v(LOGTAG, "onSelectionChanged selStart=" + selStart - + " selEnd=" + selEnd); - } - mWebView.setSelection(selStart, selEnd); - lineUpScroll(); - } - } - - @Override - protected void onTextChanged(CharSequence s,int start,int before,int count){ - super.onTextChanged(s, start, before, count); - String postChange = s.toString(); - // Prevent calls to setText from invoking onTextChanged (since this will - // mean we are on a different textfield). Also prevent the change when - // going from a textfield with a string of text to one with a smaller - // limit on text length from registering the onTextChanged event. - if (mPreChange == null || mPreChange.equals(postChange) || - (mMaxLength > -1 && mPreChange.length() > mMaxLength && - mPreChange.substring(0, mMaxLength).equals(postChange))) { - return; - } - if (0 == count) { - if (before > 0) { - // For this and all changes to the text, update our cache - updateCachedTextfield(); - if (mGotDelete) { - mGotDelete = false; - int oldEnd = start + before; - if (mDelSelEnd == oldEnd - && (mDelSelStart == start - || (mDelSelStart == oldEnd && before == 1))) { - // If the selection is set up properly before the - // delete, send the DOM events. - sendDomEvent(new KeyEvent(KeyEvent.ACTION_DOWN, - KeyEvent.KEYCODE_DEL)); - sendDomEvent(new KeyEvent(KeyEvent.ACTION_UP, - KeyEvent.KEYCODE_DEL)); - return; - } - } - // This was simply a delete or a cut, so just delete the - // selection. - mWebView.deleteSelection(start, start + before); - } - mGotDelete = false; - // before should never be negative, so whether it was a cut - // (handled above), or before is 0, in which case nothing has - // changed, we should return. - return; - } - // Ensure that this flag gets cleared, since with autocorrect on, a - // delete key press may have a more complex result than deleting one - // character or the existing selection, so it will not get cleared - // above. - mGotDelete = false; - // Prefer sending javascript events, so when adding one character, - // don't replace the unchanged text. - if (count > 1 && before == count - 1) { - String replaceButOne = mPreChange.subSequence(start, - start + before).toString(); - String replacedString = s.subSequence(start, - start + before).toString(); - if (replaceButOne.equals(replacedString)) { - // we're just adding one character - start += before; - before = 0; - count = 1; - } - } - mPreChange = postChange; - // Find the last character being replaced. If it can be represented by - // events, we will pass them to native so we can see javascript events. - // Otherwise, replace the text being changed in the textfield. - KeyEvent[] events = null; - if (count == 1) { - TextUtils.getChars(s, start + count - 1, start + count, mCharacter, 0); - KeyCharacterMap kmap = KeyCharacterMap.load(KeyCharacterMap.VIRTUAL_KEYBOARD); - events = kmap.getEvents(mCharacter); - } - boolean useKeyEvents = (events != null); - if (useKeyEvents) { - // This corrects the selection which may have been affected by the - // trackball or auto-correct. - if (DebugFlags.WEB_TEXT_VIEW) { - Log.v(LOGTAG, "onTextChanged start=" + start - + " start + before=" + (start + before)); - } - if (!mInSetTextAndKeepSelection) { - mWebView.setSelection(start, start + before); - } - int length = events.length; - for (int i = 0; i < length; i++) { - // We never send modifier keys to native code so don't send them - // here either. - if (!KeyEvent.isModifierKey(events[i].getKeyCode())) { - sendDomEvent(events[i]); - } - } - } else { - String replace = s.subSequence(start, - start + count).toString(); - mWebView.replaceTextfieldText(start, start + before, replace, - start + count, - start + count); - } - updateCachedTextfield(); - } - - @Override - public boolean onTouchEvent(MotionEvent event) { - switch (event.getAction()) { - case MotionEvent.ACTION_DOWN: - super.onTouchEvent(event); - // This event may be the start of a drag, so store it to pass to the - // WebView if it is. - mDragStartX = event.getX(); - mDragStartY = event.getY(); - mDragStartTime = event.getEventTime(); - mDragSent = false; - mScrolled = false; - mGotTouchDown = true; - mHasPerformedLongClick = false; - break; - case MotionEvent.ACTION_MOVE: - if (mHasPerformedLongClick) { - mGotTouchDown = false; - return false; - } - int slop = ViewConfiguration.get(mContext).getScaledTouchSlop(); - Spannable buffer = getText(); - int initialScrollX = Touch.getInitialScrollX(this, buffer); - int initialScrollY = Touch.getInitialScrollY(this, buffer); - super.onTouchEvent(event); - int dx = Math.abs(mScrollX - initialScrollX); - int dy = Math.abs(mScrollY - initialScrollY); - // Use a smaller slop when checking to see if we've moved far enough - // to scroll the text, because experimentally, slop has shown to be - // to big for the case of a small textfield. - int smallerSlop = slop/2; - if (dx > smallerSlop || dy > smallerSlop) { - // Scrolling is handled in onScrollChanged. - mScrolled = true; - cancelLongPress(); - return true; - } - if (Math.abs((int) event.getX() - mDragStartX) < slop - && Math.abs((int) event.getY() - mDragStartY) < slop) { - // If the user has not scrolled further than slop, we should not - // send the drag. Instead, do nothing, and when the user lifts - // their finger, we will change the selection. - return true; - } - if (mWebView != null) { - // Only want to set the initial state once. - if (!mDragSent) { - mWebView.initiateTextFieldDrag(mDragStartX, mDragStartY, - mDragStartTime); - mDragSent = true; - } - boolean scrolled = mWebView.textFieldDrag(event); - if (scrolled) { - mScrolled = true; - cancelLongPress(); - return true; - } - } - return false; - case MotionEvent.ACTION_UP: - case MotionEvent.ACTION_CANCEL: - super.onTouchEvent(event); - if (mHasPerformedLongClick) { - mGotTouchDown = false; - return false; - } - if (!mScrolled) { - // If the page scrolled, or the TextView scrolled, we do not - // want to change the selection - cancelLongPress(); - if (mGotTouchDown && mWebView != null) { - mWebView.touchUpOnTextField(event); - } - } - // Necessary for the WebView to reset its state - if (mWebView != null && mDragSent) { - mWebView.onTouchEvent(event); - } - mGotTouchDown = false; - break; - default: - break; - } - return true; - } - - @Override - public boolean onTrackballEvent(MotionEvent event) { - if (isPopupShowing()) { - return super.onTrackballEvent(event); - } - if (event.getAction() != MotionEvent.ACTION_MOVE) { - return false; - } - Spannable text = getText(); - MovementMethod move = getMovementMethod(); - if (move != null && getLayout() != null && - move.onTrackballEvent(this, text, event)) { - // Selection is changed in onSelectionChanged - return true; - } - return false; - } - - @Override - public boolean performLongClick() { - mHasPerformedLongClick = true; - return super.performLongClick(); - } - - /** - * Remove this WebTextView from its host WebView, and return - * focus to the host. - */ - /* package */ void remove() { - // hide the soft keyboard when the edit text is out of focus - InputMethodManager imm = InputMethodManager.getInstance(mContext); - if (imm.isActive(this)) { - imm.hideSoftInputFromWindow(getWindowToken(), 0); - } - mInsideRemove = true; - boolean isFocused = hasFocus(); - mWebView.getWebView().removeView(this); - if (isFocused) { - mWebView.getWebView().requestFocus(); - } - mInsideRemove = false; - mHandler.removeCallbacksAndMessages(null); - } - - @Override - public boolean requestRectangleOnScreen(Rect rectangle, boolean immediate) { - // Do nothing, since webkit will put the textfield on screen. - return true; - } - - /** - * Send the DOM events for the specified event. - * @param event KeyEvent to be translated into a DOM event. - */ - private void sendDomEvent(KeyEvent event) { - mWebView.passToJavaScript(getText().toString(), event); - } - - /** - * Always use this instead of setAdapter, as this has features specific to - * the WebTextView. - */ - public void setAdapterCustom(AutoCompleteAdapter adapter) { - if (adapter != null) { - setInputType(getInputType() - | InputType.TYPE_TEXT_FLAG_AUTO_COMPLETE); - adapter.setTextView(this); - if (mAutoFillable) { - setOnItemClickListener(this); - } else { - setOnItemClickListener(null); - } - showDropDown(); - } else { - dismissDropDown(); - } - super.setAdapter(adapter); - } - - /** - * This is a special version of ArrayAdapter which changes its text size - * to match the text size of its host TextView. - */ - public static class AutoCompleteAdapter extends ArrayAdapter { - private TextView mTextView; - - public AutoCompleteAdapter(Context context, ArrayList entries) { - super(context, com.android.internal.R.layout - .web_text_view_dropdown, entries); - } - - /** - * {@inheritDoc} - */ - @Override - public View getView(int position, View convertView, ViewGroup parent) { - TextView tv = - (TextView) super.getView(position, convertView, parent); - if (tv != null && mTextView != null) { - tv.setTextSize(TypedValue.COMPLEX_UNIT_PX, mTextView.getTextSize()); - } - return tv; - } - - /** - * Set the TextView so we can match its text size. - */ - private void setTextView(TextView tv) { - mTextView = tv; - } - } - - /** - * Sets the selection when the user clicks on a textfield or textarea with - * the trackball or center key, or starts typing into it without clicking on - * it. - */ - /* package */ void setDefaultSelection() { - Spannable text = (Spannable) getText(); - int selection = mSingle ? text.length() : 0; - if (Selection.getSelectionStart(text) == selection - && Selection.getSelectionEnd(text) == selection) { - // The selection of the UI copy is set correctly, but the - // WebTextView still needs to inform the webkit thread to set the - // selection. Normally that is done in onSelectionChanged, but - // onSelectionChanged will not be called because the UI copy is not - // changing. (This can happen when the WebTextView takes focus. - // That onSelectionChanged was blocked because the selection set - // when focusing is not necessarily the desirable selection for - // WebTextView.) - if (mWebView != null) { - mWebView.setSelection(selection, selection); - } - } else { - Selection.setSelection(text, selection, selection); - } - if (mWebView != null) mWebView.incrementTextGeneration(); - } - - @Override - public void setInputType(int type) { - mFromSetInputType = true; - super.setInputType(type); - mFromSetInputType = false; - } - - private void setMaxLength(int maxLength) { - mMaxLength = maxLength; - if (-1 == maxLength) { - setFilters(NO_FILTERS); - } else { - setFilters(new InputFilter[] { - new InputFilter.LengthFilter(maxLength) }); - } - } - - /** - * Set the pointer for this node so it can be determined which node this - * WebTextView represents. - * @param ptr Integer representing the pointer to the node which this - * WebTextView represents. - */ - /* package */ void setNodePointer(int ptr) { - if (ptr != mNodePointer) { - mNodePointer = ptr; - setAdapterCustom(null); - } - } - - /** - * Determine the position and size of WebTextView, and add it to the - * WebView's view heirarchy. All parameters are presumed to be in - * view coordinates. Also requests Focus and sets the cursor to not - * request to be in view. - * @param x x-position of the textfield. - * @param y y-position of the textfield. - * @param width width of the textfield. - * @param height height of the textfield. - */ - /* package */ void setRect(int x, int y, int width, int height) { - LayoutParams lp = (LayoutParams) getLayoutParams(); - x -= mRingInset; - y -= mRingInset; - width += 2 * mRingInset; - height += 2 * mRingInset; - boolean needsUpdate = false; - if (null == lp) { - lp = new LayoutParams(width, height, x, y); - } else { - if ((lp.x != x) || (lp.y != y) || (lp.width != width) - || (lp.height != height)) { - needsUpdate = true; - lp.x = x; - lp.y = y; - lp.width = width; - lp.height = height; - } - } - if (getParent() == null) { - // Insert the view so that it's drawn first (at index 0) - mWebView.getWebView().addView(this, 0, lp); - } else if (needsUpdate) { - setLayoutParams(lp); - } - // Set up a measure spec so a layout can always be recreated. - mWidthSpec = MeasureSpec.makeMeasureSpec(width, MeasureSpec.EXACTLY); - mHeightSpec = MeasureSpec.makeMeasureSpec(height, MeasureSpec.EXACTLY); - } - - /** - * Set the selection, and disable our onSelectionChanged action. - */ - /* package */ void setSelectionFromWebKit(int start, int end) { - if (start < 0 || end < 0) return; - Spannable text = (Spannable) getText(); - int length = text.length(); - if (start > length || end > length) return; - mFromWebKit = true; - Selection.setSelection(text, start, end); - mFromWebKit = false; - } - - /** - * Update the text size according to the size of the focus candidate's text - * size in mWebView. Should only be called from mWebView. - */ - /* package */ void updateTextSize() { - Assert.assertNotNull("updateTextSize should only be called from " - + "mWebView, so mWebView should never be null!", mWebView); - // Note that this is approximately WebView.contentToViewDimension, - // without being rounded. - float size = mWebView.nativeFocusCandidateTextSize() - * mWebView.getScale(); - setTextSize(TypedValue.COMPLEX_UNIT_PX, size); - } - - /** - * Set the text to the new string, but use the old selection, making sure - * to keep it within the new string. - * @param text The new text to place in the textfield. - */ - /* package */ void setTextAndKeepSelection(String text) { - Editable edit = getText(); - mPreChange = text; - if (edit.toString().equals(text)) { - return; - } - int selStart = Selection.getSelectionStart(edit); - int selEnd = Selection.getSelectionEnd(edit); - mInSetTextAndKeepSelection = true; - edit.replace(0, edit.length(), text); - int newLength = edit.length(); - if (selStart > newLength) selStart = newLength; - if (selEnd > newLength) selEnd = newLength; - Selection.setSelection(edit, selStart, selEnd); - mInSetTextAndKeepSelection = false; - InputMethodManager imm = InputMethodManager.peekInstance(); - if (imm != null && imm.isActive(this)) { - // Since the text has changed, do not allow the IME to replace the - // existing text as though it were a completion. - imm.restartInput(this); - } - updateCachedTextfield(); - } - - /** - * Called by WebView.rebuildWebTextView(). Based on the type of the - * element, set up the WebTextView, its InputType, and IME Options properly. - * @param type int corresponding to enum "Type" defined in CachedInput.h. - * Does not correspond to HTMLInputElement::InputType so this - * is unaffected if that changes, and also because that has no - * type corresponding to textarea (which is its own tag). - */ - /* package */ void setType(int type) { - if (mWebView == null) return; - boolean single = true; - int maxLength = -1; - int inputType = InputType.TYPE_CLASS_TEXT - | InputType.TYPE_TEXT_VARIATION_WEB_EDIT_TEXT; - int imeOptions = EditorInfo.IME_FLAG_NO_EXTRACT_UI - | EditorInfo.IME_FLAG_NO_FULLSCREEN; - if (!mWebView.nativeFocusCandidateIsSpellcheck()) { - inputType |= InputType.TYPE_TEXT_FLAG_NO_SUGGESTIONS; - } - if (TEXT_AREA != type - && mWebView.nativeFocusCandidateHasNextTextfield()) { - imeOptions |= EditorInfo.IME_FLAG_NAVIGATE_NEXT; - } - switch (type) { - case NORMAL_TEXT_FIELD: - imeOptions |= EditorInfo.IME_ACTION_GO; - break; - case TEXT_AREA: - single = false; - inputType |= InputType.TYPE_TEXT_FLAG_MULTI_LINE - | InputType.TYPE_TEXT_FLAG_CAP_SENTENCES - | InputType.TYPE_TEXT_FLAG_AUTO_CORRECT; - imeOptions |= EditorInfo.IME_ACTION_NONE; - break; - case PASSWORD: - inputType |= EditorInfo.TYPE_TEXT_VARIATION_WEB_PASSWORD; - imeOptions |= EditorInfo.IME_ACTION_GO; - break; - case SEARCH: - imeOptions |= EditorInfo.IME_ACTION_SEARCH; - break; - case EMAIL: - // inputType needs to be overwritten because of the different text variation. - inputType = InputType.TYPE_CLASS_TEXT - | InputType.TYPE_TEXT_VARIATION_WEB_EMAIL_ADDRESS; - imeOptions |= EditorInfo.IME_ACTION_GO; - break; - case NUMBER: - // inputType needs to be overwritten because of the different class. - inputType = InputType.TYPE_CLASS_NUMBER | InputType.TYPE_NUMBER_VARIATION_NORMAL - | InputType.TYPE_NUMBER_FLAG_SIGNED | InputType.TYPE_NUMBER_FLAG_DECIMAL; - // Number and telephone do not have both a Tab key and an - // action, so set the action to NEXT - imeOptions |= EditorInfo.IME_ACTION_NEXT; - break; - case TELEPHONE: - // inputType needs to be overwritten because of the different class. - inputType = InputType.TYPE_CLASS_PHONE; - imeOptions |= EditorInfo.IME_ACTION_NEXT; - break; - case URL: - // TYPE_TEXT_VARIATION_URI prevents Tab key from showing, so - // exclude it for now. - imeOptions |= EditorInfo.IME_ACTION_GO; - break; - default: - imeOptions |= EditorInfo.IME_ACTION_GO; - break; - } - setHint(null); - setThreshold(1); - boolean autoComplete = false; - if (single) { - mWebView.requestLabel(mWebView.nativeFocusCandidateFramePointer(), - mNodePointer); - maxLength = mWebView.nativeFocusCandidateMaxLength(); - autoComplete = mWebView.nativeFocusCandidateIsAutoComplete(); - if (type != PASSWORD && (mAutoFillable || autoComplete)) { - String name = mWebView.nativeFocusCandidateName(); - if (name != null && name.length() > 0) { - mWebView.requestFormData(name, mNodePointer, mAutoFillable, - autoComplete); - } - } - } - mSingle = single; - setMaxLength(maxLength); - setHorizontallyScrolling(single); - setInputType(inputType); - clearComposingText(); - setImeOptions(imeOptions); - setVisibility(VISIBLE); - if (!autoComplete) { - setAdapterCustom(null); - } - } - - /** - * Update the cache to reflect the current text. - */ - /* package */ void updateCachedTextfield() { - mWebView.updateCachedTextfield(getText().toString()); - } - - /* package */ void setAutoFillProfileIsSet(boolean autoFillProfileIsSet) { - mAutoFillProfileIsSet = autoFillProfileIsSet; - } + static final int FORM_NOT_AUTOFILLABLE = -1; static String urlForAutoCompleteData(String urlString) { // Remove any fragment or query string. @@ -1182,10 +50,4 @@ import java.util.ArrayList; return url != null ? url.getProtocol() + "://" + url.getHost() + url.getPath() : null; } - public void setGravityForRtl(boolean rtl) { - int gravity = rtl ? Gravity.RIGHT : Gravity.LEFT; - gravity |= mSingle ? Gravity.CENTER_VERTICAL : Gravity.TOP; - setGravity(gravity); - } - } diff --git a/core/java/android/webkit/WebViewClassic.java b/core/java/android/webkit/WebViewClassic.java index 5f5e83c03ec2..c9a3ff1ec732 100644 --- a/core/java/android/webkit/WebViewClassic.java +++ b/core/java/android/webkit/WebViewClassic.java @@ -67,7 +67,6 @@ import android.text.Editable; import android.text.InputType; import android.text.Selection; import android.text.TextUtils; -import android.util.AttributeSet; import android.util.DisplayMetrics; import android.util.EventLog; import android.util.Log; @@ -97,8 +96,6 @@ import android.view.inputmethod.BaseInputConnection; import android.view.inputmethod.EditorInfo; import android.view.inputmethod.InputConnection; import android.view.inputmethod.InputMethodManager; -import android.webkit.HTML5VideoInline; -import android.webkit.WebTextView.AutoCompleteAdapter; import android.webkit.WebView.HitTestResult; import android.webkit.WebView.PictureListener; import android.webkit.WebViewCore.DrawData; @@ -353,6 +350,7 @@ import java.util.regex.Pattern; // TODO: Check if any WebView published API methods are called from within here, and if so // we should bounce the call out via the proxy to enable any sub-class to override it. @Widget +@SuppressWarnings("deprecation") public final class WebViewClassic implements WebViewProvider, WebViewProvider.ScrollDelegate, WebViewProvider.ViewDelegate { private class InnerGlobalLayoutListener implements ViewTreeObserver.OnGlobalLayoutListener { @@ -852,7 +850,6 @@ public final class WebViewClassic implements WebViewProvider, WebViewProvider.Sc private WebViewCore mWebViewCore; // Handler for dispatching UI messages. /* package */ final Handler mPrivateHandler = new PrivateHandler(); - private WebTextView mWebTextView; // Used to ignore changes to webkit text that arrives to the UI side after // more key events. private int mTextGeneration; @@ -964,10 +961,6 @@ public final class WebViewClassic implements WebViewProvider, WebViewProvider.Sc private float mLastDeferTouchX; private float mLastDeferTouchY; - // To keep track of whether the current drag was initiated by a WebTextView, - // so that we know not to hide the cursor - boolean mDragFromTextInput; - // Whether or not to draw the cursor ring. private boolean mDrawCursorRing = true; @@ -1079,8 +1072,6 @@ public final class WebViewClassic implements WebViewProvider, WebViewProvider.Sc static final int HANDLE_ID_BASE = 2; static final int HANDLE_ID_EXTENT = 3; - static boolean sDisableNavcache = false; - static boolean sEnableWebTextView = false; // the color used to highlight the touch rectangles static final int HIGHLIGHT_COLOR = 0x6633b5e5; // the region indicating where the user touched on the screen @@ -1113,7 +1104,6 @@ public final class WebViewClassic implements WebViewProvider, WebViewProvider.Sc private static final int SWITCH_TO_SHORTPRESS = 3; private static final int SWITCH_TO_LONGPRESS = 4; private static final int RELEASE_SINGLE_TAP = 5; - private static final int REQUEST_FORM_DATA = 6; private static final int DRAG_HELD_MOTIONLESS = 8; private static final int AWAKEN_SCROLL_BARS = 9; private static final int PREVENT_DEFAULT_TIMEOUT = 10; @@ -1128,7 +1118,6 @@ public final class WebViewClassic implements WebViewProvider, WebViewProvider.Sc */ static final int SCROLL_TO_MSG_ID = 101; static final int NEW_PICTURE_MSG_ID = 105; - static final int UPDATE_TEXT_ENTRY_MSG_ID = 106; static final int WEBCORE_INITIALIZED_MSG_ID = 107; static final int UPDATE_TEXTFIELD_TEXT_MSG_ID = 108; static final int UPDATE_ZOOM_RANGE = 109; @@ -1142,13 +1131,10 @@ public final class WebViewClassic implements WebViewProvider, WebViewProvider.Sc // obj=Rect in doc coordinates static final int INVAL_RECT_MSG_ID = 117; static final int REQUEST_KEYBOARD = 118; - static final int DO_MOTION_UP = 119; static final int SHOW_FULLSCREEN = 120; static final int HIDE_FULLSCREEN = 121; - static final int DOM_FOCUS_CHANGED = 122; static final int REPLACE_BASE_CONTENT = 123; static final int FORM_DID_BLUR = 124; - static final int RETURN_LABEL = 125; static final int UPDATE_MATCH_COUNT = 126; static final int CENTER_FIT_RECT = 127; static final int REQUEST_KEYBOARD_WITH_SELECTION_MSG_ID = 128; @@ -1160,10 +1146,8 @@ public final class WebViewClassic implements WebViewProvider, WebViewProvider.Sc static final int SET_AUTOFILLABLE = 133; static final int AUTOFILL_COMPLETE = 134; - static final int SELECT_AT = 135; static final int SCREEN_ON = 136; static final int ENTER_FULLSCREEN_VIDEO = 137; - static final int UPDATE_SELECTION = 138; static final int UPDATE_ZOOM_DENSITY = 139; static final int EXIT_FULLSCREEN_VIDEO = 140; @@ -1695,7 +1679,6 @@ public final class WebViewClassic implements WebViewProvider, WebViewProvider.Sc private void init() { OnTrimMemoryListener.init(mContext); - sDisableNavcache = nativeDisableNavcache(); mWebView.setWillNotDraw(false); mWebView.setFocusable(true); mWebView.setFocusableInTouchMode(true); @@ -2082,10 +2065,10 @@ public final class WebViewClassic implements WebViewProvider, WebViewProvider.Sc /** * Called to clear state when moving from one page to another, or changing * in some other way that makes elements associated with the current page - * (such as WebTextView or ActionModes) no longer relevant. + * (such as ActionModes) no longer relevant. */ private void clearHelpers() { - clearTextEntry(); + hideSoftKeyboard(); clearActionModes(); dismissFullScreenMode(); cancelSelectDialog(); @@ -2114,11 +2097,6 @@ public final class WebViewClassic implements WebViewProvider, WebViewProvider.Sc mListBoxDialog.dismiss(); mListBoxDialog = null; } - // remove so that it doesn't cause events - if (mWebTextView != null) { - mWebTextView.remove(); - mWebTextView = null; - } if (mNativeClass != 0) nativeStopGL(); if (mWebViewCore != null) { // Tell WebViewCore to destroy itself @@ -2833,7 +2811,6 @@ public final class WebViewClassic implements WebViewProvider, WebViewProvider.Sc if (mNativeClass == 0) { return false; } - nativeClearCursor(); // start next trackball movement from page edge if (top) { // go to the top of the document return pinScrollTo(getScrollX(), 0, true, 0); @@ -2860,7 +2837,6 @@ public final class WebViewClassic implements WebViewProvider, WebViewProvider.Sc if (mNativeClass == 0) { return false; } - nativeClearCursor(); // start next trackball movement from page edge if (bottom) { return pinScrollTo(getScrollX(), computeRealVerticalScrollRange(), true, 0); } @@ -2905,25 +2881,6 @@ public final class WebViewClassic implements WebViewProvider, WebViewProvider.Sc return result; } - /** - * Return true if the browser is displaying a TextView for text input. - */ - private boolean inEditingMode() { - return mWebTextView != null && mWebTextView.getParent() != null; - } - - /** - * Remove the WebTextView. - */ - private void clearTextEntry() { - if (inEditingMode()) { - mWebTextView.remove(); - } else { - // The keyboard may be open with the WebView as the served view - hideSoftKeyboard(); - } - } - /** * Return the current scale of the WebView * @return The current scale. @@ -2992,71 +2949,13 @@ public final class WebViewClassic implements WebViewProvider, WebViewProvider.Sc */ public HitTestResult getHitTestResult() { checkThread(); - return hitTestResult(mInitialHitTestResult); + return mInitialHitTestResult; } - private HitTestResult hitTestResult(HitTestResult fallback) { - if (mNativeClass == 0 || sDisableNavcache) { - return fallback; - } - - HitTestResult result = new HitTestResult(); - if (nativeHasCursorNode()) { - if (nativeCursorIsTextInput()) { - result.setType(HitTestResult.EDIT_TEXT_TYPE); - } else { - String text = nativeCursorText(); - if (text != null) { - if (text.startsWith(SCHEME_TEL)) { - result.setType(HitTestResult.PHONE_TYPE); - result.setExtra(URLDecoder.decode(text - .substring(SCHEME_TEL.length()))); - } else if (text.startsWith(SCHEME_MAILTO)) { - result.setType(HitTestResult.EMAIL_TYPE); - result.setExtra(text.substring(SCHEME_MAILTO.length())); - } else if (text.startsWith(SCHEME_GEO)) { - result.setType(HitTestResult.GEO_TYPE); - result.setExtra(URLDecoder.decode(text - .substring(SCHEME_GEO.length()))); - } else if (nativeCursorIsAnchor()) { - result.setType(HitTestResult.SRC_ANCHOR_TYPE); - result.setExtra(text); - } - } - } - } else if (fallback != null) { - /* If webkit causes a rebuild while the long press is in progress, - * the cursor node may be reset, even if it is still around. This - * uses the cursor node saved when the touch began. Since the - * nativeImageURI below only changes the result if it is successful, - * this uses the data beneath the touch if available or the original - * tap data otherwise. - */ - Log.v(LOGTAG, "hitTestResult use fallback"); - result = fallback; - } - int type = result.getType(); - if (type == HitTestResult.UNKNOWN_TYPE - || type == HitTestResult.SRC_ANCHOR_TYPE) { - // Now check to see if it is an image. - int contentX = viewToContentX(mLastTouchX + getScrollX()); - int contentY = viewToContentY(mLastTouchY + getScrollY()); - String text = nativeImageURI(contentX, contentY); - if (text != null) { - result.setType(type == HitTestResult.UNKNOWN_TYPE ? - HitTestResult.IMAGE_TYPE : - HitTestResult.SRC_IMAGE_ANCHOR_TYPE); - result.setExtra(text); - } - } - return result; - } + // No left edge for double-tap zoom alignment + static final int NO_LEFTEDGE = -1; int getBlockLeftEdge(int x, int y, float readingScale) { - if (!sDisableNavcache) { - return nativeGetBlockLeftEdge(x, y, readingScale); - } - float invReadingScale = 1.0f / readingScale; int readingWidth = (int) (getViewWidth() * invReadingScale); int left = NO_LEFTEDGE; @@ -3080,13 +2979,6 @@ public final class WebViewClassic implements WebViewProvider, WebViewProvider.Sc return left; } - // Called by JNI when the DOM has changed the focus. Clear the focus so - // that new keys will go to the newly focused field - private void domChangedFocus() { - if (inEditingMode()) { - mPrivateHandler.obtainMessage(DOM_FOCUS_CHANGED).sendToTarget(); - } - } /** * Request the anchor or image element URL at the last tapped point. * If hrefMsg is null, this method returns immediately and does not @@ -3116,17 +3008,6 @@ public final class WebViewClassic implements WebViewProvider, WebViewProvider.Sc hrefMsg.sendToTarget(); return; } - if (nativeHasCursorNode()) { - Rect cursorBounds = cursorRingBounds(); - if (!cursorBounds.contains(contentX, contentY)) { - int slop = viewToContentDimension(mNavSlop); - cursorBounds.inset(-slop, -slop); - if (cursorBounds.contains(contentX, contentY)) { - contentX = cursorBounds.centerX(); - contentY = cursorBounds.centerY(); - } - } - } mWebViewCore.sendMessage(EventHub.REQUEST_CURSOR_HREF, contentX, contentY, hrefMsg); } @@ -3141,11 +3022,9 @@ public final class WebViewClassic implements WebViewProvider, WebViewProvider.Sc public void requestImageRef(Message msg) { checkThread(); if (0 == mNativeClass) return; // client isn't initialized - int contentX = viewToContentX(mLastTouchX + getScrollX()); - int contentY = viewToContentY(mLastTouchY + getScrollY()); - String ref = nativeImageURI(contentX, contentY); + String url = mFocusedNode != null ? mFocusedNode.mImageUrl : null; Bundle data = msg.getData(); - data.putString("url", ref); + data.putString("url", url); msg.setData(data); msg.sendToTarget(); } @@ -3237,8 +3116,7 @@ public final class WebViewClassic implements WebViewProvider, WebViewProvider.Sc /** * Given an x coordinate in view space, convert it to content space. Also - * may be used for absolute heights (such as for the WebTextView's - * textSize, which is unaffected by the height of the title bar). + * may be used for absolute heights. */ /*package*/ int viewToContentX(int x) { return viewToContentDimension(x); @@ -3395,7 +3273,7 @@ public final class WebViewClassic implements WebViewProvider, WebViewProvider.Sc mScrollOffset.set(mVisibleRect.left, mVisibleRect.top); mWebViewCore.removeMessages(EventHub.SET_SCROLL_OFFSET); mWebViewCore.sendMessage(EventHub.SET_SCROLL_OFFSET, - nativeMoveGeneration(), mSendScrollEvent ? 1 : 0, mScrollOffset); + mSendScrollEvent ? 1 : 0, mScrollOffset); } mLastVisibleRectSent.set(mVisibleRect); mPrivateHandler.removeMessages(SWITCH_TO_LONGPRESS); @@ -3857,9 +3735,7 @@ public final class WebViewClassic implements WebViewProvider, WebViewProvider.Sc */ public void clearFormData() { checkThread(); - if (inEditingMode()) { - mWebTextView.setAdapterCustom(null); - } + // TODO: Implement b/6083041 } /** @@ -3998,8 +3874,6 @@ public final class WebViewClassic implements WebViewProvider, WebViewProvider.Sc */ private void setFindIsUp(boolean isUp) { mFindIsUp = isUp; - if (0 == mNativeClass) return; // client isn't initialized - nativeSetFindIsUp(isUp); } // Used to know whether the find dialog is open. Affects whether @@ -4741,9 +4615,103 @@ public final class WebViewClassic implements WebViewProvider, WebViewProvider.Sc return false; // We never call invalidate(), so unconditionally returning false. } - private void drawContent(Canvas canvas, boolean drawRings) { - drawCoreAndCursorRing(canvas, mBackgroundColor, - mDrawCursorRing && drawRings); + private void drawContent(Canvas canvas) { + if (mDrawHistory) { + canvas.scale(mZoomManager.getScale(), mZoomManager.getScale()); + canvas.drawPicture(mHistoryPicture); + return; + } + if (mNativeClass == 0) return; + + boolean animateZoom = mZoomManager.isFixedLengthAnimationInProgress(); + boolean animateScroll = ((!mScroller.isFinished() + || mVelocityTracker != null) + && (mTouchMode != TOUCH_DRAG_MODE || + mHeldMotionless != MOTIONLESS_TRUE)) + || mDeferTouchMode == TOUCH_DRAG_MODE; + if (mTouchMode == TOUCH_DRAG_MODE) { + if (mHeldMotionless == MOTIONLESS_PENDING) { + mPrivateHandler.removeMessages(DRAG_HELD_MOTIONLESS); + mPrivateHandler.removeMessages(AWAKEN_SCROLL_BARS); + mHeldMotionless = MOTIONLESS_FALSE; + } + if (mHeldMotionless == MOTIONLESS_FALSE) { + mPrivateHandler.sendMessageDelayed(mPrivateHandler + .obtainMessage(DRAG_HELD_MOTIONLESS), MOTIONLESS_TIME); + mPrivateHandler.sendMessageDelayed(mPrivateHandler + .obtainMessage(AWAKEN_SCROLL_BARS), + ViewConfiguration.getScrollDefaultDelay()); + mHeldMotionless = MOTIONLESS_PENDING; + } + } + int saveCount = canvas.save(); + if (animateZoom) { + mZoomManager.animateZoom(canvas); + } else if (!canvas.isHardwareAccelerated()) { + canvas.scale(mZoomManager.getScale(), mZoomManager.getScale()); + } + + boolean UIAnimationsRunning = false; + // Currently for each draw we compute the animation values; + // We may in the future decide to do that independently. + if (mNativeClass != 0 && !canvas.isHardwareAccelerated() + && nativeEvaluateLayersAnimations(mNativeClass)) { + UIAnimationsRunning = true; + // If we have unfinished (or unstarted) animations, + // we ask for a repaint. We only need to do this in software + // rendering (with hardware rendering we already have a different + // method of requesting a repaint) + mWebViewCore.sendMessage(EventHub.NOTIFY_ANIMATION_STARTED); + invalidate(); + } + + // decide which adornments to draw + int extras = DRAW_EXTRAS_NONE; + if (!mFindIsUp && mSelectingText) { + extras = DRAW_EXTRAS_SELECTION; + } + + calcOurContentVisibleRectF(mVisibleContentRect); + if (canvas.isHardwareAccelerated()) { + Rect glRectViewport = mGLViewportEmpty ? null : mGLRectViewport; + Rect viewRectViewport = mGLViewportEmpty ? null : mViewRectViewport; + + int functor = nativeGetDrawGLFunction(mNativeClass, glRectViewport, + viewRectViewport, mVisibleContentRect, getScale(), extras); + ((HardwareCanvas) canvas).callDrawGLFunction(functor); + if (mHardwareAccelSkia != getSettings().getHardwareAccelSkiaEnabled()) { + mHardwareAccelSkia = getSettings().getHardwareAccelSkiaEnabled(); + nativeUseHardwareAccelSkia(mHardwareAccelSkia); + } + + } else { + DrawFilter df = null; + if (mZoomManager.isZoomAnimating() || UIAnimationsRunning) { + df = mZoomFilter; + } else if (animateScroll) { + df = mScrollFilter; + } + canvas.setDrawFilter(df); + // XXX: Revisit splitting content. Right now it causes a + // synchronization problem with layers. + int content = nativeDraw(canvas, mVisibleContentRect, mBackgroundColor, + extras, false); + canvas.setDrawFilter(null); + if (!mBlockWebkitViewMessages && content != 0) { + mWebViewCore.sendMessage(EventHub.SPLIT_PICTURE_SET, content, 0); + } + } + + canvas.restoreToCount(saveCount); + if (mSelectingText) { + drawTextSelectionHandles(canvas); + } + + if (extras == DRAW_EXTRAS_CURSOR_RING) { + if (mTouchMode == TOUCH_SHORTPRESS_START_MODE) { + mTouchMode = TOUCH_SHORTPRESS_MODE; + } + } } /** @@ -4814,8 +4782,7 @@ public final class WebViewClassic implements WebViewProvider, WebViewProvider.Sc if (mTitleBar != null) { canvas.translate(0, getTitleHeight()); } - boolean drawNativeRings = !sDisableNavcache; - drawContent(canvas, drawNativeRings); + drawContent(canvas); canvas.restoreToCount(saveCount); if (AUTO_REDRAW_HACK && mAutoRedraw) { @@ -4885,28 +4852,6 @@ public final class WebViewClassic implements WebViewProvider, WebViewProvider.Sc return false; } - if (mNativeClass != 0 && nativeCursorIsTextInput()) { - // Send the click so that the textfield is in focus - centerKeyPressOnTextField(); - rebuildWebTextView(); - } else { - clearTextEntry(); - } - if (inEditingMode()) { - // Since we just called rebuildWebTextView, the layout is not set - // properly. Update it so it can correctly find the word to select. - mWebTextView.ensureLayout(); - // Provide a touch down event to WebTextView, which will allow it - // to store the location to use in performLongClick. - AbsoluteLayout.LayoutParams params - = (AbsoluteLayout.LayoutParams) mWebTextView.getLayoutParams(); - MotionEvent fake = MotionEvent.obtain(mLastTouchTime, - mLastTouchTime, MotionEvent.ACTION_DOWN, - mLastTouchX - params.x + getScrollX(), - mLastTouchY - params.y + getScrollY(), 0); - mWebTextView.dispatchTouchEvent(fake); - return mWebTextView.performLongClick(); - } if (mSelectingText) return false; // long click does nothing on selection /* if long click brings up a context menu, the super function * returns true and we're done. Otherwise, nothing happened when @@ -4969,69 +4914,6 @@ public final class WebViewClassic implements WebViewProvider, WebViewProvider.Sc */ private SelectActionModeCallback mSelectCallback; - // These values are possible options for didUpdateWebTextViewDimensions. - private static final int FULLY_ON_SCREEN = 0; - private static final int INTERSECTS_SCREEN = 1; - private static final int ANYWHERE = 2; - - /** - * Check to see if the focused textfield/textarea is still on screen. If it - * is, update the the dimensions and location of WebTextView. Otherwise, - * remove the WebTextView. Should be called when the zoom level changes. - * @param intersection How to determine whether the textfield/textarea is - * still on screen. - * @return boolean True if the textfield/textarea is still on screen and the - * dimensions/location of WebTextView have been updated. - */ - private boolean didUpdateWebTextViewDimensions(int intersection) { - Rect contentBounds = nativeFocusCandidateNodeBounds(); - Rect vBox = contentToViewRect(contentBounds); - Rect visibleRect = new Rect(); - calcOurVisibleRect(visibleRect); - offsetByLayerScrollPosition(vBox); - // If the textfield is on screen, place the WebTextView in - // its new place, accounting for our new scroll/zoom values, - // and adjust its textsize. - boolean onScreen; - switch (intersection) { - case FULLY_ON_SCREEN: - onScreen = visibleRect.contains(vBox); - break; - case INTERSECTS_SCREEN: - onScreen = Rect.intersects(visibleRect, vBox); - break; - case ANYWHERE: - onScreen = true; - break; - default: - throw new AssertionError( - "invalid parameter passed to didUpdateWebTextViewDimensions"); - } - if (onScreen) { - mWebTextView.setRect(vBox.left, vBox.top, vBox.width(), - vBox.height()); - mWebTextView.updateTextSize(); - updateWebTextViewPadding(); - return true; - } else { - // The textfield is now off screen. The user probably - // was not zooming to see the textfield better. Remove - // the WebTextView. If the user types a key, and the - // textfield is still in focus, we will reconstruct - // the WebTextView and scroll it back on screen. - mWebTextView.remove(); - return false; - } - } - - private void offsetByLayerScrollPosition(Rect box) { - if ((mCurrentScrollingLayerId != 0) - && (mCurrentScrollingLayerId == nativeFocusCandidateLayerId())) { - box.offsetTo(box.left - mScrollingLayerRect.left, - box.top - mScrollingLayerRect.top); - } - } - void setBaseLayer(int layer, Region invalRegion, boolean showVisualIndicator, boolean isPictureAfterFirstLayout) { if (mNativeClass == 0) @@ -5061,20 +4943,9 @@ public final class WebViewClassic implements WebViewProvider, WebViewProvider.Sc } private void onZoomAnimationStart() { - // If it is in password mode, turn it off so it does not draw misplaced. - if (inEditingMode()) { - mWebTextView.setVisibility(View.INVISIBLE); - } } private void onZoomAnimationEnd() { - // adjust the edit text view if needed - if (inEditingMode() - && didUpdateWebTextViewDimensions(FULLY_ON_SCREEN)) { - // If it is a password field, start drawing the WebTextView once - // again. - mWebTextView.setVisibility(View.VISIBLE); - } } void onFixedLengthZoomAnimationStart() { @@ -5101,128 +4972,6 @@ public final class WebViewClassic implements WebViewProvider, WebViewProvider.Sc private final DrawFilter mScrollFilter = new PaintFlagsDrawFilter(SCROLL_BITS, 0); - private void drawCoreAndCursorRing(Canvas canvas, int color, - boolean drawCursorRing) { - if (mDrawHistory) { - canvas.scale(mZoomManager.getScale(), mZoomManager.getScale()); - canvas.drawPicture(mHistoryPicture); - return; - } - if (mNativeClass == 0) return; - - boolean animateZoom = mZoomManager.isFixedLengthAnimationInProgress(); - boolean animateScroll = ((!mScroller.isFinished() - || mVelocityTracker != null) - && (mTouchMode != TOUCH_DRAG_MODE || - mHeldMotionless != MOTIONLESS_TRUE)) - || mDeferTouchMode == TOUCH_DRAG_MODE; - if (mTouchMode == TOUCH_DRAG_MODE) { - if (mHeldMotionless == MOTIONLESS_PENDING) { - mPrivateHandler.removeMessages(DRAG_HELD_MOTIONLESS); - mPrivateHandler.removeMessages(AWAKEN_SCROLL_BARS); - mHeldMotionless = MOTIONLESS_FALSE; - } - if (mHeldMotionless == MOTIONLESS_FALSE) { - mPrivateHandler.sendMessageDelayed(mPrivateHandler - .obtainMessage(DRAG_HELD_MOTIONLESS), MOTIONLESS_TIME); - mPrivateHandler.sendMessageDelayed(mPrivateHandler - .obtainMessage(AWAKEN_SCROLL_BARS), - ViewConfiguration.getScrollDefaultDelay()); - mHeldMotionless = MOTIONLESS_PENDING; - } - } - int saveCount = canvas.save(); - if (animateZoom) { - mZoomManager.animateZoom(canvas); - } else if (!canvas.isHardwareAccelerated()) { - canvas.scale(mZoomManager.getScale(), mZoomManager.getScale()); - } - - boolean UIAnimationsRunning = false; - // Currently for each draw we compute the animation values; - // We may in the future decide to do that independently. - if (mNativeClass != 0 && !canvas.isHardwareAccelerated() - && nativeEvaluateLayersAnimations(mNativeClass)) { - UIAnimationsRunning = true; - // If we have unfinished (or unstarted) animations, - // we ask for a repaint. We only need to do this in software - // rendering (with hardware rendering we already have a different - // method of requesting a repaint) - mWebViewCore.sendMessage(EventHub.NOTIFY_ANIMATION_STARTED); - invalidate(); - } - - // decide which adornments to draw - int extras = DRAW_EXTRAS_NONE; - if (!mFindIsUp) { - if (mSelectingText) { - extras = DRAW_EXTRAS_SELECTION; - } else if (drawCursorRing) { - extras = DRAW_EXTRAS_CURSOR_RING; - } - } - if (DebugFlags.WEB_VIEW) { - Log.v(LOGTAG, "mFindIsUp=" + mFindIsUp - + " mSelectingText=" + mSelectingText - + " nativePageShouldHandleShiftAndArrows()=" - + nativePageShouldHandleShiftAndArrows() - + " animateZoom=" + animateZoom - + " extras=" + extras); - } - - calcOurContentVisibleRectF(mVisibleContentRect); - if (canvas.isHardwareAccelerated()) { - Rect glRectViewport = mGLViewportEmpty ? null : mGLRectViewport; - Rect viewRectViewport = mGLViewportEmpty ? null : mViewRectViewport; - - int functor = nativeGetDrawGLFunction(mNativeClass, glRectViewport, - viewRectViewport, mVisibleContentRect, getScale(), extras); - ((HardwareCanvas) canvas).callDrawGLFunction(functor); - if (mHardwareAccelSkia != getSettings().getHardwareAccelSkiaEnabled()) { - mHardwareAccelSkia = getSettings().getHardwareAccelSkiaEnabled(); - nativeUseHardwareAccelSkia(mHardwareAccelSkia); - } - - } else { - DrawFilter df = null; - if (mZoomManager.isZoomAnimating() || UIAnimationsRunning) { - df = mZoomFilter; - } else if (animateScroll) { - df = mScrollFilter; - } - canvas.setDrawFilter(df); - // XXX: Revisit splitting content. Right now it causes a - // synchronization problem with layers. - int content = nativeDraw(canvas, mVisibleContentRect, color, - extras, false); - canvas.setDrawFilter(null); - if (!mBlockWebkitViewMessages && content != 0) { - mWebViewCore.sendMessage(EventHub.SPLIT_PICTURE_SET, content, 0); - } - } - - canvas.restoreToCount(saveCount); - if (mSelectingText) { - drawTextSelectionHandles(canvas); - } - - if (extras == DRAW_EXTRAS_CURSOR_RING) { - if (mTouchMode == TOUCH_SHORTPRESS_START_MODE) { - mTouchMode = TOUCH_SHORTPRESS_MODE; - } - } - if (mFocusSizeChanged) { - mFocusSizeChanged = false; - // If we are zooming, this will get handled above, when the zoom - // finishes. We also do not need to do this unless the WebTextView - // is showing. With hardware acceleration, the pageSwapCallback() - // updates the WebTextView position in sync with page swapping - if (!canvas.isHardwareAccelerated() && !animateZoom && inEditingMode()) { - didUpdateWebTextViewDimensions(ANYWHERE); - } - } - } - private void ensureSelectionHandles() { if (mSelectHandleCenter == null) { mSelectHandleCenter = mContext.getResources().getDrawable( @@ -5320,25 +5069,6 @@ public final class WebViewClassic implements WebViewProvider, WebViewProvider.Sc } } - // TODO: Remove this - WebViewCore.CursorData cursorData() { - if (sDisableNavcache) { - return new WebViewCore.CursorData(0, 0, 0, 0); - } - WebViewCore.CursorData result = cursorDataNoPosition(); - Point position = nativeCursorPosition(); - result.mX = position.x; - result.mY = position.y; - return result; - } - - WebViewCore.CursorData cursorDataNoPosition() { - WebViewCore.CursorData result = new WebViewCore.CursorData(); - result.mMoveGeneration = nativeMoveGeneration(); - result.mFrame = nativeCursorFramePointer(); - return result; - } - /** * Delete text from start to end in the focused textfield. If there is no * focus, or if start == end, silently fail. If start and end are out of @@ -5365,244 +5095,43 @@ public final class WebViewClassic implements WebViewProvider, WebViewProvider.Sc mWebViewCore.sendMessage(EventHub.SET_SELECTION, start, end); } } - - @Override - public InputConnection onCreateInputConnection(EditorInfo outAttrs) { - if (mInputConnection == null) { - mInputConnection = new WebViewInputConnection(); - } - mInputConnection.setupEditorInfo(outAttrs); - return mInputConnection; - } - - /** - * Called in response to a message from webkit telling us that the soft - * keyboard should be launched. - */ - private void displaySoftKeyboard(boolean isTextView) { - InputMethodManager imm = (InputMethodManager) - mContext.getSystemService(Context.INPUT_METHOD_SERVICE); - - // bring it back to the default level scale so that user can enter text - boolean zoom = mZoomManager.getScale() < mZoomManager.getDefaultScale(); - if (zoom) { - mZoomManager.setZoomCenter(mLastTouchX, mLastTouchY); - mZoomManager.setZoomScale(mZoomManager.getDefaultScale(), false); - } - if (isTextView) { - rebuildWebTextView(); - if (inEditingMode()) { - imm.showSoftInput(mWebTextView, 0, mWebTextView.getResultReceiver()); - if (zoom) { - didUpdateWebTextViewDimensions(INTERSECTS_SCREEN); - } - return; - } - } - // Used by plugins and contentEditable. - // Also used if the navigation cache is out of date, and - // does not recognize that a textfield is in focus. In that - // case, use WebView as the targeted view. - // see http://b/issue?id=2457459 - imm.showSoftInput(mWebView, 0); - } - - // Called by WebKit to instruct the UI to hide the keyboard - private void hideSoftKeyboard() { - InputMethodManager imm = InputMethodManager.peekInstance(); - if (imm != null && (imm.isActive(mWebView) - || (inEditingMode() && imm.isActive(mWebTextView)))) { - imm.hideSoftInputFromWindow(mWebView.getWindowToken(), 0); - } - } - - /* - * This method checks the current focus and cursor and potentially rebuilds - * mWebTextView to have the appropriate properties, such as password, - * multiline, and what text it contains. It also removes it if necessary. - */ - /* package */ void rebuildWebTextView() { - if (!sEnableWebTextView) { - return; // always use WebKit's text entry - } - // If the WebView does not have focus, do nothing until it gains focus. - if (!mWebView.hasFocus() && (null == mWebTextView || !mWebTextView.hasFocus())) { - return; - } - boolean alreadyThere = inEditingMode(); - // inEditingMode can only return true if mWebTextView is non-null, - // so we can safely call remove() if (alreadyThere) - if (0 == mNativeClass || !nativeFocusCandidateIsTextInput()) { - if (alreadyThere) { - mWebTextView.remove(); - } - return; - } - // At this point, we know we have found an input field, so go ahead - // and create the WebTextView if necessary. - if (mWebTextView == null) { - mWebTextView = new WebTextView(mContext, WebViewClassic.this, mAutoFillData.getQueryId()); - // Initialize our generation number. - mTextGeneration = 0; - } - mWebTextView.updateTextSize(); - updateWebTextViewPosition(); - String text = nativeFocusCandidateText(); - int nodePointer = nativeFocusCandidatePointer(); - // This needs to be called before setType, which may call - // requestFormData, and it needs to have the correct nodePointer. - mWebTextView.setNodePointer(nodePointer); - mWebTextView.setType(nativeFocusCandidateType()); - // Gravity needs to be set after setType - mWebTextView.setGravityForRtl(nativeFocusCandidateIsRtlText()); - if (null == text) { - if (DebugFlags.WEB_VIEW) { - Log.v(LOGTAG, "rebuildWebTextView null == text"); - } - text = ""; - } - mWebTextView.setTextAndKeepSelection(text); - InputMethodManager imm = InputMethodManager.peekInstance(); - if (imm != null && imm.isActive(mWebTextView)) { - imm.restartInput(mWebTextView); - mWebTextView.clearComposingText(); - } - if (mWebView.isFocused()) { - mWebTextView.requestFocus(); - } - } - - private void updateWebTextViewPosition() { - Rect visibleRect = new Rect(); - calcOurContentVisibleRect(visibleRect); - // Note that sendOurVisibleRect calls viewToContent, so the coordinates - // should be in content coordinates. - Rect bounds = nativeFocusCandidateNodeBounds(); - Rect vBox = contentToViewRect(bounds); - offsetByLayerScrollPosition(vBox); - mWebTextView.setRect(vBox.left, vBox.top, vBox.width(), vBox.height()); - if (!Rect.intersects(bounds, visibleRect)) { - revealSelection(); - } - updateWebTextViewPadding(); - } - - /** - * Update the padding of mWebTextView based on the native textfield/textarea - */ - void updateWebTextViewPadding() { - Rect paddingRect = nativeFocusCandidatePaddingRect(); - if (paddingRect != null) { - // Use contentToViewDimension since these are the dimensions of - // the padding. - mWebTextView.setPadding( - contentToViewDimension(paddingRect.left), - contentToViewDimension(paddingRect.top), - contentToViewDimension(paddingRect.right), - contentToViewDimension(paddingRect.bottom)); - } - } - - /** - * Tell webkit to put the cursor on screen. - */ - /* package */ void revealSelection() { - if (mWebViewCore != null) { - mWebViewCore.sendMessage(EventHub.REVEAL_SELECTION); - } - } - - /** - * Called by WebTextView to find saved form data associated with the - * textfield - * @param name Name of the textfield. - * @param nodePointer Pointer to the node of the textfield, so it can be - * compared to the currently focused textfield when the data is - * retrieved. - * @param autoFillable true if WebKit has determined this field is part of - * a form that can be auto filled. - * @param autoComplete true if the attribute "autocomplete" is set to true - * on the textfield. - */ - /* package */ void requestFormData(String name, int nodePointer, - boolean autoFillable, boolean autoComplete) { - if (mWebViewCore.getSettings().getSaveFormData()) { - Message update = mPrivateHandler.obtainMessage(REQUEST_FORM_DATA); - update.arg1 = nodePointer; - RequestFormData updater = new RequestFormData(name, getUrl(), - update, autoFillable, autoComplete); - Thread t = new Thread(updater); - t.start(); + + @Override + public InputConnection onCreateInputConnection(EditorInfo outAttrs) { + if (mInputConnection == null) { + mInputConnection = new WebViewInputConnection(); } + mInputConnection.setupEditorInfo(outAttrs); + return mInputConnection; } /** - * Pass a message to find out the