am 1284e556: [IL70] Remove unused arguments
* commit '1284e556f4ec998c6f3ea80905d690cbb4c9dc82': [IL70] Remove unused argumentsmain
commit
4b68386775
|
@ -205,7 +205,7 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
|
|||
case MSG_RESUME_SUGGESTIONS:
|
||||
latinIme.mInputLogic.restartSuggestionsOnWordTouchedByCursor(
|
||||
latinIme.mSettings.getCurrent(),
|
||||
false /* includeResumedWordInSuggestions */, latinIme.mKeyboardSwitcher);
|
||||
false /* includeResumedWordInSuggestions */);
|
||||
break;
|
||||
case MSG_REOPEN_DICTIONARIES:
|
||||
latinIme.initSuggest();
|
||||
|
|
|
@ -300,11 +300,9 @@ public final class WordComposer {
|
|||
* @param coordinates the x, y coordinates of the key in the CoordinateUtils format
|
||||
* @param previousWord the previous word, to use as context for suggestions. Can be null if
|
||||
* the context is nil (typically, at start of text).
|
||||
* @param keyboard the keyboard this is typed on, for coordinate info/proximity.
|
||||
*/
|
||||
// TODO[IL]: the Keyboard argument is now unused. Remove it.
|
||||
public void setComposingWord(final int[] codePoints, final int[] coordinates,
|
||||
final CharSequence previousWord, final Keyboard keyboard) {
|
||||
final CharSequence previousWord) {
|
||||
reset();
|
||||
final int length = codePoints.length;
|
||||
for (int i = 0; i < length; ++i) {
|
||||
|
|
|
@ -703,7 +703,7 @@ public final class InputLogic {
|
|||
if (settingsValues.mIsInternal) {
|
||||
LatinImeLoggerUtils.onAutoCorrectionCancellation();
|
||||
}
|
||||
revertCommit(settingsValues, keyboardSwitcher, handler);
|
||||
revertCommit(settingsValues, handler);
|
||||
return;
|
||||
}
|
||||
if (mEnteredText != null && mConnection.sameAsTextBeforeCursor(mEnteredText)) {
|
||||
|
@ -799,7 +799,7 @@ public final class InputLogic {
|
|||
&& !mConnection.isCursorFollowedByWordCharacter(
|
||||
settingsValues.mSpacingAndPunctuations)) {
|
||||
restartSuggestionsOnWordTouchedByCursor(settingsValues,
|
||||
true /* includeResumedWordInSuggestions */, keyboardSwitcher);
|
||||
true /* includeResumedWordInSuggestions */);
|
||||
}
|
||||
// We just removed at least one character. We need to update the auto-caps state.
|
||||
keyboardSwitcher.updateShiftState();
|
||||
|
@ -1037,9 +1037,7 @@ public final class InputLogic {
|
|||
*/
|
||||
// TODO: make this private.
|
||||
public void restartSuggestionsOnWordTouchedByCursor(final SettingsValues settingsValues,
|
||||
final boolean includeResumedWordInSuggestions,
|
||||
// TODO: Remove this argument.
|
||||
final KeyboardSwitcher keyboardSwitcher) {
|
||||
final boolean includeResumedWordInSuggestions) {
|
||||
// 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.
|
||||
|
@ -1093,8 +1091,7 @@ public final class InputLogic {
|
|||
// 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.
|
||||
0 == numberOfCharsInWordBeforeCursor ? 1 : 2),
|
||||
keyboardSwitcher.getKeyboard());
|
||||
0 == numberOfCharsInWordBeforeCursor ? 1 : 2));
|
||||
mWordComposer.setCursorPositionWithinWord(
|
||||
typedWord.codePointCount(0, numberOfCharsInWordBeforeCursor));
|
||||
mConnection.setComposingRegion(expectedCursorPosition - numberOfCharsInWordBeforeCursor,
|
||||
|
@ -1149,8 +1146,8 @@ public final class InputLogic {
|
|||
* @param settingsValues the current settings values.
|
||||
*/
|
||||
private void revertCommit(final SettingsValues settingsValues,
|
||||
// TODO: remove these arguments
|
||||
final KeyboardSwitcher keyboardSwitcher, final LatinIME.UIHandler handler) {
|
||||
// TODO: remove this argument
|
||||
final LatinIME.UIHandler handler) {
|
||||
final String previousWord = mLastComposedWord.mPrevWord;
|
||||
final CharSequence originallyTypedWord = mLastComposedWord.mTypedWord;
|
||||
final CharSequence committedWord = mLastComposedWord.mCommittedWord;
|
||||
|
@ -1213,8 +1210,7 @@ public final class InputLogic {
|
|||
// with the typed word, so we need to resume suggestions right away.
|
||||
final int[] codePoints = StringUtils.toCodePointArray(stringToCommit);
|
||||
mWordComposer.setComposingWord(codePoints,
|
||||
mLatinIME.getCoordinatesForCurrentKeyboard(codePoints),
|
||||
previousWord, keyboardSwitcher.getKeyboard());
|
||||
mLatinIME.getCoordinatesForCurrentKeyboard(codePoints), previousWord);
|
||||
mConnection.setComposingText(textToCommit, 1);
|
||||
}
|
||||
if (settingsValues.mIsInternal) {
|
||||
|
|
|
@ -316,7 +316,7 @@ public abstract class AndroidWordLevelSpellCheckerSession extends Session {
|
|||
final int[] codePoints = StringUtils.toCodePointArray(text);
|
||||
composer.setComposingWord(codePoints,
|
||||
LatinIME.getCoordinatesForKeyboard(codePoints, dictInfo.mKeyboard),
|
||||
null /* previousWord */, dictInfo.mKeyboard);
|
||||
null /* previousWord */);
|
||||
// TODO: make a spell checker option to block offensive words or not
|
||||
final ArrayList<SuggestedWordInfo> suggestions =
|
||||
dictInfo.mDictionary.getSuggestions(composer, prevWord,
|
||||
|
|
|
@ -39,8 +39,7 @@ public class WordComposerTests extends AndroidTestCase {
|
|||
final int[] COORDINATES_WITHIN_BMP =
|
||||
LatinIME.getCoordinatesForKeyboard(CODEPOINTS_WITHIN_BMP, null);
|
||||
final String PREVWORD = "prevword";
|
||||
wc.setComposingWord(CODEPOINTS_WITHIN_BMP, COORDINATES_WITHIN_BMP,
|
||||
PREVWORD, null /* keyboard */);
|
||||
wc.setComposingWord(CODEPOINTS_WITHIN_BMP, COORDINATES_WITHIN_BMP, PREVWORD);
|
||||
assertEquals(wc.size(),
|
||||
STR_WITHIN_BMP.codePointCount(0, STR_WITHIN_BMP.length()));
|
||||
assertFalse(wc.isCursorFrontOrMiddleOfComposingWord());
|
||||
|
@ -73,7 +72,7 @@ public class WordComposerTests extends AndroidTestCase {
|
|||
final int[] COORDINATES_WITH_SUPPLEMENTARY_CHAR = LatinIME.getCoordinatesForKeyboard(
|
||||
CODEPOINTS_WITH_SUPPLEMENTARY_CHAR, null);
|
||||
wc.setComposingWord(CODEPOINTS_WITH_SUPPLEMENTARY_CHAR, COORDINATES_WITH_SUPPLEMENTARY_CHAR,
|
||||
null /* previousWord */, null /* keyboard */);
|
||||
null /* previousWord */);
|
||||
assertEquals(wc.size(), CODEPOINTS_WITH_SUPPLEMENTARY_CHAR.length);
|
||||
assertFalse(wc.isCursorFrontOrMiddleOfComposingWord());
|
||||
wc.setCursorPositionWithinWord(3);
|
||||
|
@ -85,45 +84,45 @@ public class WordComposerTests extends AndroidTestCase {
|
|||
assertNull(wc.getPreviousWordForSuggestion());
|
||||
|
||||
wc.setComposingWord(CODEPOINTS_WITH_SUPPLEMENTARY_CHAR, COORDINATES_WITH_SUPPLEMENTARY_CHAR,
|
||||
STR_WITHIN_BMP, null /* keyboard */);
|
||||
STR_WITHIN_BMP);
|
||||
wc.setCursorPositionWithinWord(3);
|
||||
assertTrue(wc.moveCursorByAndReturnIfInsideComposingWord(7));
|
||||
assertEquals(STR_WITHIN_BMP, wc.getPreviousWordForSuggestion());
|
||||
|
||||
wc.setComposingWord(CODEPOINTS_WITH_SUPPLEMENTARY_CHAR, COORDINATES_WITH_SUPPLEMENTARY_CHAR,
|
||||
STR_WITH_SUPPLEMENTARY_CHAR, null /* keyboard */);
|
||||
STR_WITH_SUPPLEMENTARY_CHAR);
|
||||
wc.setCursorPositionWithinWord(3);
|
||||
assertTrue(wc.moveCursorByAndReturnIfInsideComposingWord(7));
|
||||
assertEquals(STR_WITH_SUPPLEMENTARY_CHAR, wc.getPreviousWordForSuggestion());
|
||||
|
||||
wc.setComposingWord(CODEPOINTS_WITH_SUPPLEMENTARY_CHAR, COORDINATES_WITH_SUPPLEMENTARY_CHAR,
|
||||
STR_WITHIN_BMP, null /* keyboard */);
|
||||
STR_WITHIN_BMP);
|
||||
wc.setCursorPositionWithinWord(3);
|
||||
assertTrue(wc.moveCursorByAndReturnIfInsideComposingWord(-3));
|
||||
assertFalse(wc.moveCursorByAndReturnIfInsideComposingWord(-1));
|
||||
assertEquals(STR_WITHIN_BMP, wc.getPreviousWordForSuggestion());
|
||||
|
||||
wc.setComposingWord(CODEPOINTS_WITH_SUPPLEMENTARY_CHAR, COORDINATES_WITH_SUPPLEMENTARY_CHAR,
|
||||
null /* previousWord */, null /* keyboard */);
|
||||
null /* previousWord */);
|
||||
wc.setCursorPositionWithinWord(3);
|
||||
assertFalse(wc.moveCursorByAndReturnIfInsideComposingWord(-9));
|
||||
assertNull(wc.getPreviousWordForSuggestion());
|
||||
|
||||
wc.setComposingWord(CODEPOINTS_WITH_SUPPLEMENTARY_CHAR, COORDINATES_WITH_SUPPLEMENTARY_CHAR,
|
||||
STR_WITH_SUPPLEMENTARY_CHAR, null /* keyboard */);
|
||||
STR_WITH_SUPPLEMENTARY_CHAR);
|
||||
assertTrue(wc.moveCursorByAndReturnIfInsideComposingWord(-10));
|
||||
assertEquals(STR_WITH_SUPPLEMENTARY_CHAR, wc.getPreviousWordForSuggestion());
|
||||
|
||||
wc.setComposingWord(CODEPOINTS_WITH_SUPPLEMENTARY_CHAR, COORDINATES_WITH_SUPPLEMENTARY_CHAR,
|
||||
null /* previousWord */, null /* keyboard */);
|
||||
null /* previousWord */);
|
||||
assertFalse(wc.moveCursorByAndReturnIfInsideComposingWord(-11));
|
||||
|
||||
wc.setComposingWord(CODEPOINTS_WITH_SUPPLEMENTARY_CHAR, COORDINATES_WITH_SUPPLEMENTARY_CHAR,
|
||||
null /* previousWord */, null /* keyboard */);
|
||||
null /* previousWord */);
|
||||
assertTrue(wc.moveCursorByAndReturnIfInsideComposingWord(0));
|
||||
|
||||
wc.setComposingWord(CODEPOINTS_WITH_SUPPLEMENTARY_CHAR, COORDINATES_WITH_SUPPLEMENTARY_CHAR,
|
||||
null /* previousWord */, null /* keyboard */);
|
||||
null /* previousWord */);
|
||||
wc.setCursorPositionWithinWord(2);
|
||||
assertTrue(wc.moveCursorByAndReturnIfInsideComposingWord(0));
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue