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

Commit 939e3f31 authored by Kurt Partridge's avatar Kurt Partridge Committed by Android (Google) Code Review
Browse files

Merge "[Rlog59d] Pass separatorString through revertCommit"

parents 3e05370d 31156c81

java/src/com/android/inputmethod/latin/LatinIME.java

+1 −1
Original line number Diff line number Diff line
@@ -2321,7 +2321,7 @@ public final class LatinIME extends InputMethodService implements KeyboardAction 
        }

        if (ProductionFlag.IS_EXPERIMENTAL) {

            ResearchLogger.latinIME_revertCommit(committedWord, originallyTypedWord,

                    mWordComposer.isBatchMode());

                    mWordComposer.isBatchMode(), mLastComposedWord.mSeparatorString);

            ResearchLogger.getInstance().uncommitCurrentLogUnit(committedWord,

                    true /* dumpCurrentLogUnit */);

        }

java/src/com/android/inputmethod/research/ResearchLogger.java

+5 −3
Original line number Diff line number Diff line
@@ -1297,9 +1297,10 @@ public class ResearchLogger implements SharedPreferences.OnSharedPreferenceChang 
     */

    private static final LogStatement LOGSTATEMENT_LATINIME_REVERTCOMMIT =

            new LogStatement("LatinIMERevertCommit", true, false, "committedWord",

                    "originallyTypedWord");

                    "originallyTypedWord", "separatorString");

    public static void latinIME_revertCommit(final String committedWord,

            final String originallyTypedWord, final boolean isBatchMode) {

            final String originallyTypedWord, final boolean isBatchMode,

            final String separatorString) {

        final ResearchLogger researchLogger = getInstance();

        // TODO: Verify that mCurrentLogUnit has been restored and contains the reverted word.

        final LogUnit logUnit;
@@ -1314,7 +1315,8 @@ public class ResearchLogger implements SharedPreferences.OnSharedPreferenceChang 
            }

        }

        researchLogger.enqueueEvent(logUnit != null ? logUnit : researchLogger.mCurrentLogUnit,

                LOGSTATEMENT_LATINIME_REVERTCOMMIT, committedWord, originallyTypedWord);

                LOGSTATEMENT_LATINIME_REVERTCOMMIT, committedWord, originallyTypedWord,

                separatorString);

        researchLogger.mStatistics.recordRevertCommit(SystemClock.uptimeMillis());

        researchLogger.commitCurrentLogUnitAsWord(originallyTypedWord, Long.MAX_VALUE, isBatchMode);

    }