2013-12-18 09:08:35 +00:00
|
|
|
/*
|
|
|
|
* Copyright (C) 2013 The Android Open Source Project
|
|
|
|
*
|
|
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
|
|
* you may not use this file except in compliance with the License.
|
|
|
|
* You may obtain a copy of the License at
|
|
|
|
*
|
|
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
*
|
|
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
|
|
* See the License for the specific language governing permissions and
|
|
|
|
* limitations under the License.
|
|
|
|
*/
|
|
|
|
|
|
|
|
package com.android.inputmethod.latin.inputlogic;
|
|
|
|
|
2013-12-19 05:34:35 +00:00
|
|
|
import android.os.SystemClock;
|
2014-01-09 09:36:23 +00:00
|
|
|
import android.text.SpannableString;
|
2013-12-19 08:43:22 +00:00
|
|
|
import android.text.TextUtils;
|
2013-12-20 09:05:35 +00:00
|
|
|
import android.text.style.SuggestionSpan;
|
2013-12-19 07:07:24 +00:00
|
|
|
import android.util.Log;
|
|
|
|
import android.view.KeyCharacterMap;
|
|
|
|
import android.view.KeyEvent;
|
2013-12-19 09:18:18 +00:00
|
|
|
import android.view.inputmethod.CorrectionInfo;
|
2013-12-19 05:34:35 +00:00
|
|
|
import android.view.inputmethod.EditorInfo;
|
|
|
|
|
2013-12-19 07:07:24 +00:00
|
|
|
import com.android.inputmethod.compat.SuggestionSpanUtils;
|
2014-03-12 07:41:45 +00:00
|
|
|
import com.android.inputmethod.event.Event;
|
2014-03-04 06:29:54 +00:00
|
|
|
import com.android.inputmethod.event.InputTransaction;
|
2013-12-19 05:34:35 +00:00
|
|
|
import com.android.inputmethod.keyboard.KeyboardSwitcher;
|
2014-06-13 07:50:05 +00:00
|
|
|
import com.android.inputmethod.keyboard.ProximityInfo;
|
2013-12-19 05:34:35 +00:00
|
|
|
import com.android.inputmethod.latin.Constants;
|
2013-12-20 09:05:35 +00:00
|
|
|
import com.android.inputmethod.latin.Dictionary;
|
2014-05-23 00:30:55 +00:00
|
|
|
import com.android.inputmethod.latin.DictionaryFacilitator;
|
2013-12-20 11:45:59 +00:00
|
|
|
import com.android.inputmethod.latin.InputPointers;
|
2013-12-18 09:08:35 +00:00
|
|
|
import com.android.inputmethod.latin.LastComposedWord;
|
|
|
|
import com.android.inputmethod.latin.LatinIME;
|
2013-12-19 05:34:35 +00:00
|
|
|
import com.android.inputmethod.latin.LatinImeLogger;
|
2014-05-21 02:15:38 +00:00
|
|
|
import com.android.inputmethod.latin.PrevWordsInfo;
|
2013-12-18 09:08:35 +00:00
|
|
|
import com.android.inputmethod.latin.RichInputConnection;
|
|
|
|
import com.android.inputmethod.latin.Suggest;
|
2013-12-19 13:08:31 +00:00
|
|
|
import com.android.inputmethod.latin.Suggest.OnGetSuggestedWordsCallback;
|
2013-12-18 09:08:35 +00:00
|
|
|
import com.android.inputmethod.latin.SuggestedWords;
|
2013-12-20 09:05:35 +00:00
|
|
|
import com.android.inputmethod.latin.SuggestedWords.SuggestedWordInfo;
|
2013-12-18 09:08:35 +00:00
|
|
|
import com.android.inputmethod.latin.WordComposer;
|
2013-12-19 07:07:24 +00:00
|
|
|
import com.android.inputmethod.latin.settings.SettingsValues;
|
2014-01-09 08:27:33 +00:00
|
|
|
import com.android.inputmethod.latin.settings.SpacingAndPunctuations;
|
2014-01-24 14:17:40 +00:00
|
|
|
import com.android.inputmethod.latin.suggestions.SuggestionStripViewAccessor;
|
2013-12-19 13:08:31 +00:00
|
|
|
import com.android.inputmethod.latin.utils.AsyncResultHolder;
|
2013-12-19 05:34:35 +00:00
|
|
|
import com.android.inputmethod.latin.utils.InputTypeUtils;
|
2013-12-18 09:08:35 +00:00
|
|
|
import com.android.inputmethod.latin.utils.RecapitalizeStatus;
|
2013-12-19 07:07:24 +00:00
|
|
|
import com.android.inputmethod.latin.utils.StringUtils;
|
2013-12-20 09:05:35 +00:00
|
|
|
import com.android.inputmethod.latin.utils.TextRange;
|
2013-12-18 09:08:35 +00:00
|
|
|
|
2013-12-20 09:05:35 +00:00
|
|
|
import java.util.ArrayList;
|
2013-12-18 09:08:35 +00:00
|
|
|
import java.util.TreeSet;
|
2014-01-14 06:23:58 +00:00
|
|
|
import java.util.concurrent.TimeUnit;
|
2013-12-18 09:08:35 +00:00
|
|
|
|
|
|
|
/**
|
|
|
|
* This class manages the input logic.
|
|
|
|
*/
|
|
|
|
public final class InputLogic {
|
2013-12-19 07:07:24 +00:00
|
|
|
private static final String TAG = InputLogic.class.getSimpleName();
|
|
|
|
|
2013-12-18 09:08:35 +00:00
|
|
|
// TODO : Remove this member when we can.
|
|
|
|
private final LatinIME mLatinIME;
|
2014-01-24 14:17:40 +00:00
|
|
|
private final SuggestionStripViewAccessor mSuggestionStripViewAccessor;
|
2013-12-18 09:08:35 +00:00
|
|
|
|
2014-01-10 04:07:30 +00:00
|
|
|
// Never null.
|
|
|
|
private InputLogicHandler mInputLogicHandler = InputLogicHandler.NULL_HANDLER;
|
2013-12-24 07:30:55 +00:00
|
|
|
|
2013-12-18 09:08:35 +00:00
|
|
|
// TODO : make all these fields private as soon as possible.
|
|
|
|
// Current space state of the input method. This can be any of the above constants.
|
2014-02-28 09:56:05 +00:00
|
|
|
private int mSpaceState;
|
2013-12-18 09:08:35 +00:00
|
|
|
// Never null
|
|
|
|
public SuggestedWords mSuggestedWords = SuggestedWords.EMPTY;
|
2014-05-23 00:30:55 +00:00
|
|
|
public final Suggest mSuggest;
|
|
|
|
private final DictionaryFacilitator mDictionaryFacilitator;
|
2013-12-18 09:08:35 +00:00
|
|
|
|
|
|
|
public LastComposedWord mLastComposedWord = LastComposedWord.NOT_A_COMPOSED_WORD;
|
|
|
|
public final WordComposer mWordComposer;
|
|
|
|
public final RichInputConnection mConnection;
|
2014-02-28 09:56:05 +00:00
|
|
|
private final RecapitalizeStatus mRecapitalizeStatus = new RecapitalizeStatus();
|
2013-12-18 09:08:35 +00:00
|
|
|
|
2013-12-25 12:32:44 +00:00
|
|
|
private int mDeleteCount;
|
2013-12-19 10:29:05 +00:00
|
|
|
private long mLastKeyTime;
|
2014-05-23 11:18:17 +00:00
|
|
|
public final TreeSet<Long> mCurrentlyPressedHardwareKeys = new TreeSet<>();
|
2013-12-18 09:08:35 +00:00
|
|
|
|
|
|
|
// Keeps track of most recently inserted text (multi-character key) for reverting
|
2013-12-25 12:32:44 +00:00
|
|
|
private String mEnteredText;
|
2013-12-18 09:08:35 +00:00
|
|
|
|
|
|
|
// TODO: This boolean is persistent state and causes large side effects at unexpected times.
|
|
|
|
// Find a way to remove it for readability.
|
2014-02-28 09:56:05 +00:00
|
|
|
private boolean mIsAutoCorrectionIndicatorOn;
|
2014-03-05 06:55:45 +00:00
|
|
|
private long mDoubleSpacePeriodCountdownStart;
|
2013-12-18 09:08:35 +00:00
|
|
|
|
2014-05-08 05:53:56 +00:00
|
|
|
/**
|
|
|
|
* Create a new instance of the input logic.
|
|
|
|
* @param latinIME the instance of the parent LatinIME. We should remove this when we can.
|
|
|
|
* @param suggestionStripViewAccessor an object to access the suggestion strip view.
|
2014-05-23 00:30:55 +00:00
|
|
|
* @param dictionaryFacilitator facilitator for getting suggestions and updating user history
|
|
|
|
* dictionary.
|
2014-05-08 05:53:56 +00:00
|
|
|
*/
|
2014-01-24 14:17:40 +00:00
|
|
|
public InputLogic(final LatinIME latinIME,
|
2014-05-23 00:30:55 +00:00
|
|
|
final SuggestionStripViewAccessor suggestionStripViewAccessor,
|
|
|
|
final DictionaryFacilitator dictionaryFacilitator) {
|
2013-12-18 09:08:35 +00:00
|
|
|
mLatinIME = latinIME;
|
2014-01-24 14:17:40 +00:00
|
|
|
mSuggestionStripViewAccessor = suggestionStripViewAccessor;
|
2013-12-18 09:08:35 +00:00
|
|
|
mWordComposer = new WordComposer();
|
|
|
|
mConnection = new RichInputConnection(latinIME);
|
2014-01-10 04:07:30 +00:00
|
|
|
mInputLogicHandler = InputLogicHandler.NULL_HANDLER;
|
2014-05-23 00:30:55 +00:00
|
|
|
mSuggest = new Suggest(dictionaryFacilitator);
|
|
|
|
mDictionaryFacilitator = dictionaryFacilitator;
|
2013-12-18 09:08:35 +00:00
|
|
|
}
|
|
|
|
|
2013-12-19 10:29:05 +00:00
|
|
|
/**
|
|
|
|
* Initializes the input logic for input in an editor.
|
|
|
|
*
|
|
|
|
* Call this when input starts or restarts in some editor (typically, in onStartInputView).
|
|
|
|
*
|
2014-05-08 05:53:56 +00:00
|
|
|
* @param combiningSpec the combining spec string for this subtype
|
2013-12-19 10:29:05 +00:00
|
|
|
*/
|
2014-06-27 12:38:57 +00:00
|
|
|
public void startInput(final String combiningSpec) {
|
2013-12-25 12:03:24 +00:00
|
|
|
mEnteredText = null;
|
2014-05-14 11:19:16 +00:00
|
|
|
mWordComposer.restartCombining(combiningSpec);
|
2013-12-25 12:03:24 +00:00
|
|
|
resetComposingState(true /* alsoResetLastComposedWord */);
|
|
|
|
mDeleteCount = 0;
|
|
|
|
mSpaceState = SpaceState.NONE;
|
2014-06-04 06:38:41 +00:00
|
|
|
mRecapitalizeStatus.disable(); // Do not perform recapitalize until the cursor is moved once
|
2013-12-25 12:03:24 +00:00
|
|
|
mCurrentlyPressedHardwareKeys.clear();
|
|
|
|
mSuggestedWords = SuggestedWords.EMPTY;
|
|
|
|
// In some cases (namely, after rotation of the device) editorInfo.initialSelStart is lying
|
|
|
|
// so we try using some heuristics to find out about these and fix them.
|
2014-01-09 05:09:26 +00:00
|
|
|
mConnection.tryFixLyingCursorPosition();
|
2014-03-05 06:55:45 +00:00
|
|
|
cancelDoubleSpacePeriodCountdown();
|
2014-03-31 05:43:08 +00:00
|
|
|
if (InputLogicHandler.NULL_HANDLER == mInputLogicHandler) {
|
|
|
|
mInputLogicHandler = new InputLogicHandler(mLatinIME, this);
|
|
|
|
} else {
|
|
|
|
mInputLogicHandler.reset();
|
|
|
|
}
|
2013-12-19 07:07:24 +00:00
|
|
|
}
|
|
|
|
|
2014-05-08 05:53:56 +00:00
|
|
|
/**
|
|
|
|
* Call this when the subtype changes.
|
|
|
|
* @param combiningSpec the spec string for the combining rules
|
|
|
|
*/
|
|
|
|
public void onSubtypeChanged(final String combiningSpec) {
|
2014-06-27 12:38:57 +00:00
|
|
|
finishInput();
|
|
|
|
startInput(combiningSpec);
|
2014-05-08 05:53:56 +00:00
|
|
|
}
|
|
|
|
|
2013-12-19 10:29:05 +00:00
|
|
|
/**
|
|
|
|
* Clean up the input logic after input is finished.
|
|
|
|
*/
|
2013-12-19 07:07:24 +00:00
|
|
|
public void finishInput() {
|
2013-12-25 12:03:24 +00:00
|
|
|
if (mWordComposer.isComposingWord()) {
|
|
|
|
mConnection.finishComposingText();
|
|
|
|
}
|
|
|
|
resetComposingState(true /* alsoResetLastComposedWord */);
|
2014-03-31 05:43:08 +00:00
|
|
|
mInputLogicHandler.reset();
|
2013-12-18 09:08:35 +00:00
|
|
|
}
|
2013-12-19 05:34:35 +00:00
|
|
|
|
2014-04-07 13:32:06 +00:00
|
|
|
// Normally this class just gets out of scope after the process ends, but in unit tests, we
|
|
|
|
// create several instances of LatinIME in the same process, which results in several
|
|
|
|
// instances of InputLogic. This cleans up the associated handler so that tests don't leak
|
|
|
|
// handlers.
|
|
|
|
public void recycle() {
|
|
|
|
final InputLogicHandler inputLogicHandler = mInputLogicHandler;
|
|
|
|
mInputLogicHandler = InputLogicHandler.NULL_HANDLER;
|
|
|
|
inputLogicHandler.destroy();
|
2014-05-23 00:30:55 +00:00
|
|
|
mDictionaryFacilitator.closeDictionaries();
|
2014-04-07 13:32:06 +00:00
|
|
|
}
|
|
|
|
|
2013-12-20 06:44:26 +00:00
|
|
|
/**
|
|
|
|
* React to a string input.
|
|
|
|
*
|
|
|
|
* This is triggered by keys that input many characters at once, like the ".com" key or
|
|
|
|
* some additional keys for example.
|
|
|
|
*
|
|
|
|
* @param settingsValues the current values of the settings.
|
2014-03-19 06:59:49 +00:00
|
|
|
* @param event the input event containing the data.
|
2014-06-27 12:38:57 +00:00
|
|
|
* @return the complete transaction object
|
2013-12-20 06:44:26 +00:00
|
|
|
*/
|
2014-06-27 12:38:57 +00:00
|
|
|
public InputTransaction onTextInput(final SettingsValues settingsValues, final Event event,
|
|
|
|
final int keyboardShiftMode,
|
2013-12-25 12:04:27 +00:00
|
|
|
// TODO: remove this argument
|
|
|
|
final LatinIME.UIHandler handler) {
|
2014-03-19 06:59:49 +00:00
|
|
|
final String rawText = event.mText.toString();
|
2014-06-27 12:38:57 +00:00
|
|
|
final InputTransaction inputTransaction = new InputTransaction(settingsValues, event,
|
|
|
|
SystemClock.uptimeMillis(), mSpaceState,
|
|
|
|
getActualCapsMode(settingsValues, keyboardShiftMode));
|
2013-12-20 06:44:26 +00:00
|
|
|
mConnection.beginBatchEdit();
|
|
|
|
if (mWordComposer.isComposingWord()) {
|
2013-12-25 12:04:27 +00:00
|
|
|
commitCurrentAutoCorrection(settingsValues, rawText, handler);
|
2013-12-20 06:44:26 +00:00
|
|
|
} else {
|
|
|
|
resetComposingState(true /* alsoResetLastComposedWord */);
|
|
|
|
}
|
|
|
|
handler.postUpdateSuggestionStrip();
|
|
|
|
final String text = performSpecificTldProcessingOnTextInput(rawText);
|
|
|
|
if (SpaceState.PHANTOM == mSpaceState) {
|
|
|
|
promotePhantomSpace(settingsValues);
|
|
|
|
}
|
|
|
|
mConnection.commitText(text, 1);
|
|
|
|
mConnection.endBatchEdit();
|
|
|
|
// Space state must be updated before calling updateShiftState
|
|
|
|
mSpaceState = SpaceState.NONE;
|
|
|
|
mEnteredText = text;
|
2014-06-27 12:38:57 +00:00
|
|
|
inputTransaction.setDidAffectContents();
|
|
|
|
inputTransaction.requireShiftUpdate(InputTransaction.SHIFT_UPDATE_NOW);
|
|
|
|
return inputTransaction;
|
2013-12-20 06:44:26 +00:00
|
|
|
}
|
|
|
|
|
2014-01-29 07:15:12 +00:00
|
|
|
/**
|
|
|
|
* A suggestion was picked from the suggestion strip.
|
|
|
|
* @param settingsValues the current values of the settings.
|
|
|
|
* @param suggestionInfo the suggestion info.
|
2014-03-04 09:06:50 +00:00
|
|
|
* @param keyboardShiftState the shift state of the keyboard, as returned by
|
|
|
|
* {@link com.android.inputmethod.keyboard.KeyboardSwitcher#getKeyboardShiftMode()}
|
|
|
|
* @return the complete transaction object
|
2014-01-29 07:15:12 +00:00
|
|
|
*/
|
|
|
|
// Called from {@link SuggestionStripView} through the {@link SuggestionStripView#Listener}
|
|
|
|
// interface
|
2014-03-04 09:06:50 +00:00
|
|
|
public InputTransaction onPickSuggestionManually(final SettingsValues settingsValues,
|
2014-06-26 09:43:14 +00:00
|
|
|
final SuggestedWordInfo suggestionInfo, final int keyboardShiftState,
|
|
|
|
// TODO: remove these arguments
|
|
|
|
final int currentKeyboardScriptId, final LatinIME.UIHandler handler) {
|
2014-01-29 07:15:12 +00:00
|
|
|
final SuggestedWords suggestedWords = mSuggestedWords;
|
|
|
|
final String suggestion = suggestionInfo.mWord;
|
|
|
|
// If this is a punctuation picked from the suggestion strip, pass it to onCodeInput
|
2014-02-18 08:07:46 +00:00
|
|
|
if (suggestion.length() == 1 && suggestedWords.isPunctuationSuggestions()) {
|
2014-01-29 07:15:12 +00:00
|
|
|
// Word separators are suggested before the user inputs something.
|
|
|
|
// Rely on onCodeInput to do the complicated swapping/stripping logic consistently.
|
2014-03-18 06:14:27 +00:00
|
|
|
final Event event = Event.createPunctuationSuggestionPickedEvent(suggestionInfo);
|
2014-06-26 09:43:14 +00:00
|
|
|
return onCodeInput(settingsValues, event, keyboardShiftState,
|
|
|
|
currentKeyboardScriptId, handler);
|
2014-01-29 07:15:12 +00:00
|
|
|
}
|
|
|
|
|
2014-03-04 09:06:50 +00:00
|
|
|
final Event event = Event.createSuggestionPickedEvent(suggestionInfo);
|
|
|
|
final InputTransaction inputTransaction = new InputTransaction(settingsValues,
|
|
|
|
event, SystemClock.uptimeMillis(), mSpaceState, keyboardShiftState);
|
2014-06-27 12:38:57 +00:00
|
|
|
// Manual pick affects the contents of the editor, so we take note of this. It's important
|
|
|
|
// for the sequence of language switching.
|
|
|
|
inputTransaction.setDidAffectContents();
|
2014-01-29 07:15:12 +00:00
|
|
|
mConnection.beginBatchEdit();
|
|
|
|
if (SpaceState.PHANTOM == mSpaceState && suggestion.length() > 0
|
|
|
|
// In the batch input mode, a manually picked suggested word should just replace
|
|
|
|
// the current batch input text and there is no need for a phantom space.
|
|
|
|
&& !mWordComposer.isBatchMode()) {
|
|
|
|
final int firstChar = Character.codePointAt(suggestion, 0);
|
|
|
|
if (!settingsValues.isWordSeparator(firstChar)
|
|
|
|
|| settingsValues.isUsuallyPrecededBySpace(firstChar)) {
|
|
|
|
promotePhantomSpace(settingsValues);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-02-26 05:39:51 +00:00
|
|
|
// TODO: We should not need the following branch. We should be able to take the same
|
|
|
|
// code path as for other kinds, use commitChosenWord, and do everything normally. We will
|
|
|
|
// however need to reset the suggestion strip right away, because we know we can't take
|
|
|
|
// the risk of calling commitCompletion twice because we don't know how the app will react.
|
2014-05-26 09:45:32 +00:00
|
|
|
if (suggestionInfo.isKindOf(SuggestedWordInfo.KIND_APP_DEFINED)) {
|
2014-01-29 07:15:12 +00:00
|
|
|
mSuggestedWords = SuggestedWords.EMPTY;
|
|
|
|
mSuggestionStripViewAccessor.setNeutralSuggestionStrip();
|
2014-03-04 09:06:50 +00:00
|
|
|
inputTransaction.requireShiftUpdate(InputTransaction.SHIFT_UPDATE_NOW);
|
2014-01-29 07:15:12 +00:00
|
|
|
resetComposingState(true /* alsoResetLastComposedWord */);
|
2014-02-26 05:39:51 +00:00
|
|
|
mConnection.commitCompletion(suggestionInfo.mApplicationSpecifiedCompletionInfo);
|
2014-01-29 07:15:12 +00:00
|
|
|
mConnection.endBatchEdit();
|
2014-03-04 09:06:50 +00:00
|
|
|
return inputTransaction;
|
2014-01-29 07:15:12 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// We need to log before we commit, because the word composer will store away the user
|
|
|
|
// typed word.
|
|
|
|
final String replacedWord = mWordComposer.getTypedWord();
|
|
|
|
commitChosenWord(settingsValues, suggestion,
|
|
|
|
LastComposedWord.COMMIT_TYPE_MANUAL_PICK, LastComposedWord.NOT_A_SEPARATOR);
|
|
|
|
mConnection.endBatchEdit();
|
|
|
|
// Don't allow cancellation of manual pick
|
|
|
|
mLastComposedWord.deactivate();
|
|
|
|
// Space state must be updated before calling updateShiftState
|
|
|
|
mSpaceState = SpaceState.PHANTOM;
|
2014-03-04 09:06:50 +00:00
|
|
|
inputTransaction.requireShiftUpdate(InputTransaction.SHIFT_UPDATE_NOW);
|
2014-01-29 07:15:12 +00:00
|
|
|
|
|
|
|
// We should show the "Touch again to save" hint if the user pressed the first entry
|
|
|
|
// AND it's in none of our current dictionaries (main, user or otherwise).
|
|
|
|
final boolean showingAddToDictionaryHint =
|
2014-05-28 11:35:45 +00:00
|
|
|
(suggestionInfo.isKindOf(SuggestedWordInfo.KIND_TYPED)
|
|
|
|
|| suggestionInfo.isKindOf(SuggestedWordInfo.KIND_OOV_CORRECTION))
|
2014-05-23 00:30:55 +00:00
|
|
|
&& !mDictionaryFacilitator.isValidWord(suggestion, true /* ignoreCase */);
|
2014-01-29 07:15:12 +00:00
|
|
|
|
2014-05-23 00:30:55 +00:00
|
|
|
if (showingAddToDictionaryHint && mDictionaryFacilitator.isUserDictionaryEnabled()) {
|
2014-01-29 07:15:12 +00:00
|
|
|
mSuggestionStripViewAccessor.showAddToDictionaryHint(suggestion);
|
|
|
|
} else {
|
|
|
|
// If we're not showing the "Touch again to save", then update the suggestion strip.
|
|
|
|
handler.postUpdateSuggestionStrip();
|
|
|
|
}
|
2014-03-04 09:06:50 +00:00
|
|
|
return inputTransaction;
|
2014-01-29 07:15:12 +00:00
|
|
|
}
|
|
|
|
|
2014-01-24 05:00:26 +00:00
|
|
|
/**
|
|
|
|
* Consider an update to the cursor position. Evaluate whether this update has happened as
|
|
|
|
* part of normal typing or whether it was an explicit cursor move by the user. In any case,
|
|
|
|
* do the necessary adjustments.
|
|
|
|
* @param oldSelStart old selection start
|
|
|
|
* @param oldSelEnd old selection end
|
|
|
|
* @param newSelStart new selection start
|
|
|
|
* @param newSelEnd new selection end
|
|
|
|
* @return whether the cursor has moved as a result of user interaction.
|
|
|
|
*/
|
2014-03-03 05:19:52 +00:00
|
|
|
public boolean onUpdateSelection(final int oldSelStart, final int oldSelEnd,
|
|
|
|
final int newSelStart, final int newSelEnd) {
|
2014-01-24 05:09:42 +00:00
|
|
|
if (mConnection.isBelatedExpectedUpdate(oldSelStart, newSelStart, oldSelEnd, newSelEnd)) {
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
// TODO: the following is probably better done in resetEntireInputState().
|
|
|
|
// it should only happen when the cursor moved, and the very purpose of the
|
|
|
|
// test below is to narrow down whether this happened or not. Likewise with
|
|
|
|
// the call to updateShiftState.
|
|
|
|
// We set this to NONE because after a cursor move, we don't want the space
|
|
|
|
// state-related special processing to kick in.
|
|
|
|
mSpaceState = SpaceState.NONE;
|
2014-01-24 05:03:08 +00:00
|
|
|
|
2014-01-24 05:18:11 +00:00
|
|
|
final boolean selectionChangedOrSafeToReset =
|
|
|
|
oldSelStart != newSelStart || oldSelEnd != newSelEnd // selection changed
|
|
|
|
|| !mWordComposer.isComposingWord(); // safe to reset
|
2014-01-24 05:09:42 +00:00
|
|
|
final boolean hasOrHadSelection = (oldSelStart != oldSelEnd || newSelStart != newSelEnd);
|
|
|
|
final int moveAmount = newSelStart - oldSelStart;
|
Fix a bug on rotation with selection.
The symptom : when text is selected and the device is rotated,
sometimes the keyboard sets the word as being composed around
the start of the selection. Upon the next rotation this ends up
with the keyboard committing some text in place of the selection.
The cause : another bug in the framework with rotation >.>
The keyboard receives a call to startInput with a wrong cursor
position, namely one that does not represent a selection. The
keyboard sets a composition according to this wrong data. When
the keyboard is rotated again, it commits the text, which takes
the place of the selection.
The solution : actually when restarting input the keyboard
realizes that the cursor position is wrong. We cancel composition
at that time.
For robustness, this change also implements two other defensive
changes : upon call to onUpdateSelection, we actually realize
that the previous values were wrong, so we also fix it at that
time, and in addition, when rotating, we finishComposingText()
instead of commitText() which is less dangerous. Implementing
this later change also allows us to let less internal variables
from InputLogic escape to LatinIME, so it's also a good change
for design.
Bug: 14140799
Change-Id: Ib10de18e53e376ac1bbc8487e13d969828483346
2014-06-05 08:48:10 +00:00
|
|
|
// As an added small gift from the framework, it happens upon rotation when there
|
|
|
|
// is a selection that we get a wrong cursor position delivered to startInput() that
|
|
|
|
// does not get reflected in the oldSel{Start,End} parameters to the next call to
|
|
|
|
// onUpdateSelection. In this case, we may have set a composition, and when we're here
|
|
|
|
// we realize we shouldn't have. In theory, in this case, selectionChangedOrSafeToReset
|
|
|
|
// should be true, but that is if the framework had taken that wrong cursor position
|
|
|
|
// into account, which means we have to reset the entire composing state whenever there
|
|
|
|
// is or was a selection regardless of whether it changed or not.
|
|
|
|
if (hasOrHadSelection || (selectionChangedOrSafeToReset
|
|
|
|
&& !mWordComposer.moveCursorByAndReturnIfInsideComposingWord(moveAmount))) {
|
2014-01-24 05:09:42 +00:00
|
|
|
// If we are composing a word and moving the cursor, we would want to set a
|
|
|
|
// suggestion span for recorrection to work correctly. Unfortunately, that
|
|
|
|
// would involve the keyboard committing some new text, which would move the
|
|
|
|
// cursor back to where it was. Latin IME could then fix the position of the cursor
|
|
|
|
// again, but the asynchronous nature of the calls results in this wreaking havoc
|
|
|
|
// with selection on double tap and the like.
|
|
|
|
// Another option would be to send suggestions each time we set the composing
|
|
|
|
// text, but that is probably too expensive to do, so we decided to leave things
|
|
|
|
// as is.
|
2014-02-19 12:41:45 +00:00
|
|
|
// Also, we're posting a resume suggestions message, and this will update the
|
|
|
|
// suggestions strip in a few milliseconds, so if we cleared the suggestion strip here
|
|
|
|
// we'd have the suggestion strip noticeably janky. To avoid that, we don't clear
|
|
|
|
// it here, which means we'll keep outdated suggestions for a split second but the
|
|
|
|
// visual result is better.
|
2014-03-03 05:19:52 +00:00
|
|
|
resetEntireInputState(newSelStart, newSelEnd, false /* clearSuggestionStrip */);
|
2014-01-24 05:09:42 +00:00
|
|
|
} else {
|
|
|
|
// resetEntireInputState calls resetCachesUponCursorMove, but forcing the
|
|
|
|
// composition to end. But in all cases where we don't reset the entire input
|
|
|
|
// state, we still want to tell the rich input connection about the new cursor
|
|
|
|
// position so that it can update its caches.
|
|
|
|
mConnection.resetCachesUponCursorMoveAndReturnSuccess(
|
|
|
|
newSelStart, newSelEnd, false /* shouldFinishComposition */);
|
2014-01-24 05:00:26 +00:00
|
|
|
}
|
2014-01-24 05:09:42 +00:00
|
|
|
|
2014-06-04 06:38:41 +00:00
|
|
|
// The cursor has been moved : we now accept to perform recapitalization
|
|
|
|
mRecapitalizeStatus.enable();
|
2014-01-24 05:09:42 +00:00
|
|
|
// We moved the cursor. If we are touching a word, we need to resume suggestion.
|
2014-06-06 04:12:11 +00:00
|
|
|
mLatinIME.mHandler.postResumeSuggestions(false /* shouldIncludeResumedWordInSuggestions */);
|
2014-06-04 06:19:10 +00:00
|
|
|
// Stop the last recapitalization, if started.
|
|
|
|
mRecapitalizeStatus.stop();
|
2014-01-24 05:09:42 +00:00
|
|
|
return true;
|
2014-01-24 05:00:26 +00:00
|
|
|
}
|
|
|
|
|
2013-12-19 10:29:05 +00:00
|
|
|
/**
|
|
|
|
* React to a code input. It may be a code point to insert, or a symbolic value that influences
|
|
|
|
* the keyboard behavior.
|
|
|
|
*
|
|
|
|
* Typically, this is called whenever a key is pressed on the software keyboard. This is not
|
|
|
|
* the entry point for gesture input; see the onBatchInput* family of functions for this.
|
|
|
|
*
|
2014-03-04 08:28:20 +00:00
|
|
|
* @param settingsValues the current settings values.
|
2014-03-12 07:41:45 +00:00
|
|
|
* @param event the event to handle.
|
2014-03-04 08:28:20 +00:00
|
|
|
* @param keyboardShiftMode the current shift mode of the keyboard, as returned by
|
|
|
|
* {@link com.android.inputmethod.keyboard.KeyboardSwitcher#getKeyboardShiftMode()}
|
|
|
|
* @return the complete transaction object
|
2013-12-19 10:29:05 +00:00
|
|
|
*/
|
2014-03-12 07:41:45 +00:00
|
|
|
public InputTransaction onCodeInput(final SettingsValues settingsValues, final Event event,
|
|
|
|
final int keyboardShiftMode,
|
2014-06-26 09:43:14 +00:00
|
|
|
// TODO: remove these arguments
|
|
|
|
final int currentKeyboardScriptId, final LatinIME.UIHandler handler) {
|
2014-03-12 08:02:13 +00:00
|
|
|
final InputTransaction inputTransaction = new InputTransaction(settingsValues, event,
|
2014-03-04 07:31:51 +00:00
|
|
|
SystemClock.uptimeMillis(), mSpaceState,
|
2014-03-04 08:28:20 +00:00
|
|
|
getActualCapsMode(settingsValues, keyboardShiftMode));
|
2014-03-12 08:02:13 +00:00
|
|
|
if (event.mKeyCode != Constants.CODE_DELETE
|
2014-03-04 07:31:51 +00:00
|
|
|
|| inputTransaction.mTimestamp > mLastKeyTime + Constants.LONG_PRESS_MILLISECONDS) {
|
2013-12-19 05:34:35 +00:00
|
|
|
mDeleteCount = 0;
|
|
|
|
}
|
2014-03-04 07:31:51 +00:00
|
|
|
mLastKeyTime = inputTransaction.mTimestamp;
|
2013-12-19 05:34:35 +00:00
|
|
|
mConnection.beginBatchEdit();
|
|
|
|
if (!mWordComposer.isComposingWord()) {
|
|
|
|
mIsAutoCorrectionIndicatorOn = false;
|
|
|
|
}
|
|
|
|
|
|
|
|
// TODO: Consolidate the double-space period timer, mLastKeyTime, and the space state.
|
2014-03-12 08:02:13 +00:00
|
|
|
if (event.mCodePoint != Constants.CODE_SPACE) {
|
2014-03-05 06:55:45 +00:00
|
|
|
cancelDoubleSpacePeriodCountdown();
|
2013-12-19 05:34:35 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
boolean didAutoCorrect = false;
|
2014-06-25 07:50:27 +00:00
|
|
|
if (event.isFunctionalKeyEvent()) {
|
2014-03-12 08:02:13 +00:00
|
|
|
// A special key, like delete, shift, emoji, or the settings key.
|
|
|
|
switch (event.mKeyCode) {
|
|
|
|
case Constants.CODE_DELETE:
|
2014-06-26 09:43:14 +00:00
|
|
|
handleBackspace(inputTransaction, currentKeyboardScriptId);
|
2014-06-27 12:38:57 +00:00
|
|
|
// Backspace is a functional key, but it affects the contents of the editor.
|
|
|
|
inputTransaction.setDidAffectContents();
|
2014-03-12 08:02:13 +00:00
|
|
|
break;
|
|
|
|
case Constants.CODE_SHIFT:
|
|
|
|
performRecapitalization(inputTransaction.mSettingsValues);
|
|
|
|
inputTransaction.requireShiftUpdate(InputTransaction.SHIFT_UPDATE_NOW);
|
2014-06-13 08:17:35 +00:00
|
|
|
if (mSuggestedWords.mIsPrediction) {
|
|
|
|
inputTransaction.setRequiresUpdateSuggestions();
|
|
|
|
}
|
2014-03-12 08:02:13 +00:00
|
|
|
break;
|
|
|
|
case Constants.CODE_CAPSLOCK:
|
|
|
|
// Note: Changing keyboard to shift lock state is handled in
|
|
|
|
// {@link KeyboardSwitcher#onCodeInput(int)}.
|
|
|
|
break;
|
|
|
|
case Constants.CODE_SYMBOL_SHIFT:
|
|
|
|
// Note: Calling back to the keyboard on the symbol Shift key is handled in
|
|
|
|
// {@link #onPressKey(int,int,boolean)} and {@link #onReleaseKey(int,boolean)}.
|
|
|
|
break;
|
|
|
|
case Constants.CODE_SWITCH_ALPHA_SYMBOL:
|
|
|
|
// Note: Calling back to the keyboard on symbol key is handled in
|
|
|
|
// {@link #onPressKey(int,int,boolean)} and {@link #onReleaseKey(int,boolean)}.
|
|
|
|
break;
|
|
|
|
case Constants.CODE_SETTINGS:
|
|
|
|
onSettingsKeyPressed();
|
|
|
|
break;
|
|
|
|
case Constants.CODE_SHORTCUT:
|
|
|
|
// We need to switch to the shortcut IME. This is handled by LatinIME since the
|
|
|
|
// input logic has no business with IME switching.
|
|
|
|
break;
|
|
|
|
case Constants.CODE_ACTION_NEXT:
|
|
|
|
performEditorAction(EditorInfo.IME_ACTION_NEXT);
|
|
|
|
break;
|
|
|
|
case Constants.CODE_ACTION_PREVIOUS:
|
|
|
|
performEditorAction(EditorInfo.IME_ACTION_PREVIOUS);
|
|
|
|
break;
|
|
|
|
case Constants.CODE_LANGUAGE_SWITCH:
|
|
|
|
handleLanguageSwitchKey();
|
|
|
|
break;
|
|
|
|
case Constants.CODE_EMOJI:
|
|
|
|
// Note: Switching emoji keyboard is being handled in
|
|
|
|
// {@link KeyboardState#onCodeInput(int,int)}.
|
|
|
|
break;
|
|
|
|
case Constants.CODE_ALPHA_FROM_EMOJI:
|
|
|
|
// Note: Switching back from Emoji keyboard to the main keyboard is being
|
|
|
|
// handled in {@link KeyboardState#onCodeInput(int,int)}.
|
|
|
|
break;
|
|
|
|
case Constants.CODE_SHIFT_ENTER:
|
|
|
|
// TODO: remove this object
|
2014-04-24 00:39:34 +00:00
|
|
|
final Event tmpEvent = Event.createSoftwareKeypressEvent(Constants.CODE_ENTER,
|
|
|
|
event.mKeyCode, event.mX, event.mY, event.isKeyRepeat());
|
2014-03-12 08:02:13 +00:00
|
|
|
final InputTransaction tmpTransaction = new InputTransaction(
|
2014-04-24 00:39:34 +00:00
|
|
|
inputTransaction.mSettingsValues, tmpEvent,
|
2014-03-12 08:02:13 +00:00
|
|
|
inputTransaction.mTimestamp, inputTransaction.mSpaceState,
|
|
|
|
inputTransaction.mShiftState);
|
|
|
|
didAutoCorrect = handleNonSpecialCharacter(tmpTransaction, handler);
|
2014-06-27 12:38:57 +00:00
|
|
|
// Shift + Enter is treated as a functional key but it results in adding a new
|
|
|
|
// line, so that does affect the contents of the editor.
|
|
|
|
inputTransaction.setDidAffectContents();
|
2014-03-12 08:02:13 +00:00
|
|
|
break;
|
|
|
|
default:
|
|
|
|
throw new RuntimeException("Unknown key code : " + event.mKeyCode);
|
|
|
|
}
|
|
|
|
} else {
|
2014-06-27 12:38:57 +00:00
|
|
|
inputTransaction.setDidAffectContents();
|
2014-03-12 08:02:13 +00:00
|
|
|
switch (event.mCodePoint) {
|
|
|
|
case Constants.CODE_ENTER:
|
|
|
|
final EditorInfo editorInfo = getCurrentInputEditorInfo();
|
|
|
|
final int imeOptionsActionId =
|
|
|
|
InputTypeUtils.getImeOptionsActionIdFromEditorInfo(editorInfo);
|
|
|
|
if (InputTypeUtils.IME_ACTION_CUSTOM_LABEL == imeOptionsActionId) {
|
|
|
|
// Either we have an actionLabel and we should performEditorAction with
|
|
|
|
// actionId regardless of its value.
|
|
|
|
performEditorAction(editorInfo.actionId);
|
|
|
|
} else if (EditorInfo.IME_ACTION_NONE != imeOptionsActionId) {
|
|
|
|
// We didn't have an actionLabel, but we had another action to execute.
|
|
|
|
// EditorInfo.IME_ACTION_NONE explicitly means no action. In contrast,
|
|
|
|
// EditorInfo.IME_ACTION_UNSPECIFIED is the default value for an action, so it
|
|
|
|
// means there should be an action and the app didn't bother to set a specific
|
|
|
|
// code for it - presumably it only handles one. It does not have to be treated
|
|
|
|
// in any specific way: anything that is not IME_ACTION_NONE should be sent to
|
|
|
|
// performEditorAction.
|
|
|
|
performEditorAction(imeOptionsActionId);
|
|
|
|
} else {
|
|
|
|
// No action label, and the action from imeOptions is NONE: this is a regular
|
|
|
|
// enter key that should input a carriage return.
|
|
|
|
didAutoCorrect = handleNonSpecialCharacter(inputTransaction, handler);
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
default:
|
2014-03-04 07:46:42 +00:00
|
|
|
didAutoCorrect = handleNonSpecialCharacter(inputTransaction, handler);
|
2014-03-12 08:02:13 +00:00
|
|
|
break;
|
2013-12-19 05:34:35 +00:00
|
|
|
}
|
|
|
|
}
|
2014-03-12 08:02:13 +00:00
|
|
|
if (!didAutoCorrect && event.mKeyCode != Constants.CODE_SHIFT
|
|
|
|
&& event.mKeyCode != Constants.CODE_CAPSLOCK
|
|
|
|
&& event.mKeyCode != Constants.CODE_SWITCH_ALPHA_SYMBOL)
|
2013-12-19 05:34:35 +00:00
|
|
|
mLastComposedWord.deactivate();
|
2014-03-12 08:02:13 +00:00
|
|
|
if (Constants.CODE_DELETE != event.mKeyCode) {
|
2013-12-19 05:34:35 +00:00
|
|
|
mEnteredText = null;
|
|
|
|
}
|
|
|
|
mConnection.endBatchEdit();
|
2014-03-04 08:28:20 +00:00
|
|
|
return inputTransaction;
|
2013-12-19 05:34:35 +00:00
|
|
|
}
|
|
|
|
|
2013-12-20 11:45:59 +00:00
|
|
|
public void onStartBatchInput(final SettingsValues settingsValues,
|
|
|
|
// TODO: remove these arguments
|
2013-12-25 12:04:27 +00:00
|
|
|
final KeyboardSwitcher keyboardSwitcher, final LatinIME.UIHandler handler) {
|
|
|
|
mInputLogicHandler.onStartBatchInput();
|
2013-12-24 09:07:20 +00:00
|
|
|
handler.showGesturePreviewAndSuggestionStrip(
|
|
|
|
SuggestedWords.EMPTY, false /* dismissGestureFloatingPreviewText */);
|
2013-12-20 11:45:59 +00:00
|
|
|
handler.cancelUpdateSuggestionStrip();
|
2014-02-21 07:43:11 +00:00
|
|
|
++mAutoCommitSequenceNumber;
|
2013-12-20 11:45:59 +00:00
|
|
|
mConnection.beginBatchEdit();
|
|
|
|
if (mWordComposer.isComposingWord()) {
|
|
|
|
if (mWordComposer.isCursorFrontOrMiddleOfComposingWord()) {
|
|
|
|
// If we are in the middle of a recorrection, we need to commit the recorrection
|
|
|
|
// first so that we can insert the batch input at the current cursor position.
|
2014-03-03 05:19:52 +00:00
|
|
|
resetEntireInputState(mConnection.getExpectedSelectionStart(),
|
2014-02-19 12:41:45 +00:00
|
|
|
mConnection.getExpectedSelectionEnd(), true /* clearSuggestionStrip */);
|
2014-03-28 05:35:38 +00:00
|
|
|
} else if (mWordComposer.isSingleLetter()) {
|
2013-12-20 11:45:59 +00:00
|
|
|
// We auto-correct the previous (typed, not gestured) string iff it's one character
|
|
|
|
// long. The reason for this is, even in the middle of gesture typing, you'll still
|
|
|
|
// tap one-letter words and you want them auto-corrected (typically, "i" in English
|
|
|
|
// should become "I"). However for any longer word, we assume that the reason for
|
|
|
|
// tapping probably is that the word you intend to type is not in the dictionary,
|
|
|
|
// so we do not attempt to correct, on the assumption that if that was a dictionary
|
|
|
|
// word, the user would probably have gestured instead.
|
|
|
|
commitCurrentAutoCorrection(settingsValues, LastComposedWord.NOT_A_SEPARATOR,
|
2013-12-25 12:04:27 +00:00
|
|
|
handler);
|
2013-12-20 11:45:59 +00:00
|
|
|
} else {
|
|
|
|
commitTyped(settingsValues, LastComposedWord.NOT_A_SEPARATOR);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
final int codePointBeforeCursor = mConnection.getCodePointBeforeCursor();
|
|
|
|
if (Character.isLetterOrDigit(codePointBeforeCursor)
|
|
|
|
|| settingsValues.isUsuallyFollowedBySpace(codePointBeforeCursor)) {
|
|
|
|
final boolean autoShiftHasBeenOverriden = keyboardSwitcher.getKeyboardShiftMode() !=
|
|
|
|
getCurrentAutoCapsState(settingsValues);
|
|
|
|
mSpaceState = SpaceState.PHANTOM;
|
|
|
|
if (!autoShiftHasBeenOverriden) {
|
|
|
|
// When we change the space state, we need to update the shift state of the
|
|
|
|
// keyboard unless it has been overridden manually. This is happening for example
|
|
|
|
// after typing some letters and a period, then gesturing; the keyboard is not in
|
|
|
|
// caps mode yet, but since a gesture is starting, it should go in caps mode,
|
|
|
|
// unless the user explictly said it should not.
|
2014-03-27 09:37:16 +00:00
|
|
|
keyboardSwitcher.requestUpdatingShiftState(getCurrentAutoCapsState(settingsValues),
|
|
|
|
getCurrentRecapitalizeState());
|
2013-12-20 11:45:59 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
mConnection.endBatchEdit();
|
2014-06-09 10:31:41 +00:00
|
|
|
mWordComposer.setCapitalizedModeAtStartComposingTime(
|
|
|
|
getActualCapsMode(settingsValues, keyboardSwitcher.getKeyboardShiftMode()));
|
2013-12-20 11:45:59 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* The sequence number member is only used in onUpdateBatchInput. It is increased each time
|
|
|
|
* auto-commit happens. The reason we need this is, when auto-commit happens we trim the
|
|
|
|
* input pointers that are held in a singleton, and to know how much to trim we rely on the
|
|
|
|
* results of the suggestion process that is held in mSuggestedWords.
|
|
|
|
* However, the suggestion process is asynchronous, and sometimes we may enter the
|
|
|
|
* onUpdateBatchInput method twice without having recomputed suggestions yet, or having
|
|
|
|
* received new suggestions generated from not-yet-trimmed input pointers. In this case, the
|
|
|
|
* mIndexOfTouchPointOfSecondWords member will be out of date, and we must not use it lest we
|
|
|
|
* remove an unrelated number of pointers (possibly even more than are left in the input
|
|
|
|
* pointers, leading to a crash).
|
|
|
|
* To avoid that, we increase the sequence number each time we auto-commit and trim the
|
|
|
|
* input pointers, and we do not use any suggested words that have been generated with an
|
|
|
|
* earlier sequence number.
|
|
|
|
*/
|
|
|
|
private int mAutoCommitSequenceNumber = 1;
|
|
|
|
public void onUpdateBatchInput(final SettingsValues settingsValues,
|
|
|
|
final InputPointers batchPointers,
|
|
|
|
// TODO: remove these arguments
|
2013-12-25 12:04:27 +00:00
|
|
|
final KeyboardSwitcher keyboardSwitcher) {
|
2013-12-20 11:45:59 +00:00
|
|
|
if (settingsValues.mPhraseGestureEnabled) {
|
|
|
|
final SuggestedWordInfo candidate = mSuggestedWords.getAutoCommitCandidate();
|
|
|
|
// If these suggested words have been generated with out of date input pointers, then
|
|
|
|
// we skip auto-commit (see comments above on the mSequenceNumber member).
|
|
|
|
if (null != candidate
|
|
|
|
&& mSuggestedWords.mSequenceNumber >= mAutoCommitSequenceNumber) {
|
|
|
|
if (candidate.mSourceDict.shouldAutoCommit(candidate)) {
|
2014-05-12 09:04:43 +00:00
|
|
|
final String[] commitParts = candidate.mWord.split(Constants.WORD_SEPARATOR, 2);
|
2013-12-20 11:45:59 +00:00
|
|
|
batchPointers.shift(candidate.mIndexOfTouchPointOfSecondWord);
|
|
|
|
promotePhantomSpace(settingsValues);
|
|
|
|
mConnection.commitText(commitParts[0], 0);
|
|
|
|
mSpaceState = SpaceState.PHANTOM;
|
2014-03-27 09:37:16 +00:00
|
|
|
keyboardSwitcher.requestUpdatingShiftState(
|
|
|
|
getCurrentAutoCapsState(settingsValues), getCurrentRecapitalizeState());
|
2014-06-09 10:31:41 +00:00
|
|
|
mWordComposer.setCapitalizedModeAtStartComposingTime(getActualCapsMode(
|
|
|
|
settingsValues, keyboardSwitcher.getKeyboardShiftMode()));
|
2013-12-20 11:45:59 +00:00
|
|
|
++mAutoCommitSequenceNumber;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2013-12-25 12:04:27 +00:00
|
|
|
mInputLogicHandler.onUpdateBatchInput(batchPointers, mAutoCommitSequenceNumber);
|
2013-12-20 11:45:59 +00:00
|
|
|
}
|
|
|
|
|
2014-03-03 05:19:52 +00:00
|
|
|
public void onEndBatchInput(final InputPointers batchPointers) {
|
2014-03-06 07:10:15 +00:00
|
|
|
mInputLogicHandler.updateTailBatchInput(batchPointers, mAutoCommitSequenceNumber);
|
2014-02-21 07:43:11 +00:00
|
|
|
++mAutoCommitSequenceNumber;
|
2013-12-20 11:45:59 +00:00
|
|
|
}
|
|
|
|
|
2013-12-25 12:04:27 +00:00
|
|
|
// TODO: remove this argument
|
|
|
|
public void onCancelBatchInput(final LatinIME.UIHandler handler) {
|
|
|
|
mInputLogicHandler.onCancelBatchInput();
|
2013-12-24 09:07:20 +00:00
|
|
|
handler.showGesturePreviewAndSuggestionStrip(
|
|
|
|
SuggestedWords.EMPTY, true /* dismissGestureFloatingPreviewText */);
|
2013-12-20 11:45:59 +00:00
|
|
|
}
|
|
|
|
|
2014-01-24 12:57:34 +00:00
|
|
|
// TODO: on the long term, this method should become private, but it will be difficult.
|
|
|
|
// Especially, how do we deal with InputMethodService.onDisplayCompletions?
|
|
|
|
public void setSuggestedWords(final SuggestedWords suggestedWords) {
|
|
|
|
mSuggestedWords = suggestedWords;
|
|
|
|
final boolean newAutoCorrectionIndicator = suggestedWords.mWillAutoCorrect;
|
|
|
|
// Put a blue underline to a word in TextView which will be auto-corrected.
|
|
|
|
if (mIsAutoCorrectionIndicatorOn != newAutoCorrectionIndicator
|
|
|
|
&& mWordComposer.isComposingWord()) {
|
|
|
|
mIsAutoCorrectionIndicatorOn = newAutoCorrectionIndicator;
|
|
|
|
final CharSequence textWithUnderline =
|
|
|
|
getTextWithUnderline(mWordComposer.getTypedWord());
|
|
|
|
// TODO: when called from an updateSuggestionStrip() call that results from a posted
|
|
|
|
// message, this is called outside any batch edit. Potentially, this may result in some
|
|
|
|
// janky flickering of the screen, although the display speed makes it unlikely in
|
|
|
|
// the practice.
|
|
|
|
mConnection.setComposingText(textWithUnderline, 1);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-12-19 05:34:35 +00:00
|
|
|
/**
|
|
|
|
* Handle inputting a code point to the editor.
|
|
|
|
*
|
|
|
|
* Non-special keys are those that generate a single code point.
|
|
|
|
* This includes all letters, digits, punctuation, separators, emoji. It excludes keys that
|
|
|
|
* manage keyboard-related stuff like shift, language switch, settings, layout switch, or
|
|
|
|
* any key that results in multiple code points like the ".com" key.
|
|
|
|
*
|
2014-03-04 06:29:54 +00:00
|
|
|
* @param inputTransaction The transaction in progress.
|
2013-12-19 05:34:35 +00:00
|
|
|
* @return whether this caused an auto-correction to happen.
|
|
|
|
*/
|
2014-03-04 07:46:42 +00:00
|
|
|
private boolean handleNonSpecialCharacter(final InputTransaction inputTransaction,
|
2014-03-04 06:29:54 +00:00
|
|
|
// TODO: remove this argument
|
|
|
|
final LatinIME.UIHandler handler) {
|
2014-03-12 08:02:13 +00:00
|
|
|
final int codePoint = inputTransaction.mEvent.mCodePoint;
|
2013-12-19 07:37:07 +00:00
|
|
|
mSpaceState = SpaceState.NONE;
|
|
|
|
final boolean didAutoCorrect;
|
2014-03-12 08:02:13 +00:00
|
|
|
if (inputTransaction.mSettingsValues.isWordSeparator(codePoint)
|
|
|
|
|| Character.getType(codePoint) == Character.OTHER_SYMBOL) {
|
2014-03-04 07:46:42 +00:00
|
|
|
didAutoCorrect = handleSeparator(inputTransaction,
|
2014-03-12 08:02:13 +00:00
|
|
|
inputTransaction.mEvent.isSuggestionStripPress(), handler);
|
2013-12-19 07:37:07 +00:00
|
|
|
} else {
|
|
|
|
didAutoCorrect = false;
|
2014-03-04 07:31:51 +00:00
|
|
|
if (SpaceState.PHANTOM == inputTransaction.mSpaceState) {
|
2013-12-19 07:37:07 +00:00
|
|
|
if (mWordComposer.isCursorFrontOrMiddleOfComposingWord()) {
|
|
|
|
// If we are in the middle of a recorrection, we need to commit the recorrection
|
|
|
|
// first so that we can insert the character at the current cursor position.
|
2014-03-03 05:19:52 +00:00
|
|
|
resetEntireInputState(mConnection.getExpectedSelectionStart(),
|
2014-02-19 12:41:45 +00:00
|
|
|
mConnection.getExpectedSelectionEnd(), true /* clearSuggestionStrip */);
|
2013-12-19 07:37:07 +00:00
|
|
|
} else {
|
2014-03-04 07:46:42 +00:00
|
|
|
commitTyped(inputTransaction.mSettingsValues, LastComposedWord.NOT_A_SEPARATOR);
|
2013-12-19 07:37:07 +00:00
|
|
|
}
|
|
|
|
}
|
2014-03-05 07:37:44 +00:00
|
|
|
handleNonSeparator(inputTransaction.mSettingsValues, inputTransaction);
|
2013-12-19 07:37:07 +00:00
|
|
|
}
|
|
|
|
return didAutoCorrect;
|
2013-12-19 05:34:35 +00:00
|
|
|
}
|
|
|
|
|
2013-12-19 08:57:10 +00:00
|
|
|
/**
|
|
|
|
* Handle a non-separator.
|
|
|
|
* @param settingsValues The current settings values.
|
2014-03-04 06:29:54 +00:00
|
|
|
* @param inputTransaction The transaction in progress.
|
2013-12-19 08:57:10 +00:00
|
|
|
*/
|
|
|
|
private void handleNonSeparator(final SettingsValues settingsValues,
|
2014-03-05 07:37:44 +00:00
|
|
|
final InputTransaction inputTransaction) {
|
2014-03-12 08:02:13 +00:00
|
|
|
final int codePoint = inputTransaction.mEvent.mCodePoint;
|
2013-12-19 08:57:10 +00:00
|
|
|
// TODO: refactor this method to stop flipping isComposingWord around all the time, and
|
|
|
|
// make it shorter (possibly cut into several pieces). Also factor handleNonSpecialCharacter
|
|
|
|
// which has the same name as other handle* methods but is not the same.
|
|
|
|
boolean isComposingWord = mWordComposer.isComposingWord();
|
|
|
|
|
|
|
|
// TODO: remove isWordConnector() and use isUsuallyFollowedBySpace() instead.
|
|
|
|
// See onStartBatchInput() to see how to do it.
|
2014-03-04 07:31:51 +00:00
|
|
|
if (SpaceState.PHANTOM == inputTransaction.mSpaceState
|
2014-03-12 08:02:13 +00:00
|
|
|
&& !settingsValues.isWordConnector(codePoint)) {
|
2013-12-19 08:57:10 +00:00
|
|
|
if (isComposingWord) {
|
|
|
|
// Sanity check
|
|
|
|
throw new RuntimeException("Should not be composing here");
|
|
|
|
}
|
|
|
|
promotePhantomSpace(settingsValues);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (mWordComposer.isCursorFrontOrMiddleOfComposingWord()) {
|
|
|
|
// If we are in the middle of a recorrection, we need to commit the recorrection
|
|
|
|
// first so that we can insert the character at the current cursor position.
|
2014-03-03 05:19:52 +00:00
|
|
|
resetEntireInputState(mConnection.getExpectedSelectionStart(),
|
2014-02-19 12:41:45 +00:00
|
|
|
mConnection.getExpectedSelectionEnd(), true /* clearSuggestionStrip */);
|
2013-12-19 08:57:10 +00:00
|
|
|
isComposingWord = false;
|
|
|
|
}
|
|
|
|
// We want to find out whether to start composing a new word with this character. If so,
|
|
|
|
// we need to reset the composing state and switch isComposingWord. The order of the
|
|
|
|
// tests is important for good performance.
|
|
|
|
// We only start composing if we're not already composing.
|
|
|
|
if (!isComposingWord
|
|
|
|
// We only start composing if this is a word code point. Essentially that means it's a
|
|
|
|
// a letter or a word connector.
|
2014-03-12 08:02:13 +00:00
|
|
|
&& settingsValues.isWordCodePoint(codePoint)
|
2013-12-19 08:57:10 +00:00
|
|
|
// We never go into composing state if suggestions are not requested.
|
2013-12-20 07:34:38 +00:00
|
|
|
&& settingsValues.isSuggestionsRequested() &&
|
2013-12-19 08:57:10 +00:00
|
|
|
// In languages with spaces, we only start composing a word when we are not already
|
|
|
|
// touching a word. In languages without spaces, the above conditions are sufficient.
|
2014-01-17 04:14:29 +00:00
|
|
|
(!mConnection.isCursorTouchingWord(settingsValues.mSpacingAndPunctuations)
|
2014-01-08 09:06:32 +00:00
|
|
|
|| !settingsValues.mSpacingAndPunctuations.mCurrentLanguageHasSpaces)) {
|
2013-12-19 08:57:10 +00:00
|
|
|
// Reset entirely the composing state anyway, then start composing a new word unless
|
2014-05-30 11:30:17 +00:00
|
|
|
// the character is a word connector. The idea here is, word connectors are not
|
|
|
|
// separators and they should be treated as normal characters, except in the first
|
|
|
|
// position where they should not start composing a word.
|
|
|
|
isComposingWord = !settingsValues.mSpacingAndPunctuations.isWordConnector(codePoint);
|
2013-12-19 08:57:10 +00:00
|
|
|
// Here we don't need to reset the last composed word. It will be reset
|
|
|
|
// when we commit this one, if we ever do; if on the other hand we backspace
|
|
|
|
// it entirely and resume suggestions on the previous word, we'd like to still
|
|
|
|
// have touch coordinates for it.
|
|
|
|
resetComposingState(false /* alsoResetLastComposedWord */);
|
|
|
|
}
|
|
|
|
if (isComposingWord) {
|
2014-03-27 07:12:58 +00:00
|
|
|
mWordComposer.processEvent(inputTransaction.mEvent);
|
2013-12-19 08:57:10 +00:00
|
|
|
// If it's the first letter, make note of auto-caps state
|
2014-03-28 05:35:38 +00:00
|
|
|
if (mWordComposer.isSingleLetter()) {
|
2014-06-09 10:31:41 +00:00
|
|
|
mWordComposer.setCapitalizedModeAtStartComposingTime(inputTransaction.mShiftState);
|
2013-12-19 08:57:10 +00:00
|
|
|
}
|
|
|
|
mConnection.setComposingText(getTextWithUnderline(
|
|
|
|
mWordComposer.getTypedWord()), 1);
|
|
|
|
} else {
|
2014-06-20 07:41:23 +00:00
|
|
|
final boolean swapWeakSpace = tryStripSpaceAndReturnWhetherShouldSwapInstead(
|
|
|
|
inputTransaction, inputTransaction.mEvent.isSuggestionStripPress());
|
2013-12-19 08:57:10 +00:00
|
|
|
|
2014-06-20 07:41:23 +00:00
|
|
|
if (swapWeakSpace && trySwapSwapperAndSpace(inputTransaction)) {
|
2013-12-19 08:57:10 +00:00
|
|
|
mSpaceState = SpaceState.WEAK;
|
2014-06-20 07:41:23 +00:00
|
|
|
} else {
|
|
|
|
sendKeyCodePoint(settingsValues, codePoint);
|
2013-12-19 08:57:10 +00:00
|
|
|
}
|
|
|
|
// In case the "add to dictionary" hint was still displayed.
|
2014-01-24 14:17:40 +00:00
|
|
|
mSuggestionStripViewAccessor.dismissAddToDictionaryHint();
|
2013-12-19 08:57:10 +00:00
|
|
|
}
|
2014-03-05 07:37:44 +00:00
|
|
|
inputTransaction.setRequiresUpdateSuggestions();
|
2013-12-19 08:57:10 +00:00
|
|
|
}
|
|
|
|
|
2013-12-19 08:14:11 +00:00
|
|
|
/**
|
|
|
|
* Handle input of a separator code point.
|
2014-03-04 06:29:54 +00:00
|
|
|
* @param inputTransaction The transaction in progress.
|
2014-03-04 07:46:42 +00:00
|
|
|
* @param isFromSuggestionStrip whether this code point comes from the suggestion strip.
|
2013-12-19 08:14:11 +00:00
|
|
|
* @return whether this caused an auto-correction to happen.
|
|
|
|
*/
|
2014-03-04 07:46:42 +00:00
|
|
|
private boolean handleSeparator(final InputTransaction inputTransaction,
|
|
|
|
final boolean isFromSuggestionStrip,
|
2014-03-04 06:29:54 +00:00
|
|
|
// TODO: remove this argument
|
|
|
|
final LatinIME.UIHandler handler) {
|
2014-03-12 08:02:13 +00:00
|
|
|
final int codePoint = inputTransaction.mEvent.mCodePoint;
|
2014-05-01 03:33:59 +00:00
|
|
|
final SettingsValues settingsValues = inputTransaction.mSettingsValues;
|
2013-12-19 08:14:11 +00:00
|
|
|
boolean didAutoCorrect = false;
|
2014-05-29 06:43:40 +00:00
|
|
|
final boolean wasComposingWord = mWordComposer.isComposingWord();
|
2013-12-19 08:14:11 +00:00
|
|
|
// We avoid sending spaces in languages without spaces if we were composing.
|
2014-03-12 08:02:13 +00:00
|
|
|
final boolean shouldAvoidSendingCode = Constants.CODE_SPACE == codePoint
|
2014-05-01 03:33:59 +00:00
|
|
|
&& !settingsValues.mSpacingAndPunctuations.mCurrentLanguageHasSpaces
|
2014-05-29 06:43:40 +00:00
|
|
|
&& wasComposingWord;
|
2013-12-19 08:14:11 +00:00
|
|
|
if (mWordComposer.isCursorFrontOrMiddleOfComposingWord()) {
|
|
|
|
// If we are in the middle of a recorrection, we need to commit the recorrection
|
|
|
|
// first so that we can insert the separator at the current cursor position.
|
2014-03-03 05:19:52 +00:00
|
|
|
resetEntireInputState(mConnection.getExpectedSelectionStart(),
|
2014-02-19 12:41:45 +00:00
|
|
|
mConnection.getExpectedSelectionEnd(), true /* clearSuggestionStrip */);
|
2013-12-19 08:14:11 +00:00
|
|
|
}
|
|
|
|
// isComposingWord() may have changed since we stored wasComposing
|
|
|
|
if (mWordComposer.isComposingWord()) {
|
2014-06-05 09:04:11 +00:00
|
|
|
if (settingsValues.mAutoCorrectionEnabled) {
|
2013-12-19 08:14:11 +00:00
|
|
|
final String separator = shouldAvoidSendingCode ? LastComposedWord.NOT_A_SEPARATOR
|
2014-03-12 08:02:13 +00:00
|
|
|
: StringUtils.newSingleCodePointString(codePoint);
|
2014-05-01 03:33:59 +00:00
|
|
|
commitCurrentAutoCorrection(settingsValues, separator, handler);
|
2013-12-19 08:14:11 +00:00
|
|
|
didAutoCorrect = true;
|
|
|
|
} else {
|
2014-05-01 03:33:59 +00:00
|
|
|
commitTyped(settingsValues,
|
2014-03-12 08:02:13 +00:00
|
|
|
StringUtils.newSingleCodePointString(codePoint));
|
2013-12-19 08:14:11 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-06-20 07:41:23 +00:00
|
|
|
final boolean swapWeakSpace = tryStripSpaceAndReturnWhetherShouldSwapInstead(
|
|
|
|
inputTransaction, isFromSuggestionStrip);
|
2013-12-19 08:14:11 +00:00
|
|
|
|
2014-03-12 08:02:13 +00:00
|
|
|
final boolean isInsideDoubleQuoteOrAfterDigit = Constants.CODE_DOUBLE_QUOTE == codePoint
|
2014-01-17 01:40:05 +00:00
|
|
|
&& mConnection.isInsideDoubleQuoteOrAfterDigit();
|
|
|
|
|
|
|
|
final boolean needsPrecedingSpace;
|
2014-03-04 07:31:51 +00:00
|
|
|
if (SpaceState.PHANTOM != inputTransaction.mSpaceState) {
|
2014-01-17 01:40:05 +00:00
|
|
|
needsPrecedingSpace = false;
|
2014-03-12 08:02:13 +00:00
|
|
|
} else if (Constants.CODE_DOUBLE_QUOTE == codePoint) {
|
2014-01-17 01:40:05 +00:00
|
|
|
// Double quotes behave like they are usually preceded by space iff we are
|
|
|
|
// not inside a double quote or after a digit.
|
|
|
|
needsPrecedingSpace = !isInsideDoubleQuoteOrAfterDigit;
|
2014-05-01 03:33:59 +00:00
|
|
|
} else if (settingsValues.mSpacingAndPunctuations.isClusteringSymbol(codePoint)
|
|
|
|
&& settingsValues.mSpacingAndPunctuations.isClusteringSymbol(
|
|
|
|
mConnection.getCodePointBeforeCursor())) {
|
|
|
|
needsPrecedingSpace = false;
|
2014-01-17 01:40:05 +00:00
|
|
|
} else {
|
2014-05-01 03:33:59 +00:00
|
|
|
needsPrecedingSpace = settingsValues.isUsuallyPrecededBySpace(codePoint);
|
2014-01-17 01:40:05 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
if (needsPrecedingSpace) {
|
2014-05-01 03:33:59 +00:00
|
|
|
promotePhantomSpace(settingsValues);
|
2013-12-19 08:14:11 +00:00
|
|
|
}
|
|
|
|
|
2014-06-20 07:41:23 +00:00
|
|
|
if (tryPerformDoubleSpacePeriod(inputTransaction)) {
|
|
|
|
mSpaceState = SpaceState.DOUBLE;
|
|
|
|
inputTransaction.setRequiresUpdateSuggestions();
|
|
|
|
} else if (swapWeakSpace && trySwapSwapperAndSpace(inputTransaction)) {
|
|
|
|
mSpaceState = SpaceState.SWAP_PUNCTUATION;
|
|
|
|
mSuggestionStripViewAccessor.setNeutralSuggestionStrip();
|
|
|
|
} else if (Constants.CODE_SPACE == codePoint) {
|
|
|
|
if (!mSuggestedWords.isPunctuationSuggestions()) {
|
2014-04-03 07:25:05 +00:00
|
|
|
mSpaceState = SpaceState.WEAK;
|
2013-12-19 08:14:11 +00:00
|
|
|
}
|
|
|
|
|
2014-03-05 06:55:45 +00:00
|
|
|
startDoubleSpacePeriodCountdown(inputTransaction);
|
2014-06-13 08:17:35 +00:00
|
|
|
if (wasComposingWord || mSuggestedWords.isEmpty()) {
|
2014-05-29 06:43:40 +00:00
|
|
|
inputTransaction.setRequiresUpdateSuggestions();
|
|
|
|
}
|
2014-06-20 07:41:23 +00:00
|
|
|
|
|
|
|
if (!shouldAvoidSendingCode) {
|
|
|
|
sendKeyCodePoint(settingsValues, codePoint);
|
|
|
|
}
|
2013-12-19 08:14:11 +00:00
|
|
|
} else {
|
2014-06-20 07:41:23 +00:00
|
|
|
if ((SpaceState.PHANTOM == inputTransaction.mSpaceState
|
2014-05-01 03:33:59 +00:00
|
|
|
&& settingsValues.isUsuallyFollowedBySpace(codePoint))
|
2014-03-12 08:02:13 +00:00
|
|
|
|| (Constants.CODE_DOUBLE_QUOTE == codePoint
|
2014-01-17 01:40:05 +00:00
|
|
|
&& isInsideDoubleQuoteOrAfterDigit)) {
|
2013-12-19 08:14:11 +00:00
|
|
|
// If we are in phantom space state, and the user presses a separator, we want to
|
|
|
|
// stay in phantom space state so that the next keypress has a chance to add the
|
|
|
|
// space. For example, if I type "Good dat", pick "day" from the suggestion strip
|
|
|
|
// then insert a comma and go on to typing the next word, I want the space to be
|
|
|
|
// inserted automatically before the next word, the same way it is when I don't
|
2014-01-17 01:40:05 +00:00
|
|
|
// input the comma. A double quote behaves like it's usually followed by space if
|
|
|
|
// we're inside a double quote.
|
2013-12-19 08:14:11 +00:00
|
|
|
// The case is a little different if the separator is a space stripper. Such a
|
|
|
|
// separator does not normally need a space on the right (that's the difference
|
|
|
|
// between swappers and strippers), so we should not stay in phantom space state if
|
|
|
|
// the separator is a stripper. Hence the additional test above.
|
|
|
|
mSpaceState = SpaceState.PHANTOM;
|
|
|
|
}
|
|
|
|
|
2014-06-20 07:41:23 +00:00
|
|
|
sendKeyCodePoint(settingsValues, codePoint);
|
|
|
|
|
2013-12-19 08:14:11 +00:00
|
|
|
// Set punctuation right away. onUpdateSelection will fire but tests whether it is
|
|
|
|
// already displayed or not, so it's okay.
|
2014-01-24 14:17:40 +00:00
|
|
|
mSuggestionStripViewAccessor.setNeutralSuggestionStrip();
|
2013-12-19 08:14:11 +00:00
|
|
|
}
|
|
|
|
|
2014-03-04 06:29:54 +00:00
|
|
|
inputTransaction.requireShiftUpdate(InputTransaction.SHIFT_UPDATE_NOW);
|
2013-12-19 08:14:11 +00:00
|
|
|
return didAutoCorrect;
|
|
|
|
}
|
|
|
|
|
2013-12-19 05:34:35 +00:00
|
|
|
/**
|
|
|
|
* Handle a press on the backspace key.
|
2014-03-04 06:29:54 +00:00
|
|
|
* @param inputTransaction The transaction in progress.
|
2013-12-19 05:34:35 +00:00
|
|
|
*/
|
2014-06-26 09:43:14 +00:00
|
|
|
private void handleBackspace(final InputTransaction inputTransaction,
|
|
|
|
// TODO: remove this argument, put it into settingsValues
|
|
|
|
final int currentKeyboardScriptId) {
|
2013-12-19 10:29:05 +00:00
|
|
|
mSpaceState = SpaceState.NONE;
|
2013-12-19 07:07:24 +00:00
|
|
|
mDeleteCount++;
|
|
|
|
|
2014-03-31 10:43:12 +00:00
|
|
|
// In many cases after backspace, we need to update the shift state. Normally we need
|
|
|
|
// to do this right away to avoid the shift state being out of date in case the user types
|
|
|
|
// backspace then some other character very fast. However, in the case of backspace key
|
|
|
|
// repeat, this can lead to flashiness when the cursor flies over positions where the
|
|
|
|
// shift state should be updated, so if this is a key repeat, we update after a small delay.
|
|
|
|
// Then again, even in the case of a key repeat, if the cursor is at start of text, it
|
|
|
|
// can't go any further back, so we can update right away even if it's a key repeat.
|
|
|
|
final int shiftUpdateKind =
|
|
|
|
inputTransaction.mEvent.isKeyRepeat() && mConnection.getExpectedSelectionStart() > 0
|
|
|
|
? InputTransaction.SHIFT_UPDATE_LATER : InputTransaction.SHIFT_UPDATE_NOW;
|
|
|
|
inputTransaction.requireShiftUpdate(shiftUpdateKind);
|
2013-12-19 07:07:24 +00:00
|
|
|
|
|
|
|
if (mWordComposer.isCursorFrontOrMiddleOfComposingWord()) {
|
|
|
|
// If we are in the middle of a recorrection, we need to commit the recorrection
|
|
|
|
// first so that we can remove the character at the current cursor position.
|
2014-03-03 05:19:52 +00:00
|
|
|
resetEntireInputState(mConnection.getExpectedSelectionStart(),
|
2014-02-19 12:41:45 +00:00
|
|
|
mConnection.getExpectedSelectionEnd(), true /* clearSuggestionStrip */);
|
2013-12-19 07:07:24 +00:00
|
|
|
// When we exit this if-clause, mWordComposer.isComposingWord() will return false.
|
|
|
|
}
|
|
|
|
if (mWordComposer.isComposingWord()) {
|
|
|
|
if (mWordComposer.isBatchMode()) {
|
|
|
|
final String rejectedSuggestion = mWordComposer.getTypedWord();
|
|
|
|
mWordComposer.reset();
|
|
|
|
mWordComposer.setRejectedBatchModeSuggestion(rejectedSuggestion);
|
2014-06-20 05:46:13 +00:00
|
|
|
if (!TextUtils.isEmpty(rejectedSuggestion)) {
|
|
|
|
mDictionaryFacilitator.removeWordFromPersonalizedDicts(rejectedSuggestion);
|
|
|
|
}
|
2013-12-19 07:07:24 +00:00
|
|
|
} else {
|
2014-03-27 07:12:58 +00:00
|
|
|
mWordComposer.processEvent(inputTransaction.mEvent);
|
2013-12-19 07:07:24 +00:00
|
|
|
}
|
2014-05-14 07:55:32 +00:00
|
|
|
if (mWordComposer.isComposingWord()) {
|
|
|
|
mConnection.setComposingText(getTextWithUnderline(mWordComposer.getTypedWord()), 1);
|
|
|
|
} else {
|
|
|
|
mConnection.commitText("", 1);
|
|
|
|
}
|
2014-03-05 07:37:44 +00:00
|
|
|
inputTransaction.setRequiresUpdateSuggestions();
|
2013-12-19 07:07:24 +00:00
|
|
|
} else {
|
|
|
|
if (mLastComposedWord.canRevertCommit()) {
|
2014-03-05 07:37:44 +00:00
|
|
|
revertCommit(inputTransaction);
|
2013-12-19 07:07:24 +00:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
if (mEnteredText != null && mConnection.sameAsTextBeforeCursor(mEnteredText)) {
|
|
|
|
// Cancel multi-character input: remove the text we just entered.
|
|
|
|
// This is triggered on backspace after a key that inputs multiple characters,
|
|
|
|
// like the smiley key or the .com key.
|
|
|
|
mConnection.deleteSurroundingText(mEnteredText.length(), 0);
|
|
|
|
mEnteredText = null;
|
|
|
|
// If we have mEnteredText, then we know that mHasUncommittedTypedChars == false.
|
|
|
|
// In addition we know that spaceState is false, and that we should not be
|
|
|
|
// reverting any autocorrect at this point. So we can safely return.
|
|
|
|
return;
|
|
|
|
}
|
2014-03-04 07:31:51 +00:00
|
|
|
if (SpaceState.DOUBLE == inputTransaction.mSpaceState) {
|
2014-03-05 06:55:45 +00:00
|
|
|
cancelDoubleSpacePeriodCountdown();
|
2013-12-19 07:07:24 +00:00
|
|
|
if (mConnection.revertDoubleSpacePeriod()) {
|
|
|
|
// No need to reset mSpaceState, it has already be done (that's why we
|
|
|
|
// receive it as a parameter)
|
2014-05-29 06:43:40 +00:00
|
|
|
inputTransaction.setRequiresUpdateSuggestions();
|
2014-06-09 10:31:41 +00:00
|
|
|
mWordComposer.setCapitalizedModeAtStartComposingTime(
|
|
|
|
WordComposer.CAPS_MODE_OFF);
|
2013-12-19 07:07:24 +00:00
|
|
|
return;
|
|
|
|
}
|
2014-03-04 07:31:51 +00:00
|
|
|
} else if (SpaceState.SWAP_PUNCTUATION == inputTransaction.mSpaceState) {
|
2013-12-19 07:07:24 +00:00
|
|
|
if (mConnection.revertSwapPunctuation()) {
|
|
|
|
// Likewise
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// No cancelling of commit/double space/swap: we have a regular backspace.
|
|
|
|
// We should backspace one char and restart suggestion if at the end of a word.
|
2014-01-09 05:09:26 +00:00
|
|
|
if (mConnection.hasSelection()) {
|
2013-12-19 07:07:24 +00:00
|
|
|
// If there is a selection, remove it.
|
2014-01-09 05:09:26 +00:00
|
|
|
final int numCharsDeleted = mConnection.getExpectedSelectionEnd()
|
|
|
|
- mConnection.getExpectedSelectionStart();
|
|
|
|
mConnection.setSelection(mConnection.getExpectedSelectionEnd(),
|
|
|
|
mConnection.getExpectedSelectionEnd());
|
2013-12-19 07:07:24 +00:00
|
|
|
mConnection.deleteSurroundingText(numCharsDeleted, 0);
|
|
|
|
} else {
|
|
|
|
// There is no selection, just delete one character.
|
2014-01-09 05:09:26 +00:00
|
|
|
if (Constants.NOT_A_CURSOR_POSITION == mConnection.getExpectedSelectionEnd()) {
|
2013-12-19 07:07:24 +00:00
|
|
|
// This should never happen.
|
|
|
|
Log.e(TAG, "Backspace when we don't know the selection position");
|
|
|
|
}
|
2014-03-04 07:46:42 +00:00
|
|
|
if (inputTransaction.mSettingsValues.isBeforeJellyBean() ||
|
|
|
|
inputTransaction.mSettingsValues.mInputAttributes.isTypeNull()) {
|
2013-12-19 07:07:24 +00:00
|
|
|
// There are two possible reasons to send a key event: either the field has
|
|
|
|
// type TYPE_NULL, in which case the keyboard should send events, or we are
|
|
|
|
// running in backward compatibility mode. Before Jelly bean, the keyboard
|
|
|
|
// would simulate a hardware keyboard event on pressing enter or delete. This
|
|
|
|
// is bad for many reasons (there are race conditions with commits) but some
|
|
|
|
// applications are relying on this behavior so we continue to support it for
|
|
|
|
// older apps, so we retain this behavior if the app has target SDK < JellyBean.
|
|
|
|
sendDownUpKeyEvent(KeyEvent.KEYCODE_DEL);
|
|
|
|
if (mDeleteCount > Constants.DELETE_ACCELERATE_AT) {
|
|
|
|
sendDownUpKeyEvent(KeyEvent.KEYCODE_DEL);
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
final int codePointBeforeCursor = mConnection.getCodePointBeforeCursor();
|
|
|
|
if (codePointBeforeCursor == Constants.NOT_A_CODE) {
|
2014-02-13 09:15:22 +00:00
|
|
|
// HACK for backward compatibility with broken apps that haven't realized
|
|
|
|
// yet that hardware keyboards are not the only way of inputting text.
|
|
|
|
// Nothing to delete before the cursor. We should not do anything, but many
|
|
|
|
// broken apps expect something to happen in this case so that they can
|
|
|
|
// catch it and have their broken interface react. If you need the keyboard
|
|
|
|
// to do this, you're doing it wrong -- please fix your app.
|
|
|
|
mConnection.deleteSurroundingText(1, 0);
|
2013-12-19 07:07:24 +00:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
final int lengthToDelete =
|
|
|
|
Character.isSupplementaryCodePoint(codePointBeforeCursor) ? 2 : 1;
|
|
|
|
mConnection.deleteSurroundingText(lengthToDelete, 0);
|
|
|
|
if (mDeleteCount > Constants.DELETE_ACCELERATE_AT) {
|
|
|
|
final int codePointBeforeCursorToDeleteAgain =
|
|
|
|
mConnection.getCodePointBeforeCursor();
|
|
|
|
if (codePointBeforeCursorToDeleteAgain != Constants.NOT_A_CODE) {
|
|
|
|
final int lengthToDeleteAgain = Character.isSupplementaryCodePoint(
|
|
|
|
codePointBeforeCursorToDeleteAgain) ? 2 : 1;
|
|
|
|
mConnection.deleteSurroundingText(lengthToDeleteAgain, 0);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2014-05-23 17:28:00 +00:00
|
|
|
if (inputTransaction.mSettingsValues
|
|
|
|
.isCurrentOrientationAllowingSuggestionsPerUserSettings()
|
2014-03-04 07:46:42 +00:00
|
|
|
&& inputTransaction.mSettingsValues.mSpacingAndPunctuations
|
|
|
|
.mCurrentLanguageHasSpaces
|
2014-01-17 04:14:29 +00:00
|
|
|
&& !mConnection.isCursorFollowedByWordCharacter(
|
2014-03-04 07:46:42 +00:00
|
|
|
inputTransaction.mSettingsValues.mSpacingAndPunctuations)) {
|
|
|
|
restartSuggestionsOnWordTouchedByCursor(inputTransaction.mSettingsValues,
|
2014-06-26 09:43:14 +00:00
|
|
|
true /* shouldIncludeResumedWordInSuggestions */, currentKeyboardScriptId);
|
2013-12-19 07:07:24 +00:00
|
|
|
}
|
|
|
|
}
|
2013-12-19 05:34:35 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Handle a press on the language switch key (the "globe key")
|
|
|
|
*/
|
|
|
|
private void handleLanguageSwitchKey() {
|
2013-12-19 11:36:32 +00:00
|
|
|
mLatinIME.switchToNextSubtype();
|
2013-12-19 05:34:35 +00:00
|
|
|
}
|
|
|
|
|
2013-12-19 10:29:05 +00:00
|
|
|
/**
|
|
|
|
* Swap a space with a space-swapping punctuation sign.
|
|
|
|
*
|
|
|
|
* This method will check that there are two characters before the cursor and that the first
|
|
|
|
* one is a space before it does the actual swapping.
|
2014-03-04 06:29:54 +00:00
|
|
|
* @param inputTransaction The transaction in progress.
|
2014-06-20 06:26:09 +00:00
|
|
|
* @return true if the swap has been performed, false if it was prevented by preliminary checks.
|
2013-12-19 10:29:05 +00:00
|
|
|
*/
|
2014-06-20 07:41:23 +00:00
|
|
|
private boolean trySwapSwapperAndSpace(final InputTransaction inputTransaction) {
|
|
|
|
final int codePointBeforeCursor = mConnection.getCodePointBeforeCursor();
|
|
|
|
if (Constants.CODE_SPACE != codePointBeforeCursor) {
|
|
|
|
return false;
|
2013-12-19 08:14:11 +00:00
|
|
|
}
|
2014-06-20 07:41:23 +00:00
|
|
|
mConnection.deleteSurroundingText(1, 0);
|
|
|
|
final String text = inputTransaction.mEvent.getTextToCommit() + " ";
|
|
|
|
mConnection.commitText(text, 1);
|
|
|
|
inputTransaction.requireShiftUpdate(InputTransaction.SHIFT_UPDATE_NOW);
|
|
|
|
return true;
|
2013-12-19 08:14:11 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Strip a trailing space if necessary and returns whether it's a swap weak space situation.
|
2014-03-04 07:31:51 +00:00
|
|
|
* @param inputTransaction The transaction in progress.
|
2013-12-19 08:14:11 +00:00
|
|
|
* @param isFromSuggestionStrip Whether this code point is coming from the suggestion strip.
|
|
|
|
* @return whether we should swap the space instead of removing it.
|
|
|
|
*/
|
2014-06-20 07:41:23 +00:00
|
|
|
private boolean tryStripSpaceAndReturnWhetherShouldSwapInstead(
|
|
|
|
final InputTransaction inputTransaction, final boolean isFromSuggestionStrip) {
|
2014-03-12 08:02:13 +00:00
|
|
|
final int codePoint = inputTransaction.mEvent.mCodePoint;
|
|
|
|
if (Constants.CODE_ENTER == codePoint &&
|
2014-03-04 07:31:51 +00:00
|
|
|
SpaceState.SWAP_PUNCTUATION == inputTransaction.mSpaceState) {
|
2013-12-19 08:14:11 +00:00
|
|
|
mConnection.removeTrailingSpace();
|
|
|
|
return false;
|
|
|
|
}
|
2014-03-04 07:31:51 +00:00
|
|
|
if ((SpaceState.WEAK == inputTransaction.mSpaceState
|
|
|
|
|| SpaceState.SWAP_PUNCTUATION == inputTransaction.mSpaceState)
|
2013-12-19 08:14:11 +00:00
|
|
|
&& isFromSuggestionStrip) {
|
2014-03-12 08:02:13 +00:00
|
|
|
if (inputTransaction.mSettingsValues.isUsuallyPrecededBySpace(codePoint)) {
|
2014-03-04 07:31:51 +00:00
|
|
|
return false;
|
|
|
|
}
|
2014-03-12 08:02:13 +00:00
|
|
|
if (inputTransaction.mSettingsValues.isUsuallyFollowedBySpace(codePoint)) {
|
2014-03-04 07:31:51 +00:00
|
|
|
return true;
|
|
|
|
}
|
2013-12-19 08:14:11 +00:00
|
|
|
mConnection.removeTrailingSpace();
|
|
|
|
}
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
2014-03-05 06:55:45 +00:00
|
|
|
public void startDoubleSpacePeriodCountdown(final InputTransaction inputTransaction) {
|
|
|
|
mDoubleSpacePeriodCountdownStart = inputTransaction.mTimestamp;
|
|
|
|
}
|
|
|
|
|
|
|
|
public void cancelDoubleSpacePeriodCountdown() {
|
|
|
|
mDoubleSpacePeriodCountdownStart = 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
public boolean isDoubleSpacePeriodCountdownActive(final InputTransaction inputTransaction) {
|
|
|
|
return inputTransaction.mTimestamp - mDoubleSpacePeriodCountdownStart
|
|
|
|
< inputTransaction.mSettingsValues.mDoubleSpacePeriodTimeout;
|
|
|
|
}
|
|
|
|
|
2013-12-19 10:29:05 +00:00
|
|
|
/**
|
|
|
|
* Apply the double-space-to-period transformation if applicable.
|
|
|
|
*
|
|
|
|
* The double-space-to-period transformation means that we replace two spaces with a
|
|
|
|
* period-space sequence of characters. This typically happens when the user presses space
|
|
|
|
* twice in a row quickly.
|
|
|
|
* This method will check that the double-space-to-period is active in settings, that the
|
2014-06-20 07:41:23 +00:00
|
|
|
* two spaces have been input close enough together, that the typed character is a space
|
|
|
|
* and that the previous character allows for the transformation to take place. If all of
|
|
|
|
* these conditions are fulfilled, this method applies the transformation and returns true.
|
|
|
|
* Otherwise, it does nothing and returns false.
|
2013-12-19 10:29:05 +00:00
|
|
|
*
|
2014-03-05 06:55:45 +00:00
|
|
|
* @param inputTransaction The transaction in progress.
|
2013-12-19 10:29:05 +00:00
|
|
|
* @return true if we applied the double-space-to-period transformation, false otherwise.
|
|
|
|
*/
|
2014-06-20 07:41:23 +00:00
|
|
|
private boolean tryPerformDoubleSpacePeriod(final InputTransaction inputTransaction) {
|
|
|
|
// Check the setting, the typed character and the countdown. If any of the conditions is
|
|
|
|
// not fulfilled, return false.
|
|
|
|
if (!inputTransaction.mSettingsValues.mUseDoubleSpacePeriod
|
|
|
|
|| Constants.CODE_SPACE != inputTransaction.mEvent.mCodePoint
|
|
|
|
|| !isDoubleSpacePeriodCountdownActive(inputTransaction)) {
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
// We only do this when we see one space and an accepted code point before the cursor.
|
|
|
|
// The code point may be a surrogate pair but the space may not, so we need 3 chars.
|
|
|
|
final CharSequence lastTwo = mConnection.getTextBeforeCursor(3, 0);
|
|
|
|
if (null == lastTwo) return false;
|
|
|
|
final int length = lastTwo.length();
|
|
|
|
if (length < 2) return false;
|
|
|
|
if (lastTwo.charAt(length - 1) != Constants.CODE_SPACE) return false;
|
|
|
|
// We know there is a space in pos -1, and we have at least two chars. If we have only two
|
|
|
|
// chars, isSurrogatePairs can't return true as charAt(1) is a space, so this is fine.
|
2013-12-19 08:14:11 +00:00
|
|
|
final int firstCodePoint =
|
2014-06-20 07:41:23 +00:00
|
|
|
Character.isSurrogatePair(lastTwo.charAt(0), lastTwo.charAt(1)) ?
|
|
|
|
Character.codePointAt(lastTwo, length - 3) : lastTwo.charAt(length - 2);
|
2013-12-19 08:14:11 +00:00
|
|
|
if (canBeFollowedByDoubleSpacePeriod(firstCodePoint)) {
|
2014-03-05 06:55:45 +00:00
|
|
|
cancelDoubleSpacePeriodCountdown();
|
2014-06-20 07:41:23 +00:00
|
|
|
mConnection.deleteSurroundingText(1, 0);
|
2014-03-05 06:55:45 +00:00
|
|
|
final String textToInsert = inputTransaction.mSettingsValues.mSpacingAndPunctuations
|
|
|
|
.mSentenceSeparatorAndSpace;
|
2013-12-19 08:14:11 +00:00
|
|
|
mConnection.commitText(textToInsert, 1);
|
2014-06-20 06:26:09 +00:00
|
|
|
inputTransaction.requireShiftUpdate(InputTransaction.SHIFT_UPDATE_NOW);
|
|
|
|
inputTransaction.setRequiresUpdateSuggestions();
|
2013-12-19 08:14:11 +00:00
|
|
|
return true;
|
|
|
|
}
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
2013-12-19 10:29:05 +00:00
|
|
|
/**
|
|
|
|
* Returns whether this code point can be followed by the double-space-to-period transformation.
|
|
|
|
*
|
|
|
|
* See #maybeDoubleSpaceToPeriod for details.
|
|
|
|
* Generally, most word characters can be followed by the double-space-to-period transformation,
|
|
|
|
* while most punctuation can't. Some punctuation however does allow for this to take place
|
|
|
|
* after them, like the closing parenthesis for example.
|
|
|
|
*
|
|
|
|
* @param codePoint the code point after which we may want to apply the transformation
|
|
|
|
* @return whether it's fine to apply the transformation after this code point.
|
|
|
|
*/
|
2013-12-19 08:14:11 +00:00
|
|
|
private static boolean canBeFollowedByDoubleSpacePeriod(final int codePoint) {
|
2013-12-19 10:29:05 +00:00
|
|
|
// TODO: This should probably be a blacklist rather than a whitelist.
|
2013-12-19 08:14:11 +00:00
|
|
|
// TODO: This should probably be language-dependant...
|
|
|
|
return Character.isLetterOrDigit(codePoint)
|
|
|
|
|| codePoint == Constants.CODE_SINGLE_QUOTE
|
|
|
|
|| codePoint == Constants.CODE_DOUBLE_QUOTE
|
|
|
|
|| codePoint == Constants.CODE_CLOSING_PARENTHESIS
|
|
|
|
|| codePoint == Constants.CODE_CLOSING_SQUARE_BRACKET
|
|
|
|
|| codePoint == Constants.CODE_CLOSING_CURLY_BRACKET
|
|
|
|
|| codePoint == Constants.CODE_CLOSING_ANGLE_BRACKET
|
|
|
|
|| codePoint == Constants.CODE_PLUS
|
|
|
|
|| codePoint == Constants.CODE_PERCENT
|
|
|
|
|| Character.getType(codePoint) == Character.OTHER_SYMBOL;
|
|
|
|
}
|
|
|
|
|
2013-12-19 05:34:35 +00:00
|
|
|
/**
|
2013-12-19 08:43:22 +00:00
|
|
|
* Performs a recapitalization event.
|
|
|
|
* @param settingsValues The current settings values.
|
2013-12-19 05:34:35 +00:00
|
|
|
*/
|
2013-12-20 12:51:13 +00:00
|
|
|
private void performRecapitalization(final SettingsValues settingsValues) {
|
2014-06-04 06:38:41 +00:00
|
|
|
if (!mConnection.hasSelection() || !mRecapitalizeStatus.mIsEnabled()) {
|
|
|
|
return; // No selection or recapitalize is disabled for now
|
2013-12-19 08:43:22 +00:00
|
|
|
}
|
2014-05-30 05:32:57 +00:00
|
|
|
final int selectionStart = mConnection.getExpectedSelectionStart();
|
|
|
|
final int selectionEnd = mConnection.getExpectedSelectionEnd();
|
|
|
|
final int numCharsSelected = selectionEnd - selectionStart;
|
|
|
|
if (numCharsSelected > Constants.MAX_CHARACTERS_FOR_RECAPITALIZATION) {
|
|
|
|
// We bail out if we have too many characters for performance reasons. We don't want
|
|
|
|
// to suck possibly multiple-megabyte data.
|
|
|
|
return;
|
|
|
|
}
|
2014-06-04 06:19:10 +00:00
|
|
|
// If we have a recapitalize in progress, use it; otherwise, start a new one.
|
|
|
|
if (!mRecapitalizeStatus.isStarted()
|
2014-05-30 05:32:57 +00:00
|
|
|
|| !mRecapitalizeStatus.isSetAt(selectionStart, selectionEnd)) {
|
2013-12-19 08:43:22 +00:00
|
|
|
final CharSequence selectedText =
|
|
|
|
mConnection.getSelectedText(0 /* flags, 0 for no styles */);
|
|
|
|
if (TextUtils.isEmpty(selectedText)) return; // Race condition with the input connection
|
2014-06-04 06:19:10 +00:00
|
|
|
mRecapitalizeStatus.start(selectionStart, selectionEnd, selectedText.toString(),
|
2014-01-20 05:56:56 +00:00
|
|
|
settingsValues.mLocale,
|
|
|
|
settingsValues.mSpacingAndPunctuations.mSortedWordSeparators);
|
2013-12-19 08:43:22 +00:00
|
|
|
// We trim leading and trailing whitespace.
|
|
|
|
mRecapitalizeStatus.trim();
|
|
|
|
}
|
|
|
|
mConnection.finishComposingText();
|
|
|
|
mRecapitalizeStatus.rotate();
|
2014-05-30 05:32:57 +00:00
|
|
|
mConnection.setSelection(selectionEnd, selectionEnd);
|
|
|
|
mConnection.deleteSurroundingText(numCharsSelected, 0);
|
2013-12-19 08:43:22 +00:00
|
|
|
mConnection.commitText(mRecapitalizeStatus.getRecapitalizedString(), 0);
|
2014-01-09 05:09:26 +00:00
|
|
|
mConnection.setSelection(mRecapitalizeStatus.getNewCursorStart(),
|
|
|
|
mRecapitalizeStatus.getNewCursorEnd());
|
2013-12-19 05:34:35 +00:00
|
|
|
}
|
|
|
|
|
2013-12-26 13:24:59 +00:00
|
|
|
private void performAdditionToUserHistoryDictionary(final SettingsValues settingsValues,
|
2014-05-21 02:15:38 +00:00
|
|
|
final String suggestion, final PrevWordsInfo prevWordsInfo) {
|
2013-12-19 12:53:08 +00:00
|
|
|
// If correction is not enabled, we don't add words to the user history dictionary.
|
|
|
|
// That's to avoid unintended additions in some sensitive fields, or fields that
|
|
|
|
// expect to receive non-words.
|
2014-06-05 09:04:11 +00:00
|
|
|
if (!settingsValues.mAutoCorrectionEnabled) return;
|
2013-12-19 12:53:08 +00:00
|
|
|
|
2013-12-26 13:24:59 +00:00
|
|
|
if (TextUtils.isEmpty(suggestion)) return;
|
2014-01-14 06:23:58 +00:00
|
|
|
final boolean wasAutoCapitalized =
|
|
|
|
mWordComposer.wasAutoCapitalized() && !mWordComposer.isMostlyCaps();
|
|
|
|
final int timeStampInSeconds = (int)TimeUnit.MILLISECONDS.toSeconds(
|
|
|
|
System.currentTimeMillis());
|
2014-05-23 00:30:55 +00:00
|
|
|
mDictionaryFacilitator.addToUserHistory(suggestion, wasAutoCapitalized,
|
2014-05-21 02:15:38 +00:00
|
|
|
prevWordsInfo, timeStampInSeconds, settingsValues.mBlockPotentiallyOffensive);
|
2013-12-19 12:53:08 +00:00
|
|
|
}
|
|
|
|
|
2014-03-03 05:19:52 +00:00
|
|
|
public void performUpdateSuggestionStripSync(final SettingsValues settingsValues) {
|
2013-12-19 13:08:31 +00:00
|
|
|
// Check if we have a suggestion engine attached.
|
2014-03-25 06:35:20 +00:00
|
|
|
if (!settingsValues.isSuggestionsRequested()) {
|
2013-12-19 13:08:31 +00:00
|
|
|
if (mWordComposer.isComposingWord()) {
|
|
|
|
Log.w(TAG, "Called updateSuggestionsOrPredictions but suggestions were not "
|
|
|
|
+ "requested!");
|
|
|
|
}
|
2014-06-18 23:35:51 +00:00
|
|
|
// Clear the suggestions strip.
|
|
|
|
mSuggestionStripViewAccessor.showSuggestionStrip(SuggestedWords.EMPTY);
|
2013-12-19 13:08:31 +00:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!mWordComposer.isComposingWord() && !settingsValues.mBigramPredictionEnabled) {
|
2014-01-24 14:17:40 +00:00
|
|
|
mSuggestionStripViewAccessor.setNeutralSuggestionStrip();
|
2013-12-19 13:08:31 +00:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2014-05-23 11:18:17 +00:00
|
|
|
final AsyncResultHolder<SuggestedWords> holder = new AsyncResultHolder<>();
|
2013-12-25 12:04:27 +00:00
|
|
|
mInputLogicHandler.getSuggestedWords(Suggest.SESSION_TYPING,
|
2013-12-19 13:08:31 +00:00
|
|
|
SuggestedWords.NOT_A_SEQUENCE_NUMBER, new OnGetSuggestedWordsCallback() {
|
|
|
|
@Override
|
|
|
|
public void onGetSuggestedWords(final SuggestedWords suggestedWords) {
|
2014-02-26 07:47:55 +00:00
|
|
|
final String typedWord = mWordComposer.getTypedWord();
|
|
|
|
// Show new suggestions if we have at least one. Otherwise keep the old
|
|
|
|
// suggestions with the new typed word. Exception: if the length of the
|
|
|
|
// typed word is <= 1 (after a deletion typically) we clear old suggestions.
|
|
|
|
if (suggestedWords.size() > 1 || typedWord.length() <= 1) {
|
|
|
|
holder.set(suggestedWords);
|
|
|
|
} else {
|
|
|
|
holder.set(retrieveOlderSuggestions(typedWord, mSuggestedWords));
|
|
|
|
}
|
2013-12-19 13:08:31 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
);
|
|
|
|
|
|
|
|
// This line may cause the current thread to wait.
|
|
|
|
final SuggestedWords suggestedWords = holder.get(null,
|
|
|
|
Constants.GET_SUGGESTED_WORDS_TIMEOUT);
|
|
|
|
if (suggestedWords != null) {
|
2014-01-24 14:17:40 +00:00
|
|
|
mSuggestionStripViewAccessor.showSuggestionStrip(suggestedWords);
|
2013-12-19 13:08:31 +00:00
|
|
|
}
|
|
|
|
}
|
2013-12-19 12:53:08 +00:00
|
|
|
|
2013-12-20 09:05:35 +00:00
|
|
|
/**
|
|
|
|
* Check if the cursor is touching a word. If so, restart suggestions on this word, else
|
|
|
|
* do nothing.
|
|
|
|
*
|
|
|
|
* @param settingsValues the current values of the settings.
|
2014-06-06 04:12:11 +00:00
|
|
|
* @param shouldIncludeResumedWordInSuggestions whether to include the word on which we resume
|
2013-12-25 12:43:23 +00:00
|
|
|
* suggestions in the suggestion list.
|
2013-12-20 09:05:35 +00:00
|
|
|
*/
|
|
|
|
// TODO: make this private.
|
|
|
|
public void restartSuggestionsOnWordTouchedByCursor(final SettingsValues settingsValues,
|
2014-06-26 09:43:14 +00:00
|
|
|
final boolean shouldIncludeResumedWordInSuggestions,
|
|
|
|
// TODO: remove this argument, put it into settingsValues
|
|
|
|
final int currentKeyboardScriptId) {
|
2013-12-20 09:05:35 +00:00
|
|
|
// HACK: We may want to special-case some apps that exhibit bad behavior in case of
|
|
|
|
// recorrection. This is a temporary, stopgap measure that will be removed later.
|
|
|
|
// TODO: remove this.
|
2014-02-19 12:41:45 +00:00
|
|
|
if (settingsValues.isBrokenByRecorrection()
|
2013-12-20 09:05:35 +00:00
|
|
|
// Recorrection is not supported in languages without spaces because we don't know
|
|
|
|
// how to segment them yet.
|
2014-02-19 12:41:45 +00:00
|
|
|
|| !settingsValues.mSpacingAndPunctuations.mCurrentLanguageHasSpaces
|
2014-02-03 06:19:56 +00:00
|
|
|
// If no suggestions are requested, don't try restarting suggestions.
|
2014-02-19 12:41:45 +00:00
|
|
|
|| !settingsValues.isSuggestionsRequested()
|
2014-04-16 06:40:17 +00:00
|
|
|
// If we are currently in a batch input, we must not resume suggestions, or the result
|
|
|
|
// of the batch input will replace the new composition. This may happen in the corner case
|
|
|
|
// that the app moves the cursor on its own accord during a batch input.
|
|
|
|
|| mInputLogicHandler.isInBatchInput()
|
2013-12-20 09:05:35 +00:00
|
|
|
// If the cursor is not touching a word, or if there is a selection, return right away.
|
2014-02-19 12:41:45 +00:00
|
|
|
|| mConnection.hasSelection()
|
2013-12-20 09:05:35 +00:00
|
|
|
// If we don't know the cursor location, return.
|
2014-02-19 12:41:45 +00:00
|
|
|
|| mConnection.getExpectedSelectionStart() < 0) {
|
|
|
|
mSuggestionStripViewAccessor.setNeutralSuggestionStrip();
|
|
|
|
return;
|
|
|
|
}
|
2014-01-09 05:09:26 +00:00
|
|
|
final int expectedCursorPosition = mConnection.getExpectedSelectionStart();
|
2014-02-19 12:41:45 +00:00
|
|
|
if (!mConnection.isCursorTouchingWord(settingsValues.mSpacingAndPunctuations)) {
|
|
|
|
// Show predictions.
|
2014-06-09 10:31:41 +00:00
|
|
|
mWordComposer.setCapitalizedModeAtStartComposingTime(WordComposer.CAPS_MODE_OFF);
|
2014-02-19 12:41:45 +00:00
|
|
|
mLatinIME.mHandler.postUpdateSuggestionStrip();
|
|
|
|
return;
|
|
|
|
}
|
2013-12-20 09:05:35 +00:00
|
|
|
final TextRange range = mConnection.getWordRangeAtCursor(
|
2014-07-01 03:23:14 +00:00
|
|
|
settingsValues.mSpacingAndPunctuations.mSortedWordSeparators,
|
|
|
|
0 /* additionalPrecedingWordsCount */);
|
2013-12-20 09:05:35 +00:00
|
|
|
if (null == range) return; // Happens if we don't have an input connection at all
|
|
|
|
if (range.length() <= 0) return; // Race condition. No text to resume on, so bail out.
|
|
|
|
// If for some strange reason (editor bug or so) we measure the text before the cursor as
|
|
|
|
// longer than what the entire text is supposed to be, the safe thing to do is bail out.
|
2014-02-17 08:53:15 +00:00
|
|
|
if (range.mHasUrlSpans) return; // If there are links, we don't resume suggestions. Making
|
|
|
|
// edits to a linkified text through batch commands would ruin the URL spans, and unless
|
|
|
|
// we take very complicated steps to preserve the whole link, we can't do things right so
|
|
|
|
// we just do not resume because it's safer.
|
2013-12-20 09:05:35 +00:00
|
|
|
final int numberOfCharsInWordBeforeCursor = range.getNumberOfCharsInWordBeforeCursor();
|
2013-12-25 12:43:23 +00:00
|
|
|
if (numberOfCharsInWordBeforeCursor > expectedCursorPosition) return;
|
2014-05-23 11:18:17 +00:00
|
|
|
final ArrayList<SuggestedWordInfo> suggestions = new ArrayList<>();
|
2013-12-20 09:05:35 +00:00
|
|
|
final String typedWord = range.mWord.toString();
|
2014-06-06 04:12:11 +00:00
|
|
|
if (shouldIncludeResumedWordInSuggestions) {
|
2013-12-25 12:43:23 +00:00
|
|
|
suggestions.add(new SuggestedWordInfo(typedWord,
|
2014-01-23 04:08:21 +00:00
|
|
|
SuggestedWords.MAX_SUGGESTIONS + 1,
|
2013-12-25 12:43:23 +00:00
|
|
|
SuggestedWordInfo.KIND_TYPED, Dictionary.DICTIONARY_USER_TYPED,
|
|
|
|
SuggestedWordInfo.NOT_AN_INDEX /* indexOfTouchPointOfSecondWord */,
|
|
|
|
SuggestedWordInfo.NOT_A_CONFIDENCE /* autoCommitFirstWordConfidence */));
|
|
|
|
}
|
2014-03-05 09:47:41 +00:00
|
|
|
if (!isResumableWord(settingsValues, typedWord)) {
|
|
|
|
mSuggestionStripViewAccessor.setNeutralSuggestionStrip();
|
|
|
|
return;
|
|
|
|
}
|
2013-12-20 09:05:35 +00:00
|
|
|
int i = 0;
|
|
|
|
for (final SuggestionSpan span : range.getSuggestionSpansAtWord()) {
|
|
|
|
for (final String s : span.getSuggestions()) {
|
|
|
|
++i;
|
|
|
|
if (!TextUtils.equals(s, typedWord)) {
|
|
|
|
suggestions.add(new SuggestedWordInfo(s,
|
2014-01-23 04:08:21 +00:00
|
|
|
SuggestedWords.MAX_SUGGESTIONS - i,
|
2013-12-20 09:05:35 +00:00
|
|
|
SuggestedWordInfo.KIND_RESUMED, Dictionary.DICTIONARY_RESUMED,
|
|
|
|
SuggestedWordInfo.NOT_AN_INDEX /* indexOfTouchPointOfSecondWord */,
|
|
|
|
SuggestedWordInfo.NOT_A_CONFIDENCE
|
|
|
|
/* autoCommitFirstWordConfidence */));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2013-12-27 11:58:32 +00:00
|
|
|
final int[] codePoints = StringUtils.toCodePointArray(typedWord);
|
2014-05-21 02:15:38 +00:00
|
|
|
// We want the previous word for suggestion. If we have chars in the word
|
|
|
|
// before the cursor, then we want the word before that, hence 2; otherwise,
|
|
|
|
// we want the word immediately before the cursor, hence 1.
|
2014-05-21 06:40:08 +00:00
|
|
|
final PrevWordsInfo prevWordsInfo = getPrevWordsInfoFromNthPreviousWordForSuggestion(
|
2014-05-21 02:15:38 +00:00
|
|
|
settingsValues.mSpacingAndPunctuations,
|
|
|
|
0 == numberOfCharsInWordBeforeCursor ? 1 : 2);
|
2013-12-27 11:58:32 +00:00
|
|
|
mWordComposer.setComposingWord(codePoints,
|
2014-06-09 10:31:41 +00:00
|
|
|
mLatinIME.getCoordinatesForCurrentKeyboard(codePoints));
|
2013-12-20 09:05:35 +00:00
|
|
|
mWordComposer.setCursorPositionWithinWord(
|
|
|
|
typedWord.codePointCount(0, numberOfCharsInWordBeforeCursor));
|
2014-01-10 11:18:24 +00:00
|
|
|
mConnection.setComposingRegion(expectedCursorPosition - numberOfCharsInWordBeforeCursor,
|
2014-01-08 07:47:21 +00:00
|
|
|
expectedCursorPosition + range.getNumberOfCharsInWordAfterCursor());
|
2014-06-06 04:12:11 +00:00
|
|
|
if (suggestions.size() <= (shouldIncludeResumedWordInSuggestions ? 1 : 0)) {
|
|
|
|
// If there weren't any suggestion spans on this word, suggestions#size() will be 1
|
|
|
|
// if shouldIncludeResumedWordInSuggestions is true, 0 otherwise. In this case, we
|
|
|
|
// have no useful suggestions, so we will try to compute some for it instead.
|
2013-12-25 12:04:27 +00:00
|
|
|
mInputLogicHandler.getSuggestedWords(Suggest.SESSION_TYPING,
|
2013-12-20 09:05:35 +00:00
|
|
|
SuggestedWords.NOT_A_SEQUENCE_NUMBER, new OnGetSuggestedWordsCallback() {
|
|
|
|
@Override
|
|
|
|
public void onGetSuggestedWords(
|
|
|
|
final SuggestedWords suggestedWordsIncludingTypedWord) {
|
|
|
|
final SuggestedWords suggestedWords;
|
2013-12-25 12:43:23 +00:00
|
|
|
if (suggestedWordsIncludingTypedWord.size() > 1
|
2014-06-06 04:12:11 +00:00
|
|
|
&& !shouldIncludeResumedWordInSuggestions) {
|
2013-12-20 09:05:35 +00:00
|
|
|
// We were able to compute new suggestions for this word.
|
|
|
|
// Remove the typed word, since we don't want to display it in this
|
|
|
|
// case. The #getSuggestedWordsExcludingTypedWord() method sets
|
|
|
|
// willAutoCorrect to false.
|
|
|
|
suggestedWords = suggestedWordsIncludingTypedWord
|
|
|
|
.getSuggestedWordsExcludingTypedWord();
|
|
|
|
} else {
|
|
|
|
// No saved suggestions, and we were unable to compute any good one
|
|
|
|
// either. Rather than displaying an empty suggestion strip, we'll
|
|
|
|
// display the original word alone in the middle.
|
|
|
|
// Since there is only one word, willAutoCorrect is false.
|
|
|
|
suggestedWords = suggestedWordsIncludingTypedWord;
|
|
|
|
}
|
2014-01-24 13:59:21 +00:00
|
|
|
mIsAutoCorrectionIndicatorOn = false;
|
|
|
|
mLatinIME.mHandler.showSuggestionStrip(suggestedWords);
|
2013-12-20 09:05:35 +00:00
|
|
|
}});
|
|
|
|
} else {
|
|
|
|
// We found suggestion spans in the word. We'll create the SuggestedWords out of
|
2014-02-25 06:37:08 +00:00
|
|
|
// them, and make willAutoCorrect false. We make typedWordValid false, because the
|
|
|
|
// color of the word in the suggestion strip changes according to this parameter,
|
|
|
|
// and false gives the correct color.
|
2014-02-06 06:51:04 +00:00
|
|
|
final SuggestedWords suggestedWords = new SuggestedWords(suggestions,
|
|
|
|
null /* rawSuggestions */, typedWord,
|
2014-02-25 06:37:08 +00:00
|
|
|
false /* typedWordValid */, false /* willAutoCorrect */,
|
2014-02-13 09:43:48 +00:00
|
|
|
false /* isObsoleteSuggestions */, false /* isPrediction */,
|
|
|
|
SuggestedWords.NOT_A_SEQUENCE_NUMBER);
|
2014-01-24 13:59:21 +00:00
|
|
|
mIsAutoCorrectionIndicatorOn = false;
|
|
|
|
mLatinIME.mHandler.showSuggestionStrip(suggestedWords);
|
2013-12-20 09:05:35 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-12-19 09:30:21 +00:00
|
|
|
/**
|
|
|
|
* Reverts a previous commit with auto-correction.
|
|
|
|
*
|
|
|
|
* This is triggered upon pressing backspace just after a commit with auto-correction.
|
|
|
|
*
|
2014-03-05 07:37:44 +00:00
|
|
|
* @param inputTransaction The transaction in progress.
|
2013-12-19 09:30:21 +00:00
|
|
|
*/
|
2014-03-05 07:37:44 +00:00
|
|
|
private void revertCommit(final InputTransaction inputTransaction) {
|
2014-01-09 09:36:23 +00:00
|
|
|
final CharSequence originallyTypedWord = mLastComposedWord.mTypedWord;
|
|
|
|
final CharSequence committedWord = mLastComposedWord.mCommittedWord;
|
2014-02-12 12:21:19 +00:00
|
|
|
final String committedWordString = committedWord.toString();
|
2013-12-19 09:30:21 +00:00
|
|
|
final int cancelLength = committedWord.length();
|
|
|
|
// We want java chars, not codepoints for the following.
|
|
|
|
final int separatorLength = mLastComposedWord.mSeparatorString.length();
|
|
|
|
// TODO: should we check our saved separator against the actual contents of the text view?
|
|
|
|
final int deleteLength = cancelLength + separatorLength;
|
2013-12-19 13:18:46 +00:00
|
|
|
if (LatinImeLogger.sDBG) {
|
2013-12-19 09:30:21 +00:00
|
|
|
if (mWordComposer.isComposingWord()) {
|
|
|
|
throw new RuntimeException("revertCommit, but we are composing a word");
|
|
|
|
}
|
|
|
|
final CharSequence wordBeforeCursor =
|
|
|
|
mConnection.getTextBeforeCursor(deleteLength, 0).subSequence(0, cancelLength);
|
|
|
|
if (!TextUtils.equals(committedWord, wordBeforeCursor)) {
|
|
|
|
throw new RuntimeException("revertCommit check failed: we thought we were "
|
|
|
|
+ "reverting \"" + committedWord
|
|
|
|
+ "\", but before the cursor we found \"" + wordBeforeCursor + "\"");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
mConnection.deleteSurroundingText(deleteLength, 0);
|
2014-06-20 05:46:13 +00:00
|
|
|
if (!TextUtils.isEmpty(committedWord)) {
|
|
|
|
mDictionaryFacilitator.removeWordFromPersonalizedDicts(committedWordString);
|
2014-01-09 09:36:23 +00:00
|
|
|
}
|
2013-12-27 11:58:32 +00:00
|
|
|
final String stringToCommit = originallyTypedWord + mLastComposedWord.mSeparatorString;
|
|
|
|
final SpannableString textToCommit = new SpannableString(stringToCommit);
|
2014-01-09 09:36:23 +00:00
|
|
|
if (committedWord instanceof SpannableString) {
|
|
|
|
final SpannableString committedWordWithSuggestionSpans = (SpannableString)committedWord;
|
|
|
|
final Object[] spans = committedWordWithSuggestionSpans.getSpans(0,
|
|
|
|
committedWord.length(), Object.class);
|
2014-02-12 12:21:19 +00:00
|
|
|
final int lastCharIndex = textToCommit.length() - 1;
|
|
|
|
// We will collect all suggestions in the following array.
|
2014-05-23 11:18:17 +00:00
|
|
|
final ArrayList<String> suggestions = new ArrayList<>();
|
2014-02-12 12:21:19 +00:00
|
|
|
// First, add the committed word to the list of suggestions.
|
|
|
|
suggestions.add(committedWordString);
|
2014-01-09 09:36:23 +00:00
|
|
|
for (final Object span : spans) {
|
2014-02-12 12:21:19 +00:00
|
|
|
// If this is a suggestion span, we check that the locale is the right one, and
|
|
|
|
// that the word is not the committed word. That should mostly be the case.
|
|
|
|
// Given this, we add it to the list of suggestions, otherwise we discard it.
|
|
|
|
if (span instanceof SuggestionSpan) {
|
|
|
|
final SuggestionSpan suggestionSpan = (SuggestionSpan)span;
|
2014-03-05 07:37:44 +00:00
|
|
|
if (!suggestionSpan.getLocale().equals(
|
|
|
|
inputTransaction.mSettingsValues.mLocale.toString())) {
|
2014-02-12 12:21:19 +00:00
|
|
|
continue;
|
|
|
|
}
|
|
|
|
for (final String suggestion : suggestionSpan.getSuggestions()) {
|
|
|
|
if (!suggestion.equals(committedWordString)) {
|
|
|
|
suggestions.add(suggestion);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
// If this is not a suggestion span, we just add it as is.
|
|
|
|
textToCommit.setSpan(span, 0 /* start */, lastCharIndex /* end */,
|
|
|
|
committedWordWithSuggestionSpans.getSpanFlags(span));
|
|
|
|
}
|
2013-12-19 09:30:21 +00:00
|
|
|
}
|
2014-02-12 12:21:19 +00:00
|
|
|
// Add the suggestion list to the list of suggestions.
|
2014-03-05 07:37:44 +00:00
|
|
|
textToCommit.setSpan(new SuggestionSpan(inputTransaction.mSettingsValues.mLocale,
|
2014-02-12 12:21:19 +00:00
|
|
|
suggestions.toArray(new String[suggestions.size()]), 0 /* flags */),
|
|
|
|
0 /* start */, lastCharIndex /* end */, 0 /* flags */);
|
2013-12-19 09:30:21 +00:00
|
|
|
}
|
2014-03-05 07:37:44 +00:00
|
|
|
if (inputTransaction.mSettingsValues.mSpacingAndPunctuations.mCurrentLanguageHasSpaces) {
|
2013-12-19 09:30:21 +00:00
|
|
|
// For languages with spaces, we revert to the typed string, but the cursor is still
|
|
|
|
// after the separator so we don't resume suggestions. If the user wants to correct
|
|
|
|
// the word, they have to press backspace again.
|
2014-01-09 09:36:23 +00:00
|
|
|
mConnection.commitText(textToCommit, 1);
|
2013-12-19 09:30:21 +00:00
|
|
|
} else {
|
|
|
|
// For languages without spaces, we revert the typed string but the cursor is flush
|
|
|
|
// with the typed word, so we need to resume suggestions right away.
|
2013-12-27 11:58:32 +00:00
|
|
|
final int[] codePoints = StringUtils.toCodePointArray(stringToCommit);
|
|
|
|
mWordComposer.setComposingWord(codePoints,
|
2014-06-09 10:31:41 +00:00
|
|
|
mLatinIME.getCoordinatesForCurrentKeyboard(codePoints));
|
2014-01-09 09:36:23 +00:00
|
|
|
mConnection.setComposingText(textToCommit, 1);
|
2013-12-19 09:30:21 +00:00
|
|
|
}
|
2014-05-28 14:02:16 +00:00
|
|
|
// Don't restart suggestion yet. We'll restart if the user deletes the separator.
|
2013-12-19 09:30:21 +00:00
|
|
|
mLastComposedWord = LastComposedWord.NOT_A_COMPOSED_WORD;
|
|
|
|
// We have a separator between the word and the cursor: we should show predictions.
|
2014-03-05 07:37:44 +00:00
|
|
|
inputTransaction.setRequiresUpdateSuggestions();
|
2013-12-19 09:30:21 +00:00
|
|
|
}
|
|
|
|
|
2013-12-19 08:57:10 +00:00
|
|
|
/**
|
|
|
|
* Factor in auto-caps and manual caps and compute the current caps mode.
|
2013-12-19 11:36:32 +00:00
|
|
|
* @param settingsValues the current settings values.
|
2013-12-20 12:51:13 +00:00
|
|
|
* @param keyboardShiftMode the current shift mode of the keyboard. See
|
|
|
|
* KeyboardSwitcher#getKeyboardShiftMode() for possible values.
|
2013-12-19 08:57:10 +00:00
|
|
|
* @return the actual caps mode the keyboard is in right now.
|
|
|
|
*/
|
2013-12-20 12:51:13 +00:00
|
|
|
private int getActualCapsMode(final SettingsValues settingsValues,
|
|
|
|
final int keyboardShiftMode) {
|
2014-03-04 06:29:54 +00:00
|
|
|
if (keyboardShiftMode != WordComposer.CAPS_MODE_AUTO_SHIFTED) {
|
|
|
|
return keyboardShiftMode;
|
|
|
|
}
|
2013-12-19 11:36:32 +00:00
|
|
|
final int auto = getCurrentAutoCapsState(settingsValues);
|
2013-12-19 08:57:10 +00:00
|
|
|
if (0 != (auto & TextUtils.CAP_MODE_CHARACTERS)) {
|
|
|
|
return WordComposer.CAPS_MODE_AUTO_SHIFT_LOCKED;
|
|
|
|
}
|
|
|
|
if (0 != auto) {
|
|
|
|
return WordComposer.CAPS_MODE_AUTO_SHIFTED;
|
|
|
|
}
|
|
|
|
return WordComposer.CAPS_MODE_OFF;
|
|
|
|
}
|
|
|
|
|
2013-12-19 11:36:32 +00:00
|
|
|
/**
|
|
|
|
* Gets the current auto-caps state, factoring in the space state.
|
|
|
|
*
|
|
|
|
* This method tries its best to do this in the most efficient possible manner. It avoids
|
|
|
|
* getting text from the editor if possible at all.
|
|
|
|
* This is called from the KeyboardSwitcher (through a trampoline in LatinIME) because it
|
|
|
|
* needs to know auto caps state to display the right layout.
|
|
|
|
*
|
2014-01-24 02:38:07 +00:00
|
|
|
* @param settingsValues the relevant settings values
|
2013-12-19 11:36:32 +00:00
|
|
|
* @return a caps mode from TextUtils.CAP_MODE_* or Constants.TextUtils.CAP_MODE_OFF.
|
|
|
|
*/
|
2014-01-24 02:38:07 +00:00
|
|
|
public int getCurrentAutoCapsState(final SettingsValues settingsValues) {
|
2013-12-19 11:36:32 +00:00
|
|
|
if (!settingsValues.mAutoCap) return Constants.TextUtils.CAP_MODE_OFF;
|
|
|
|
|
|
|
|
final EditorInfo ei = getCurrentInputEditorInfo();
|
|
|
|
if (ei == null) return Constants.TextUtils.CAP_MODE_OFF;
|
|
|
|
final int inputType = ei.inputType;
|
|
|
|
// Warning: this depends on mSpaceState, which may not be the most current value. If
|
|
|
|
// mSpaceState gets updated later, whoever called this may need to be told about it.
|
2014-01-17 04:14:29 +00:00
|
|
|
return mConnection.getCursorCapsMode(inputType, settingsValues.mSpacingAndPunctuations,
|
2013-12-19 11:36:32 +00:00
|
|
|
SpaceState.PHANTOM == mSpaceState);
|
|
|
|
}
|
|
|
|
|
|
|
|
public int getCurrentRecapitalizeState() {
|
2014-06-04 06:19:10 +00:00
|
|
|
if (!mRecapitalizeStatus.isStarted()
|
2014-01-09 05:09:26 +00:00
|
|
|
|| !mRecapitalizeStatus.isSetAt(mConnection.getExpectedSelectionStart(),
|
|
|
|
mConnection.getExpectedSelectionEnd())) {
|
2013-12-19 11:36:32 +00:00
|
|
|
// Not recapitalizing at the moment
|
|
|
|
return RecapitalizeStatus.NOT_A_RECAPITALIZE_MODE;
|
|
|
|
}
|
|
|
|
return mRecapitalizeStatus.getCurrentMode();
|
|
|
|
}
|
|
|
|
|
2013-12-19 05:34:35 +00:00
|
|
|
/**
|
|
|
|
* @return the editor info for the current editor
|
|
|
|
*/
|
|
|
|
private EditorInfo getCurrentInputEditorInfo() {
|
|
|
|
return mLatinIME.getCurrentInputEditorInfo();
|
|
|
|
}
|
|
|
|
|
2013-12-19 08:57:10 +00:00
|
|
|
/**
|
2014-05-21 06:40:08 +00:00
|
|
|
* Get information fo previous words from the nth previous word before the cursor as context
|
|
|
|
* for the suggestion process.
|
2014-01-09 08:27:33 +00:00
|
|
|
* @param spacingAndPunctuations the current spacing and punctuations settings.
|
2013-12-19 08:57:10 +00:00
|
|
|
* @param nthPreviousWord reverse index of the word to get (1-indexed)
|
2014-05-21 06:40:08 +00:00
|
|
|
* @return the information of previous words
|
2013-12-19 08:57:10 +00:00
|
|
|
*/
|
|
|
|
// TODO: Make this private
|
2014-05-21 06:40:08 +00:00
|
|
|
public PrevWordsInfo getPrevWordsInfoFromNthPreviousWordForSuggestion(
|
2014-01-09 08:27:33 +00:00
|
|
|
final SpacingAndPunctuations spacingAndPunctuations, final int nthPreviousWord) {
|
|
|
|
if (spacingAndPunctuations.mCurrentLanguageHasSpaces) {
|
2013-12-19 08:57:10 +00:00
|
|
|
// If we are typing in a language with spaces we can just look up the previous
|
2014-05-21 06:40:08 +00:00
|
|
|
// word information from textview.
|
|
|
|
return mConnection.getPrevWordsInfoFromNthPreviousWord(
|
|
|
|
spacingAndPunctuations, nthPreviousWord);
|
2013-12-19 08:57:10 +00:00
|
|
|
} else {
|
2014-05-23 14:19:33 +00:00
|
|
|
return LastComposedWord.NOT_A_COMPOSED_WORD == mLastComposedWord ?
|
|
|
|
PrevWordsInfo.BEGINNING_OF_SENTENCE :
|
2014-06-25 05:14:37 +00:00
|
|
|
new PrevWordsInfo(new PrevWordsInfo.WordInfo(
|
|
|
|
mLastComposedWord.mCommittedWord.toString()));
|
2013-12-19 08:57:10 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-12-20 09:05:35 +00:00
|
|
|
/**
|
|
|
|
* Tests the passed word for resumability.
|
|
|
|
*
|
|
|
|
* We can resume suggestions on words whose first code point is a word code point (with some
|
|
|
|
* nuances: check the code for details).
|
|
|
|
*
|
|
|
|
* @param settings the current values of the settings.
|
|
|
|
* @param word the word to evaluate.
|
|
|
|
* @return whether it's fine to resume suggestions on this word.
|
|
|
|
*/
|
|
|
|
private static boolean isResumableWord(final SettingsValues settings, final String word) {
|
|
|
|
final int firstCodePoint = word.codePointAt(0);
|
|
|
|
return settings.isWordCodePoint(firstCodePoint)
|
|
|
|
&& Constants.CODE_SINGLE_QUOTE != firstCodePoint
|
|
|
|
&& Constants.CODE_DASH != firstCodePoint;
|
|
|
|
}
|
|
|
|
|
2013-12-19 05:34:35 +00:00
|
|
|
/**
|
|
|
|
* @param actionId the action to perform
|
|
|
|
*/
|
|
|
|
private void performEditorAction(final int actionId) {
|
|
|
|
mConnection.performEditorAction(actionId);
|
|
|
|
}
|
|
|
|
|
2013-12-20 06:44:26 +00:00
|
|
|
/**
|
|
|
|
* Perform the processing specific to inputting TLDs.
|
|
|
|
*
|
|
|
|
* Some keys input a TLD (specifically, the ".com" key) and this warrants some specific
|
|
|
|
* processing. First, if this is a TLD, we ignore PHANTOM spaces -- this is done by type
|
|
|
|
* of character in onCodeInput, but since this gets inputted as a whole string we need to
|
|
|
|
* do it here specifically. Then, if the last character before the cursor is a period, then
|
|
|
|
* we cut the dot at the start of ".com". This is because humans tend to type "www.google."
|
|
|
|
* and then press the ".com" key and instinctively don't expect to get "www.google..com".
|
|
|
|
*
|
|
|
|
* @param text the raw text supplied to onTextInput
|
|
|
|
* @return the text to actually send to the editor
|
|
|
|
*/
|
|
|
|
private String performSpecificTldProcessingOnTextInput(final String text) {
|
|
|
|
if (text.length() <= 1 || text.charAt(0) != Constants.CODE_PERIOD
|
|
|
|
|| !Character.isLetter(text.charAt(1))) {
|
|
|
|
// Not a tld: do nothing.
|
|
|
|
return text;
|
|
|
|
}
|
|
|
|
// We have a TLD (or something that looks like this): make sure we don't add
|
|
|
|
// a space even if currently in phantom mode.
|
|
|
|
mSpaceState = SpaceState.NONE;
|
2013-12-20 07:00:26 +00:00
|
|
|
final int codePointBeforeCursor = mConnection.getCodePointBeforeCursor();
|
|
|
|
// If no code point, #getCodePointBeforeCursor returns NOT_A_CODE_POINT.
|
|
|
|
if (Constants.CODE_PERIOD == codePointBeforeCursor) {
|
2013-12-20 06:44:26 +00:00
|
|
|
return text.substring(1);
|
|
|
|
} else {
|
|
|
|
return text;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-12-19 05:34:35 +00:00
|
|
|
/**
|
|
|
|
* Handle a press on the settings key.
|
|
|
|
*/
|
|
|
|
private void onSettingsKeyPressed() {
|
2013-12-19 11:56:37 +00:00
|
|
|
mLatinIME.displaySettingsDialog();
|
2013-12-19 05:34:35 +00:00
|
|
|
}
|
2013-12-19 07:07:24 +00:00
|
|
|
|
2013-12-19 10:29:05 +00:00
|
|
|
/**
|
|
|
|
* Resets the whole input state to the starting state.
|
|
|
|
*
|
|
|
|
* This will clear the composing word, reset the last composed word, clear the suggestion
|
|
|
|
* strip and tell the input connection about it so that it can refresh its caches.
|
|
|
|
*
|
|
|
|
* @param newSelStart the new selection start, in java characters.
|
|
|
|
* @param newSelEnd the new selection end, in java characters.
|
2014-02-19 12:41:45 +00:00
|
|
|
* @param clearSuggestionStrip whether this method should clear the suggestion strip.
|
2013-12-19 10:29:05 +00:00
|
|
|
*/
|
|
|
|
// TODO: how is this different from startInput ?!
|
2014-03-03 05:19:52 +00:00
|
|
|
private void resetEntireInputState(final int newSelStart, final int newSelEnd,
|
|
|
|
final boolean clearSuggestionStrip) {
|
2013-12-19 07:07:24 +00:00
|
|
|
final boolean shouldFinishComposition = mWordComposer.isComposingWord();
|
|
|
|
resetComposingState(true /* alsoResetLastComposedWord */);
|
2014-02-19 12:41:45 +00:00
|
|
|
if (clearSuggestionStrip) {
|
|
|
|
mSuggestionStripViewAccessor.setNeutralSuggestionStrip();
|
|
|
|
}
|
2013-12-19 07:07:24 +00:00
|
|
|
mConnection.resetCachesUponCursorMoveAndReturnSuccess(newSelStart, newSelEnd,
|
|
|
|
shouldFinishComposition);
|
|
|
|
}
|
|
|
|
|
2013-12-19 10:29:05 +00:00
|
|
|
/**
|
|
|
|
* Resets only the composing state.
|
|
|
|
*
|
|
|
|
* Compare #resetEntireInputState, which also clears the suggestion strip and resets the
|
|
|
|
* input connection caches. This only deals with the composing state.
|
|
|
|
*
|
|
|
|
* @param alsoResetLastComposedWord whether to also reset the last composed word.
|
|
|
|
*/
|
2014-03-03 05:19:52 +00:00
|
|
|
private void resetComposingState(final boolean alsoResetLastComposedWord) {
|
2013-12-19 07:07:24 +00:00
|
|
|
mWordComposer.reset();
|
|
|
|
if (alsoResetLastComposedWord) {
|
|
|
|
mLastComposedWord = LastComposedWord.NOT_A_COMPOSED_WORD;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-02-26 07:32:40 +00:00
|
|
|
/**
|
2014-02-26 07:47:55 +00:00
|
|
|
* Make a {@link com.android.inputmethod.latin.SuggestedWords} object containing a typed word
|
|
|
|
* and obsolete suggestions.
|
|
|
|
* See {@link com.android.inputmethod.latin.SuggestedWords#getTypedWordAndPreviousSuggestions(
|
|
|
|
* String, com.android.inputmethod.latin.SuggestedWords)}.
|
2014-02-26 07:32:40 +00:00
|
|
|
* @param typedWord The typed word as a string.
|
2014-02-26 07:47:55 +00:00
|
|
|
* @param previousSuggestedWords The previously suggested words.
|
|
|
|
* @return Obsolete suggestions with the newly typed word.
|
2014-02-26 07:32:40 +00:00
|
|
|
*/
|
2014-02-26 07:47:55 +00:00
|
|
|
private SuggestedWords retrieveOlderSuggestions(final String typedWord,
|
|
|
|
final SuggestedWords previousSuggestedWords) {
|
|
|
|
final SuggestedWords oldSuggestedWords =
|
|
|
|
previousSuggestedWords.isPunctuationSuggestions() ? SuggestedWords.EMPTY
|
|
|
|
: previousSuggestedWords;
|
|
|
|
final ArrayList<SuggestedWords.SuggestedWordInfo> typedWordAndPreviousSuggestions =
|
|
|
|
SuggestedWords.getTypedWordAndPreviousSuggestions(typedWord, oldSuggestedWords);
|
|
|
|
return new SuggestedWords(typedWordAndPreviousSuggestions, null /* rawSuggestions */,
|
|
|
|
false /* typedWordValid */, false /* hasAutoCorrectionCandidate */,
|
|
|
|
true /* isObsoleteSuggestions */, false /* isPrediction */);
|
2014-02-26 07:32:40 +00:00
|
|
|
}
|
|
|
|
|
2013-12-19 10:29:05 +00:00
|
|
|
/**
|
|
|
|
* Gets a chunk of text with or the auto-correction indicator underline span as appropriate.
|
|
|
|
*
|
|
|
|
* This method looks at the old state of the auto-correction indicator to put or not put
|
|
|
|
* the underline span as appropriate. It is important to note that this does not correspond
|
|
|
|
* exactly to whether this word will be auto-corrected to or not: what's important here is
|
|
|
|
* to keep the same indication as before.
|
|
|
|
* When we add a new code point to a composing word, we don't know yet if we are going to
|
|
|
|
* auto-correct it until the suggestions are computed. But in the mean time, we still need
|
|
|
|
* to display the character and to extend the previous underline. To avoid any flickering,
|
|
|
|
* the underline should keep the same color it used to have, even if that's not ultimately
|
|
|
|
* the correct color for this new word. When the suggestions are finished evaluating, we
|
|
|
|
* will call this method again to fix the color of the underline.
|
|
|
|
*
|
|
|
|
* @param text the text on which to maybe apply the span.
|
|
|
|
* @return the same text, with the auto-correction underline span if that's appropriate.
|
|
|
|
*/
|
2014-03-03 05:19:52 +00:00
|
|
|
// TODO: Shouldn't this go in some *Utils class instead?
|
|
|
|
private CharSequence getTextWithUnderline(final String text) {
|
2013-12-19 07:07:24 +00:00
|
|
|
return mIsAutoCorrectionIndicatorOn
|
|
|
|
? SuggestionSpanUtils.getTextWithAutoCorrectionIndicatorUnderline(mLatinIME, text)
|
|
|
|
: text;
|
|
|
|
}
|
|
|
|
|
2013-12-19 10:29:05 +00:00
|
|
|
/**
|
|
|
|
* Sends a DOWN key event followed by an UP key event to the editor.
|
|
|
|
*
|
|
|
|
* If possible at all, avoid using this method. It causes all sorts of race conditions with
|
|
|
|
* the text view because it goes through a different, asynchronous binder. Also, batch edits
|
|
|
|
* are ignored for key events. Use the normal software input methods instead.
|
|
|
|
*
|
|
|
|
* @param keyCode the key code to send inside the key event.
|
|
|
|
*/
|
|
|
|
private void sendDownUpKeyEvent(final int keyCode) {
|
2013-12-19 07:07:24 +00:00
|
|
|
final long eventTime = SystemClock.uptimeMillis();
|
|
|
|
mConnection.sendKeyEvent(new KeyEvent(eventTime, eventTime,
|
2013-12-19 10:29:05 +00:00
|
|
|
KeyEvent.ACTION_DOWN, keyCode, 0, 0, KeyCharacterMap.VIRTUAL_KEYBOARD, 0,
|
2013-12-19 07:07:24 +00:00
|
|
|
KeyEvent.FLAG_SOFT_KEYBOARD | KeyEvent.FLAG_KEEP_TOUCH_MODE));
|
|
|
|
mConnection.sendKeyEvent(new KeyEvent(SystemClock.uptimeMillis(), eventTime,
|
2013-12-19 10:29:05 +00:00
|
|
|
KeyEvent.ACTION_UP, keyCode, 0, 0, KeyCharacterMap.VIRTUAL_KEYBOARD, 0,
|
2013-12-19 07:07:24 +00:00
|
|
|
KeyEvent.FLAG_SOFT_KEYBOARD | KeyEvent.FLAG_KEEP_TOUCH_MODE));
|
|
|
|
}
|
|
|
|
|
2013-12-19 10:29:05 +00:00
|
|
|
/**
|
|
|
|
* Sends a code point to the editor, using the most appropriate method.
|
|
|
|
*
|
|
|
|
* Normally we send code points with commitText, but there are some cases (where backward
|
|
|
|
* compatibility is a concern for example) where we want to use deprecated methods.
|
|
|
|
*
|
2013-12-20 06:00:44 +00:00
|
|
|
* @param settingsValues the current values of the settings.
|
2013-12-19 10:29:05 +00:00
|
|
|
* @param codePoint the code point to send.
|
|
|
|
*/
|
2014-03-04 07:46:42 +00:00
|
|
|
// TODO: replace these two parameters with an InputTransaction
|
2013-12-20 06:00:44 +00:00
|
|
|
private void sendKeyCodePoint(final SettingsValues settingsValues, final int codePoint) {
|
2013-12-19 07:07:24 +00:00
|
|
|
// TODO: Remove this special handling of digit letters.
|
|
|
|
// For backward compatibility. See {@link InputMethodService#sendKeyChar(char)}.
|
2013-12-19 10:29:05 +00:00
|
|
|
if (codePoint >= '0' && codePoint <= '9') {
|
|
|
|
sendDownUpKeyEvent(codePoint - '0' + KeyEvent.KEYCODE_0);
|
2013-12-19 07:07:24 +00:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2013-12-19 10:29:05 +00:00
|
|
|
// TODO: we should do this also when the editor has TYPE_NULL
|
2013-12-20 06:00:44 +00:00
|
|
|
if (Constants.CODE_ENTER == codePoint && settingsValues.isBeforeJellyBean()) {
|
2013-12-19 07:07:24 +00:00
|
|
|
// Backward compatibility mode. Before Jelly bean, the keyboard would simulate
|
|
|
|
// a hardware keyboard event on pressing enter or delete. This is bad for many
|
|
|
|
// reasons (there are race conditions with commits) but some applications are
|
|
|
|
// relying on this behavior so we continue to support it for older apps.
|
|
|
|
sendDownUpKeyEvent(KeyEvent.KEYCODE_ENTER);
|
|
|
|
} else {
|
2013-12-19 10:29:05 +00:00
|
|
|
mConnection.commitText(StringUtils.newSingleCodePointString(codePoint), 1);
|
2013-12-19 07:07:24 +00:00
|
|
|
}
|
|
|
|
}
|
2013-12-19 07:37:07 +00:00
|
|
|
|
2013-12-19 10:29:05 +00:00
|
|
|
/**
|
|
|
|
* Promote a phantom space to an actual space.
|
|
|
|
*
|
|
|
|
* This essentially inserts a space, and that's it. It just checks the options and the text
|
|
|
|
* before the cursor are appropriate before doing it.
|
|
|
|
*
|
|
|
|
* @param settingsValues the current values of the settings.
|
|
|
|
*/
|
2014-03-03 05:19:52 +00:00
|
|
|
private void promotePhantomSpace(final SettingsValues settingsValues) {
|
2013-12-19 08:14:11 +00:00
|
|
|
if (settingsValues.shouldInsertSpacesAutomatically()
|
2014-01-08 09:06:32 +00:00
|
|
|
&& settingsValues.mSpacingAndPunctuations.mCurrentLanguageHasSpaces
|
2013-12-19 08:14:11 +00:00
|
|
|
&& !mConnection.textBeforeCursorLooksLikeURL()) {
|
2013-12-20 06:00:44 +00:00
|
|
|
sendKeyCodePoint(settingsValues, Constants.CODE_SPACE);
|
2013-12-19 08:14:11 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-12-25 11:08:52 +00:00
|
|
|
/**
|
|
|
|
* Do the final processing after a batch input has ended. This commits the word to the editor.
|
|
|
|
* @param settingsValues the current values of the settings.
|
|
|
|
* @param suggestedWords suggestedWords to use.
|
|
|
|
*/
|
2014-03-06 07:10:15 +00:00
|
|
|
public void onUpdateTailBatchInputCompleted(final SettingsValues settingsValues,
|
2013-12-25 11:08:52 +00:00
|
|
|
final SuggestedWords suggestedWords,
|
|
|
|
// TODO: remove this argument
|
|
|
|
final KeyboardSwitcher keyboardSwitcher) {
|
|
|
|
final String batchInputText = suggestedWords.isEmpty() ? null : suggestedWords.getWord(0);
|
|
|
|
if (TextUtils.isEmpty(batchInputText)) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
mConnection.beginBatchEdit();
|
|
|
|
if (SpaceState.PHANTOM == mSpaceState) {
|
|
|
|
promotePhantomSpace(settingsValues);
|
|
|
|
}
|
2014-02-05 02:40:17 +00:00
|
|
|
final SuggestedWordInfo autoCommitCandidate = mSuggestedWords.getAutoCommitCandidate();
|
|
|
|
// Commit except the last word for phrase gesture if the top suggestion is eligible for auto
|
|
|
|
// commit.
|
|
|
|
if (settingsValues.mPhraseGestureEnabled && null != autoCommitCandidate) {
|
2013-12-25 11:08:52 +00:00
|
|
|
// Find the last space
|
|
|
|
final int indexOfLastSpace = batchInputText.lastIndexOf(Constants.CODE_SPACE) + 1;
|
|
|
|
if (0 != indexOfLastSpace) {
|
|
|
|
mConnection.commitText(batchInputText.substring(0, indexOfLastSpace), 1);
|
2014-01-24 13:12:28 +00:00
|
|
|
final SuggestedWords suggestedWordsForLastWordOfPhraseGesture =
|
|
|
|
suggestedWords.getSuggestedWordsForLastWordOfPhraseGesture();
|
2014-01-24 13:45:20 +00:00
|
|
|
mLatinIME.showSuggestionStrip(suggestedWordsForLastWordOfPhraseGesture);
|
2013-12-25 11:08:52 +00:00
|
|
|
}
|
|
|
|
final String lastWord = batchInputText.substring(indexOfLastSpace);
|
|
|
|
mWordComposer.setBatchInputWord(lastWord);
|
|
|
|
mConnection.setComposingText(lastWord, 1);
|
|
|
|
} else {
|
|
|
|
mWordComposer.setBatchInputWord(batchInputText);
|
|
|
|
mConnection.setComposingText(batchInputText, 1);
|
|
|
|
}
|
|
|
|
mConnection.endBatchEdit();
|
|
|
|
// Space state must be updated before calling updateShiftState
|
|
|
|
mSpaceState = SpaceState.PHANTOM;
|
2014-03-27 09:37:16 +00:00
|
|
|
keyboardSwitcher.requestUpdatingShiftState(getCurrentAutoCapsState(settingsValues),
|
|
|
|
getCurrentRecapitalizeState());
|
2013-12-25 11:08:52 +00:00
|
|
|
}
|
|
|
|
|
2013-12-19 10:29:05 +00:00
|
|
|
/**
|
|
|
|
* Commit the typed string to the editor.
|
|
|
|
*
|
|
|
|
* This is typically called when we should commit the currently composing word without applying
|
|
|
|
* auto-correction to it. Typically, we come here upon pressing a separator when the keyboard
|
|
|
|
* is configured to not do auto-correction at all (because of the settings or the properties of
|
|
|
|
* the editor). In this case, `separatorString' is set to the separator that was pressed.
|
|
|
|
* We also come here in a variety of cases with external user action. For example, when the
|
|
|
|
* cursor is moved while there is a composition, or when the keyboard is closed, or when the
|
|
|
|
* user presses the Send button for an SMS, we don't auto-correct as that would be unexpected.
|
|
|
|
* In this case, `separatorString' is set to NOT_A_SEPARATOR.
|
|
|
|
*
|
2013-12-19 12:53:08 +00:00
|
|
|
* @param settingsValues the current values of the settings.
|
|
|
|
* @param separatorString the separator that's causing the commit, or NOT_A_SEPARATOR if none.
|
2013-12-19 10:29:05 +00:00
|
|
|
*/
|
2013-12-19 07:37:07 +00:00
|
|
|
// TODO: Make this private
|
2013-12-19 12:53:08 +00:00
|
|
|
public void commitTyped(final SettingsValues settingsValues, final String separatorString) {
|
2013-12-19 07:37:07 +00:00
|
|
|
if (!mWordComposer.isComposingWord()) return;
|
|
|
|
final String typedWord = mWordComposer.getTypedWord();
|
|
|
|
if (typedWord.length() > 0) {
|
2013-12-19 12:53:08 +00:00
|
|
|
commitChosenWord(settingsValues, typedWord,
|
|
|
|
LastComposedWord.COMMIT_TYPE_USER_TYPED_WORD, separatorString);
|
2013-12-19 07:37:07 +00:00
|
|
|
}
|
|
|
|
}
|
2013-12-19 09:18:18 +00:00
|
|
|
|
2013-12-19 10:29:05 +00:00
|
|
|
/**
|
|
|
|
* Commit the current auto-correction.
|
|
|
|
*
|
|
|
|
* This will commit the best guess of the keyboard regarding what the user meant by typing
|
|
|
|
* the currently composing word. The IME computes suggestions and assigns a confidence score
|
|
|
|
* to each of them; when it's confident enough in one suggestion, it replaces the typed string
|
|
|
|
* by this suggestion at commit time. When it's not confident enough, or when it has no
|
|
|
|
* suggestions, or when the settings or environment does not allow for auto-correction, then
|
|
|
|
* this method just commits the typed string.
|
|
|
|
* Note that if suggestions are currently being computed in the background, this method will
|
|
|
|
* block until the computation returns. This is necessary for consistency (it would be very
|
|
|
|
* strange if pressing space would commit a different word depending on how fast you press).
|
|
|
|
*
|
|
|
|
* @param settingsValues the current value of the settings.
|
|
|
|
* @param separator the separator that's causing the commit to happen.
|
|
|
|
*/
|
2013-12-25 12:32:44 +00:00
|
|
|
private void commitCurrentAutoCorrection(final SettingsValues settingsValues,
|
2013-12-19 09:18:18 +00:00
|
|
|
final String separator,
|
2013-12-25 12:04:27 +00:00
|
|
|
// TODO: Remove this argument.
|
|
|
|
final LatinIME.UIHandler handler) {
|
2013-12-19 09:18:18 +00:00
|
|
|
// Complete any pending suggestions query first
|
|
|
|
if (handler.hasPendingUpdateSuggestions()) {
|
2014-03-03 05:19:52 +00:00
|
|
|
handler.cancelUpdateSuggestionStrip();
|
|
|
|
performUpdateSuggestionStripSync(settingsValues);
|
2013-12-19 09:18:18 +00:00
|
|
|
}
|
|
|
|
final String typedAutoCorrection = mWordComposer.getAutoCorrectionOrNull();
|
|
|
|
final String typedWord = mWordComposer.getTypedWord();
|
|
|
|
final String autoCorrection = (typedAutoCorrection != null)
|
|
|
|
? typedAutoCorrection : typedWord;
|
|
|
|
if (autoCorrection != null) {
|
|
|
|
if (TextUtils.isEmpty(typedWord)) {
|
|
|
|
throw new RuntimeException("We have an auto-correction but the typed word "
|
|
|
|
+ "is empty? Impossible! I must commit suicide.");
|
|
|
|
}
|
2013-12-19 12:53:08 +00:00
|
|
|
commitChosenWord(settingsValues, autoCorrection,
|
|
|
|
LastComposedWord.COMMIT_TYPE_DECIDED_WORD, separator);
|
2013-12-19 09:18:18 +00:00
|
|
|
if (!typedWord.equals(autoCorrection)) {
|
|
|
|
// This will make the correction flash for a short while as a visual clue
|
|
|
|
// to the user that auto-correction happened. It has no other effect; in particular
|
|
|
|
// note that this won't affect the text inside the text field AT ALL: it only makes
|
|
|
|
// the segment of text starting at the supplied index and running for the length
|
|
|
|
// of the auto-correction flash. At this moment, the "typedWord" argument is
|
|
|
|
// ignored by TextView.
|
2014-02-05 09:33:41 +00:00
|
|
|
mConnection.commitCorrection(new CorrectionInfo(
|
|
|
|
mConnection.getExpectedSelectionEnd() - autoCorrection.length(),
|
2013-12-19 09:18:18 +00:00
|
|
|
typedWord, autoCorrection));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2013-12-19 12:53:08 +00:00
|
|
|
|
|
|
|
/**
|
|
|
|
* Commits the chosen word to the text field and saves it for later retrieval.
|
|
|
|
*
|
|
|
|
* @param settingsValues the current values of the settings.
|
|
|
|
* @param chosenWord the word we want to commit.
|
|
|
|
* @param commitType the type of the commit, as one of LastComposedWord.COMMIT_TYPE_*
|
|
|
|
* @param separatorString the separator that's causing the commit, or NOT_A_SEPARATOR if none.
|
|
|
|
*/
|
2014-03-03 05:19:52 +00:00
|
|
|
private void commitChosenWord(final SettingsValues settingsValues, final String chosenWord,
|
2013-12-19 12:53:08 +00:00
|
|
|
final int commitType, final String separatorString) {
|
|
|
|
final SuggestedWords suggestedWords = mSuggestedWords;
|
2014-01-09 09:36:23 +00:00
|
|
|
final CharSequence chosenWordWithSuggestions =
|
|
|
|
SuggestionSpanUtils.getTextWithSuggestionSpan(mLatinIME, chosenWord,
|
|
|
|
suggestedWords);
|
2014-06-27 08:59:21 +00:00
|
|
|
// When we are composing word, get previous words information from the 2nd previous word
|
|
|
|
// because the 1st previous word is the word to be committed. Otherwise get previous words
|
|
|
|
// information from the 1st previous word.
|
2014-05-21 06:40:08 +00:00
|
|
|
final PrevWordsInfo prevWordsInfo = mConnection.getPrevWordsInfoFromNthPreviousWord(
|
2014-06-27 08:59:21 +00:00
|
|
|
settingsValues.mSpacingAndPunctuations, mWordComposer.isComposingWord() ? 2 : 1);
|
2014-05-12 09:04:43 +00:00
|
|
|
mConnection.commitText(chosenWordWithSuggestions, 1);
|
2013-12-19 12:53:08 +00:00
|
|
|
// Add the word to the user history dictionary
|
2014-05-21 02:15:38 +00:00
|
|
|
performAdditionToUserHistoryDictionary(settingsValues, chosenWord, prevWordsInfo);
|
2013-12-19 12:53:08 +00:00
|
|
|
// TODO: figure out here if this is an auto-correct or if the best word is actually
|
|
|
|
// what user typed. Note: currently this is done much later in
|
|
|
|
// LastComposedWord#didCommitTypedWord by string equality of the remembered
|
|
|
|
// strings.
|
|
|
|
mLastComposedWord = mWordComposer.commitWord(commitType,
|
2014-05-21 02:15:38 +00:00
|
|
|
chosenWordWithSuggestions, separatorString, prevWordsInfo);
|
2013-12-19 12:53:08 +00:00
|
|
|
}
|
2013-12-20 11:07:16 +00:00
|
|
|
|
|
|
|
/**
|
|
|
|
* Retry resetting caches in the rich input connection.
|
|
|
|
*
|
|
|
|
* When the editor can't be accessed we can't reset the caches, so we schedule a retry.
|
|
|
|
* This method handles the retry, and re-schedules a new retry if we still can't access.
|
|
|
|
* We only retry up to 5 times before giving up.
|
|
|
|
*
|
|
|
|
* @param settingsValues the current values of the settings.
|
|
|
|
* @param tryResumeSuggestions Whether we should resume suggestions or not.
|
|
|
|
* @param remainingTries How many times we may try again before giving up.
|
2013-12-27 08:04:12 +00:00
|
|
|
* @return whether true if the caches were successfully reset, false otherwise.
|
2013-12-20 11:07:16 +00:00
|
|
|
*/
|
|
|
|
// TODO: make this private
|
2013-12-27 08:04:12 +00:00
|
|
|
public boolean retryResetCachesAndReturnSuccess(final SettingsValues settingsValues,
|
2013-12-20 11:07:16 +00:00
|
|
|
final boolean tryResumeSuggestions, final int remainingTries,
|
|
|
|
// TODO: remove these arguments
|
2013-12-27 08:04:12 +00:00
|
|
|
final LatinIME.UIHandler handler) {
|
Fix a bug on rotation with selection.
The symptom : when text is selected and the device is rotated,
sometimes the keyboard sets the word as being composed around
the start of the selection. Upon the next rotation this ends up
with the keyboard committing some text in place of the selection.
The cause : another bug in the framework with rotation >.>
The keyboard receives a call to startInput with a wrong cursor
position, namely one that does not represent a selection. The
keyboard sets a composition according to this wrong data. When
the keyboard is rotated again, it commits the text, which takes
the place of the selection.
The solution : actually when restarting input the keyboard
realizes that the cursor position is wrong. We cancel composition
at that time.
For robustness, this change also implements two other defensive
changes : upon call to onUpdateSelection, we actually realize
that the previous values were wrong, so we also fix it at that
time, and in addition, when rotating, we finishComposingText()
instead of commitText() which is less dangerous. Implementing
this later change also allows us to let less internal variables
from InputLogic escape to LatinIME, so it's also a good change
for design.
Bug: 14140799
Change-Id: Ib10de18e53e376ac1bbc8487e13d969828483346
2014-06-05 08:48:10 +00:00
|
|
|
final boolean shouldFinishComposition = mConnection.hasSelection()
|
|
|
|
|| !mConnection.isCursorPositionKnown();
|
2013-12-20 11:07:16 +00:00
|
|
|
if (!mConnection.resetCachesUponCursorMoveAndReturnSuccess(
|
2014-01-09 05:09:26 +00:00
|
|
|
mConnection.getExpectedSelectionStart(), mConnection.getExpectedSelectionEnd(),
|
Fix a bug on rotation with selection.
The symptom : when text is selected and the device is rotated,
sometimes the keyboard sets the word as being composed around
the start of the selection. Upon the next rotation this ends up
with the keyboard committing some text in place of the selection.
The cause : another bug in the framework with rotation >.>
The keyboard receives a call to startInput with a wrong cursor
position, namely one that does not represent a selection. The
keyboard sets a composition according to this wrong data. When
the keyboard is rotated again, it commits the text, which takes
the place of the selection.
The solution : actually when restarting input the keyboard
realizes that the cursor position is wrong. We cancel composition
at that time.
For robustness, this change also implements two other defensive
changes : upon call to onUpdateSelection, we actually realize
that the previous values were wrong, so we also fix it at that
time, and in addition, when rotating, we finishComposingText()
instead of commitText() which is less dangerous. Implementing
this later change also allows us to let less internal variables
from InputLogic escape to LatinIME, so it's also a good change
for design.
Bug: 14140799
Change-Id: Ib10de18e53e376ac1bbc8487e13d969828483346
2014-06-05 08:48:10 +00:00
|
|
|
shouldFinishComposition)) {
|
2013-12-20 11:07:16 +00:00
|
|
|
if (0 < remainingTries) {
|
|
|
|
handler.postResetCaches(tryResumeSuggestions, remainingTries - 1);
|
2013-12-27 08:04:12 +00:00
|
|
|
return false;
|
2013-12-20 11:07:16 +00:00
|
|
|
}
|
2013-12-27 08:04:12 +00:00
|
|
|
// If remainingTries is 0, we should stop waiting for new tries, however we'll still
|
|
|
|
// return true as we need to perform other tasks (for example, loading the keyboard).
|
2013-12-20 11:07:16 +00:00
|
|
|
}
|
2014-01-09 05:09:26 +00:00
|
|
|
mConnection.tryFixLyingCursorPosition();
|
2013-12-20 11:07:16 +00:00
|
|
|
if (tryResumeSuggestions) {
|
2014-06-06 04:12:11 +00:00
|
|
|
// This is triggered when starting input anew, so we want to include the resumed
|
|
|
|
// word in suggestions.
|
|
|
|
handler.postResumeSuggestions(true /* shouldIncludeResumedWordInSuggestions */);
|
2013-12-20 11:07:16 +00:00
|
|
|
}
|
2013-12-27 08:04:12 +00:00
|
|
|
return true;
|
2013-12-20 11:07:16 +00:00
|
|
|
}
|
2014-06-13 07:50:05 +00:00
|
|
|
|
|
|
|
public void getSuggestedWords(final SettingsValues settingsValues,
|
|
|
|
final ProximityInfo proximityInfo, final int keyboardShiftMode, final int sessionId,
|
|
|
|
final int sequenceNumber, final OnGetSuggestedWordsCallback callback) {
|
|
|
|
mWordComposer.adviseCapitalizedModeBeforeFetchingSuggestions(
|
|
|
|
getActualCapsMode(settingsValues, keyboardShiftMode));
|
|
|
|
mSuggest.getSuggestedWords(mWordComposer,
|
|
|
|
getPrevWordsInfoFromNthPreviousWordForSuggestion(
|
|
|
|
settingsValues.mSpacingAndPunctuations,
|
|
|
|
// Get the word on which we should search the bigrams. If we are composing
|
|
|
|
// a word, it's whatever is *before* the half-committed word in the buffer,
|
|
|
|
// hence 2; if we aren't, we should just skip whitespace if any, so 1.
|
|
|
|
mWordComposer.isComposingWord() ? 2 : 1),
|
|
|
|
proximityInfo, settingsValues.mBlockPotentiallyOffensive,
|
|
|
|
settingsValues.mAutoCorrectionEnabled,
|
|
|
|
settingsValues.mAdditionalFeaturesSettingValues,
|
|
|
|
sessionId, sequenceNumber, callback);
|
|
|
|
}
|
2013-12-18 09:08:35 +00:00
|
|
|
}
|