Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 183ba6a0 authored by Jean Chalard's avatar Jean Chalard Committed by Android Git Automerger
Browse files

am 1f8fc62c: Add useful information to LastComposedWord (A2)

* commit '1f8fc62c':
  Add useful information to LastComposedWord (A2)
parents 56b26195 1f8fc62c
Loading
Loading
Loading
Loading
+14 −1
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@

package com.android.inputmethod.latin;

import java.util.ArrayList;

/**
 * This class encapsulates data about a word previously composed, but that has been
 * committed already. This is used for resuming suggestion, and cancel auto-correction.
@@ -37,8 +39,19 @@ public class LastComposedWord {
    public static final int COMMIT_TYPE_CANCEL_AUTO_CORRECT = 3;

    public final int mType;
    public final ArrayList<int[]> mCodes;
    public final int[] mXCoordinates;
    public final int[] mYCoordinates;
    public final String mTypedWord;
    public final String mAutoCorrection;

    public LastComposedWord(final int type) {
    public LastComposedWord(final int type, final ArrayList<int[]> codes, final int[] xCoordinates,
            final int[] yCoordinates, final String typedWord, final String autoCorrection) {
        mType = type;
        mCodes = codes;
        mXCoordinates = xCoordinates;
        mYCoordinates = yCoordinates;
        mTypedWord = typedWord;
        mAutoCorrection = autoCorrection;
    }
}
+4 −1
Original line number Diff line number Diff line
@@ -346,9 +346,12 @@ public class WordComposer {
            // Only ever revert an auto-correct.
            mCommittedWordSavedForSuggestionResuming.mAutoCorrection = null;
        }
        final LastComposedWord lastComposedWord = new LastComposedWord(type, mCurrentWord.mCodes,
                mCurrentWord.mXCoordinates, mCurrentWord.mYCoordinates,
                mCurrentWord.mTypedWord.toString(), mCurrentWord.mAutoCorrection.toString());
        // TODO: improve performance by swapping buffers instead of creating a new object.
        mCurrentWord = new CharacterStore();
        return new LastComposedWord(type);
        return lastComposedWord;
    }

    public boolean hasWordKeptForSuggestionResuming() {