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

Commit 9e713dd4 authored by Jean Chalard's avatar Jean Chalard Committed by Android Git Automerger
Browse files

am 5971a0a0: Remove a useless member (A8)

* commit '5971a0a0':
  Remove a useless member (A8)
parents 2c09f01a 5971a0a0
Loading
Loading
Loading
Loading
+2 −4
Original line number Original line Diff line number Diff line
@@ -40,7 +40,6 @@ public class LastComposedWord {
    // an auto-correction.
    // an auto-correction.
    public static final int COMMIT_TYPE_CANCEL_AUTO_CORRECT = 3;
    public static final int COMMIT_TYPE_CANCEL_AUTO_CORRECT = 3;


    public final int mType;
    public final ArrayList<int[]> mCodes;
    public final ArrayList<int[]> mCodes;
    public final int[] mXCoordinates;
    public final int[] mXCoordinates;
    public final int[] mYCoordinates;
    public final int[] mYCoordinates;
@@ -50,11 +49,10 @@ public class LastComposedWord {
    private boolean mActive;
    private boolean mActive;


    public static final LastComposedWord NOT_A_COMPOSED_WORD =
    public static final LastComposedWord NOT_A_COMPOSED_WORD =
            new LastComposedWord(COMMIT_TYPE_USER_TYPED_WORD, null, null, null, "", "");
            new LastComposedWord(null, null, null, "", "");


    public LastComposedWord(final int type, final ArrayList<int[]> codes, final int[] xCoordinates,
    public LastComposedWord(final ArrayList<int[]> codes, final int[] xCoordinates,
            final int[] yCoordinates, final String typedWord, final String autoCorrection) {
            final int[] yCoordinates, final String typedWord, final String autoCorrection) {
        mType = type;
        mCodes = codes;
        mCodes = codes;
        mXCoordinates = xCoordinates;
        mXCoordinates = xCoordinates;
        mYCoordinates = yCoordinates;
        mYCoordinates = yCoordinates;
+1 −1
Original line number Original line Diff line number Diff line
@@ -309,7 +309,7 @@ public class WordComposer {
        // LastComposedWord#didAutoCorrectToAnotherWord with #equals(). It would be marginally
        // LastComposedWord#didAutoCorrectToAnotherWord with #equals(). It would be marginally
        // cleaner to do it here, but it would be slower (since we would #equals() for each commit,
        // cleaner to do it here, but it would be slower (since we would #equals() for each commit,
        // instead of only on cancel), and ultimately we want to figure it out even earlier anyway.
        // instead of only on cancel), and ultimately we want to figure it out even earlier anyway.
        final LastComposedWord lastComposedWord = new LastComposedWord(type, mCodes,
        final LastComposedWord lastComposedWord = new LastComposedWord(mCodes,
                mXCoordinates, mYCoordinates, mTypedWord.toString(),
                mXCoordinates, mYCoordinates, mTypedWord.toString(),
                (type != LastComposedWord.COMMIT_TYPE_DECIDED_WORD) || (null == mAutoCorrection)
                (type != LastComposedWord.COMMIT_TYPE_DECIDED_WORD) || (null == mAutoCorrection)
                        ? null : mAutoCorrection.toString());
                        ? null : mAutoCorrection.toString());