n/futokb
1
0
Fork 0
mirror of https://gitlab.futo.org/keyboard/latinime.git synced 2024-09-28 14:54:30 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge "[Rlog50] capture bigrams properly even with deletions"

Browse Source
This commit is contained in:
Kurt Partridge 2013-01-09 19:52:44 -08:00 committed by Android (Google) Code Review
commit f11c4a9aeb
7 changed files with 191 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
java/src/com/android/inputmethod/latin/LatinIME.java
View File

@ -1131,7 +1131,7 @@ public final class LatinIME extends InputMethodService implements KeyboardAction
commitChosenWord(typedWord, LastComposedWord.COMMIT_TYPE_USER_TYPED_WORD,
separatorString);
if (ProductionFlag.IS_EXPERIMENTAL) {
ResearchLogger.getInstance().onWordFinished(typedWord);
ResearchLogger.getInstance().onWordFinished(typedWord, mWordComposer.isBatchMode());
}
}
}
@ -1163,7 +1163,7 @@ public final class LatinIME extends InputMethodService implements KeyboardAction
}
private void swapSwapperAndSpace() {
CharSequence lastTwo = mConnection.getTextBeforeCursor(2, 0);
final CharSequence lastTwo = mConnection.getTextBeforeCursor(2, 0);
// It is guaranteed lastTwo.charAt(1) is a swapper - else this method is not called.
if (lastTwo != null && lastTwo.length() == 2
&& lastTwo.charAt(0) == Constants.CODE_SPACE) {
@ -1171,7 +1171,7 @@ public final class LatinIME extends InputMethodService implements KeyboardAction
final String text = lastTwo.charAt(1) + " ";
mConnection.commitText(text, 1);
if (ProductionFlag.IS_EXPERIMENTAL) {
ResearchLogger.latinIME_swapSwapperAndSpace(text);
ResearchLogger.latinIME_swapSwapperAndSpace(lastTwo, text);
}
mKeyboardSwitcher.updateShiftState();
}
@ -1191,7 +1191,8 @@ public final class LatinIME extends InputMethodService implements KeyboardAction
final String textToInsert = ". ";
mConnection.commitText(textToInsert, 1);
if (ProductionFlag.IS_EXPERIMENTAL) {
ResearchLogger.latinIME_maybeDoubleSpacePeriod(textToInsert);
ResearchLogger.latinIME_maybeDoubleSpacePeriod(textToInsert,
false /* isBatchMode */);
}
mKeyboardSwitcher.updateShiftState();
return true;
@ -1440,7 +1441,7 @@ public final class LatinIME extends InputMethodService implements KeyboardAction
}
mConnection.commitText(text, 1);
if (ProductionFlag.IS_EXPERIMENTAL) {
ResearchLogger.latinIME_onTextInput(text);
ResearchLogger.latinIME_onTextInput(text, false /* isBatchMode */);
}
mConnection.endBatchEdit();
// Space state must be updated before calling updateShiftState
@ -1665,10 +1666,13 @@ public final class LatinIME extends InputMethodService implements KeyboardAction
final int length = mWordComposer.size();
if (length > 0) {
if (mWordComposer.isBatchMode()) {
mWordComposer.reset();
if (ProductionFlag.IS_EXPERIMENTAL) {
ResearchLogger.latinIME_handleBackspace_batch(mWordComposer.getTypedWord());
final String word = mWordComposer.getTypedWord();
ResearchLogger.latinIME_handleBackspace_batch(word);
ResearchLogger.getInstance().uncommitCurrentLogUnit(
word, false /* dumpCurrentLogUnit */);
}
mWordComposer.reset();
} else {
mWordComposer.deleteLast();
}
@ -2084,7 +2088,7 @@ public final class LatinIME extends InputMethodService implements KeyboardAction
}
if (ProductionFlag.IS_EXPERIMENTAL) {
ResearchLogger.latinIme_commitCurrentAutoCorrection(typedWord, autoCorrection,
separatorString);
separatorString, mWordComposer.isBatchMode());
}
mExpectingUpdateSelection = true;
commitChosenWord(autoCorrection, LastComposedWord.COMMIT_TYPE_DECIDED_WORD,
@ -2118,7 +2122,8 @@ public final class LatinIME extends InputMethodService implements KeyboardAction
onCodeInput(primaryCode,
Constants.SUGGESTION_STRIP_COORDINATE, Constants.SUGGESTION_STRIP_COORDINATE);
if (ProductionFlag.IS_EXPERIMENTAL) {
ResearchLogger.latinIME_punctuationSuggestion(index, suggestion);
ResearchLogger.latinIME_punctuationSuggestion(index, suggestion,
false /* isBatchMode */);
}
return;
}
@ -2157,7 +2162,8 @@ public final class LatinIME extends InputMethodService implements KeyboardAction
commitChosenWord(suggestion, LastComposedWord.COMMIT_TYPE_MANUAL_PICK,
LastComposedWord.NOT_A_SEPARATOR);
if (ProductionFlag.IS_EXPERIMENTAL) {
ResearchLogger.latinIME_pickSuggestionManually(replacedWord, index, suggestion);
ResearchLogger.latinIME_pickSuggestionManually(replacedWord, index, suggestion,
mWordComposer.isBatchMode());
}
mConnection.endBatchEdit();
// Don't allow cancellation of manual pick
@ -2254,6 +2260,12 @@ public final class LatinIME extends InputMethodService implements KeyboardAction
mConnection.getWordBeforeCursorIfAtEndOfWord(mSettings.getCurrent());
if (null != word) {
restartSuggestionsOnWordBeforeCursor(word);
// TODO: Handle the case where the user manually moves the cursor and then backs up over
// a separator. In that case, the current log unit should not be uncommitted.
if (ProductionFlag.IS_EXPERIMENTAL) {
ResearchLogger.getInstance().uncommitCurrentLogUnit(word.toString(),
true /* dumpCurrentLogUnit */);
}
}
}
@ -2297,7 +2309,8 @@ public final class LatinIME extends InputMethodService implements KeyboardAction
Constants.NOT_A_COORDINATE, Constants.NOT_A_COORDINATE);
}
if (ProductionFlag.IS_EXPERIMENTAL) {
ResearchLogger.latinIME_revertCommit(committedWord, originallyTypedWord);
ResearchLogger.latinIME_revertCommit(committedWord, originallyTypedWord,
mWordComposer.isBatchMode());
}
// Don't restart suggestion yet. We'll restart if the user deletes the
// separator.

9
java/src/com/android/inputmethod/latin/RichInputConnection.java
View File

@ -648,19 +648,20 @@ public final class RichInputConnection {
// Here we test whether we indeed have a period and a space before us. This should not
// be needed, but it's there just in case something went wrong.
final CharSequence textBeforeCursor = getTextBeforeCursor(2, 0);
if (!". ".equals(textBeforeCursor)) {
final String periodSpace = ". ";
if (!periodSpace.equals(textBeforeCursor)) {
// Theoretically we should not be coming here if there isn't ". " before the
// cursor, but the application may be changing the text while we are typing, so
// anything goes. We should not crash.
Log.d(TAG, "Tried to revert double-space combo but we didn't find "
+ "\". \" just before the cursor.");
+ "\"" + periodSpace + "\" just before the cursor.");
return false;
}
deleteSurroundingText(2, 0);
final String doubleSpace = " ";
commitText(doubleSpace, 1);
if (ProductionFlag.IS_EXPERIMENTAL) {
ResearchLogger.richInputConnection_revertDoubleSpacePeriod(doubleSpace);
ResearchLogger.richInputConnection_revertDoubleSpacePeriod();
}
return true;
}
@ -685,7 +686,7 @@ public final class RichInputConnection {
final String text = " " + textBeforeCursor.subSequence(0, 1);
commitText(text, 1);
if (ProductionFlag.IS_EXPERIMENTAL) {
ResearchLogger.richInputConnection_revertSwapPunctuation(text);
ResearchLogger.richInputConnection_revertSwapPunctuation();
}
return true;
}

9
java/src/com/android/inputmethod/research/FixedLogBuffer.java
View File

@ -72,6 +72,15 @@ public class FixedLogBuffer extends LogBuffer {
mNumActualWords++; // Must be a word, or we wouldn't be here.
}
@Override
public LogUnit unshiftIn() {
final LogUnit logUnit = super.unshiftIn();
if (logUnit != null && logUnit.hasWord()) {
mNumActualWords--;
}
return logUnit;
}
private void shiftOutThroughFirstWord() {
final LinkedList<LogUnit> logUnits = getLogUnits();
while (!logUnits.isEmpty()) {

14
java/src/com/android/inputmethod/research/LogBuffer.java
View File

@ -46,6 +46,20 @@ public class LogBuffer {
mLogUnits.add(logUnit);
}
public LogUnit unshiftIn() {
if (mLogUnits.isEmpty()) {
return null;
}
return mLogUnits.removeLast();
}
public LogUnit peekLastLogUnit() {
if (mLogUnits.isEmpty()) {
return null;
}
return mLogUnits.peekLast();
}
public boolean isEmpty() {
return mLogUnits.isEmpty();
}

10
java/src/com/android/inputmethod/research/LogUnit.java
View File

@ -240,6 +240,7 @@ import java.util.Map;
public LogUnit splitByTime(final long maxTime) {
// Assume that mTimeList is in sorted order.
final int length = mTimeList.size();
// TODO: find time by binary search, e.g. using Collections#binarySearch()
for (int index = 0; index < length; index++) {
if (mTimeList.get(index) > maxTime) {
final List<LogStatement> laterLogStatements =
@ -267,4 +268,13 @@ import java.util.Map;
}
return new LogUnit();
}
public void append(final LogUnit logUnit) {
mLogStatementList.addAll(logUnit.mLogStatementList);
mValuesList.addAll(logUnit.mValuesList);
mTimeList.addAll(logUnit.mTimeList);
mWord = null;
mMayContainDigit = mMayContainDigit || logUnit.mMayContainDigit;
mIsPartOfMegaword = false;
}
}

10
java/src/com/android/inputmethod/research/MainLogBuffer.java
View File

@ -119,6 +119,7 @@ public class MainLogBuffer extends FixedLogBuffer {
// complete buffer contents in detail.
final LinkedList<LogUnit> logUnits = getLogUnits();
final int length = logUnits.size();
int wordsFound = 0;
for (int i = 0; i < length; i++) {
final LogUnit logUnit = logUnits.get(i);
final String word = logUnit.getWord();
@ -135,9 +136,18 @@ public class MainLogBuffer extends FixedLogBuffer {
+ ", isValid: " + (dictionary.isValidWord(word)));
}
return false;
} else {
wordsFound++;
}
}
}
if (wordsFound < N_GRAM_SIZE) {
// Not enough words. Not unsafe, but reject anyway.
if (DEBUG) {
Log.d(TAG, "not enough words");
}
return false;
}
// All checks have passed; this buffer's content can be safely uploaded.
return true;
}

166
java/src/com/android/inputmethod/research/ResearchLogger.java
View File

@ -390,6 +390,7 @@ public class ResearchLogger implements SharedPreferences.OnSharedPreferenceChang
if (DEBUG) {
Log.d(TAG, "stop called");
}
// Commit mCurrentLogUnit before closing.
commitCurrentLogUnit();
if (mMainLogBuffer != null) {
@ -676,11 +677,17 @@ public class ResearchLogger implements SharedPreferences.OnSharedPreferenceChang
/**
* Buffer a research log event, flagging it as privacy-sensitive.
*/
private synchronized void enqueueEvent(LogStatement logStatement, Object... values) {
private synchronized void enqueueEvent(final LogStatement logStatement,
final Object... values) {
enqueueEvent(mCurrentLogUnit, logStatement, values);
}
private synchronized void enqueueEvent(final LogUnit logUnit, final LogStatement logStatement,
final Object... values) {
assert values.length == logStatement.mKeys.length;
if (isAllowedToLog()) {
if (isAllowedToLog() && logUnit != null) {
final long time = SystemClock.uptimeMillis();
mCurrentLogUnit.addLogStatement(logStatement, time, values);
logUnit.addLogStatement(logStatement, time, values);
}
}
@ -695,12 +702,12 @@ public class ResearchLogger implements SharedPreferences.OnSharedPreferenceChang
}
if (!mCurrentLogUnit.isEmpty()) {
if (mMainLogBuffer != null) {
mMainLogBuffer.shiftIn(mCurrentLogUnit);
if ((mMainLogBuffer.isSafeToLog() || LOG_EVERYTHING) && mMainResearchLog != null) {
publishLogBuffer(mMainLogBuffer, mMainResearchLog,
true /* isIncludingPrivateData */);
mMainLogBuffer.resetWordCounter();
}
mMainLogBuffer.shiftIn(mCurrentLogUnit);
}
if (mFeedbackLogBuffer != null) {
mFeedbackLogBuffer.shiftIn(mCurrentLogUnit);
@ -709,6 +716,50 @@ public class ResearchLogger implements SharedPreferences.OnSharedPreferenceChang
}
}
public void uncommitCurrentLogUnit(final String expectedWord,
final boolean dumpCurrentLogUnit) {
// The user has deleted this word and returned to the previous. Check that the word in the
// logUnit matches the expected word. If so, restore the last log unit committed to be the
// current logUnit. I.e., pull out the last LogUnit from all the LogBuffers, and make
// restore it to mCurrentLogUnit so the new edits are captured with the word. Optionally
// dump the contents of mCurrentLogUnit (useful if they contain deletions of the next word
// that should not be reported to protect user privacy)
//
// Note that we don't use mLastLogUnit here, because it only goes one word back and is only
// needed for reverts, which only happen one back.
if (mMainLogBuffer == null) {
return;
}
final LogUnit oldLogUnit = mMainLogBuffer.peekLastLogUnit();
// Check that expected word matches.
if (oldLogUnit != null) {
final String oldLogUnitWord = oldLogUnit.getWord();
if (!oldLogUnitWord.equals(expectedWord)) {
return;
}
}
// Uncommit, merging if necessary.
mMainLogBuffer.unshiftIn();
if (oldLogUnit != null && !dumpCurrentLogUnit) {
oldLogUnit.append(mCurrentLogUnit);
mSavedDownEventTime = Long.MAX_VALUE;
}
if (oldLogUnit == null) {
mCurrentLogUnit = new LogUnit();
} else {
mCurrentLogUnit = oldLogUnit;
}
if (mFeedbackLogBuffer != null) {
mFeedbackLogBuffer.unshiftIn();
}
if (DEBUG) {
Log.d(TAG, "uncommitCurrentLogUnit back to " + (mCurrentLogUnit.hasWord()
? ": '" + mCurrentLogUnit.getWord() + "'" : ""));
}
}
private static final LogStatement LOGSTATEMENT_LOG_SEGMENT_OPENING =
new LogStatement("logSegmentStart", false, false, "isIncludingPrivateData");
private static final LogStatement LOGSTATEMENT_LOG_SEGMENT_CLOSING =
@ -751,24 +802,26 @@ public class ResearchLogger implements SharedPreferences.OnSharedPreferenceChang
* After this operation completes, mCurrentLogUnit will hold any logStatements that happened
* after maxTime.
*/
private static final LogStatement LOGSTATEMENT_COMMIT_RECORD_SPLIT_WORDS =
new LogStatement("recordSplitWords", true, false);
/* package for test */ void commitCurrentLogUnitAsWord(final String word, final long maxTime) {
/* package for test */ void commitCurrentLogUnitAsWord(final String word, final long maxTime,
final boolean isBatchMode) {
if (word == null) {
return;
}
final Dictionary dictionary = getDictionary();
if (word != null && word.length() > 0 && hasLetters(word)) {
if (word.length() > 0 && hasLetters(word)) {
mCurrentLogUnit.setWord(word);
final boolean isDictionaryWord = dictionary != null
&& dictionary.isValidWord(word);
mStatistics.recordWordEntered(isDictionaryWord);
}
final LogUnit newLogUnit = mCurrentLogUnit.splitByTime(maxTime);
enqueueCommitText(word);
enqueueCommitText(word, isBatchMode);
commitCurrentLogUnit();
mCurrentLogUnit = newLogUnit;
}
public void onWordFinished(final String word) {
commitCurrentLogUnitAsWord(word, mSavedDownEventTime);
public void onWordFinished(final String word, final boolean isBatchMode) {
commitCurrentLogUnitAsWord(word, mSavedDownEventTime, isBatchMode);
mSavedDownEventTime = Long.MAX_VALUE;
}
@ -1060,9 +1113,9 @@ public class ResearchLogger implements SharedPreferences.OnSharedPreferenceChang
*
* SystemResponse: Raw text is added to the TextView.
*/
public static void latinIME_onTextInput(final String text) {
public static void latinIME_onTextInput(final String text, final boolean isBatchMode) {
final ResearchLogger researchLogger = getInstance();
researchLogger.commitCurrentLogUnitAsWord(text, Long.MAX_VALUE);
researchLogger.commitCurrentLogUnitAsWord(text, Long.MAX_VALUE, isBatchMode);
}
/**
@ -1074,14 +1127,14 @@ public class ResearchLogger implements SharedPreferences.OnSharedPreferenceChang
new LogStatement("LatinIMEPickSuggestionManually", true, false, "replacedWord", "index",
"suggestion", "x", "y");
public static void latinIME_pickSuggestionManually(final String replacedWord,
final int index, final String suggestion) {
final int index, final String suggestion, final boolean isBatchMode) {
final String scrubbedWord = scrubDigitsFromString(suggestion);
final ResearchLogger researchLogger = getInstance();
researchLogger.enqueueEvent(LOGSTATEMENT_LATINIME_PICKSUGGESTIONMANUALLY,
scrubDigitsFromString(replacedWord), index,
suggestion == null ? null : scrubbedWord, Constants.SUGGESTION_STRIP_COORDINATE,
Constants.SUGGESTION_STRIP_COORDINATE);
researchLogger.commitCurrentLogUnitAsWord(scrubbedWord, Long.MAX_VALUE);
researchLogger.commitCurrentLogUnitAsWord(scrubbedWord, Long.MAX_VALUE, isBatchMode);
researchLogger.mStatistics.recordManualSuggestion();
}
@ -1093,11 +1146,12 @@ public class ResearchLogger implements SharedPreferences.OnSharedPreferenceChang
private static final LogStatement LOGSTATEMENT_LATINIME_PUNCTUATIONSUGGESTION =
new LogStatement("LatinIMEPunctuationSuggestion", false, false, "index", "suggestion",
"x", "y");
public static void latinIME_punctuationSuggestion(final int index, final String suggestion) {
public static void latinIME_punctuationSuggestion(final int index, final String suggestion,
final boolean isBatchMode) {
final ResearchLogger researchLogger = getInstance();
researchLogger.enqueueEvent(LOGSTATEMENT_LATINIME_PUNCTUATIONSUGGESTION, index, suggestion,
Constants.SUGGESTION_STRIP_COORDINATE, Constants.SUGGESTION_STRIP_COORDINATE);
researchLogger.commitCurrentLogUnitAsWord(suggestion, Long.MAX_VALUE);
researchLogger.commitCurrentLogUnitAsWord(suggestion, Long.MAX_VALUE, isBatchMode);
}
/**
@ -1125,11 +1179,16 @@ public class ResearchLogger implements SharedPreferences.OnSharedPreferenceChang
* if a soft space is inserted after a word.
*/
private static final LogStatement LOGSTATEMENT_LATINIME_SWAPSWAPPERANDSPACE =
new LogStatement("LatinIMESwapSwapperAndSpace", false, false);
public static void latinIME_swapSwapperAndSpace(final String text) {
new LogStatement("LatinIMESwapSwapperAndSpace", false, false, "originalCharacters",
"charactersAfterSwap");
public static void latinIME_swapSwapperAndSpace(final CharSequence originalCharacters,
final String charactersAfterSwap) {
final ResearchLogger researchLogger = getInstance();
researchLogger.commitCurrentLogUnitAsWord(text, Long.MAX_VALUE);
researchLogger.enqueueEvent(LOGSTATEMENT_LATINIME_SWAPSWAPPERANDSPACE);
final LogUnit logUnit = researchLogger.mMainLogBuffer.peekLastLogUnit();
if (logUnit != null) {
researchLogger.enqueueEvent(logUnit, LOGSTATEMENT_LATINIME_SWAPSWAPPERANDSPACE,
originalCharacters, charactersAfterSwap);
}
}
/**
@ -1137,9 +1196,10 @@ public class ResearchLogger implements SharedPreferences.OnSharedPreferenceChang
*
* SystemResponse: Two spaces have been replaced by period space.
*/
public static void latinIME_maybeDoubleSpacePeriod(final String text) {
public static void latinIME_maybeDoubleSpacePeriod(final String text,
final boolean isBatchMode) {
final ResearchLogger researchLogger = getInstance();
researchLogger.commitCurrentLogUnitAsWord(text, Long.MAX_VALUE);
researchLogger.commitCurrentLogUnitAsWord(text, Long.MAX_VALUE, isBatchMode);
}
/**
@ -1191,12 +1251,21 @@ public class ResearchLogger implements SharedPreferences.OnSharedPreferenceChang
new LogStatement("LatinIMERevertCommit", true, false, "committedWord",
"originallyTypedWord");
public static void latinIME_revertCommit(final String committedWord,
final String originallyTypedWord) {
final String originallyTypedWord, final boolean isBatchMode) {
final ResearchLogger researchLogger = getInstance();
researchLogger.enqueueEvent(LOGSTATEMENT_LATINIME_REVERTCOMMIT, committedWord,
originallyTypedWord);
final LogUnit logUnit = researchLogger.mMainLogBuffer.peekLastLogUnit();
if (originallyTypedWord.length() > 0 && hasLetters(originallyTypedWord)) {
if (logUnit != null) {
logUnit.setWord(originallyTypedWord);
}
final Dictionary dictionary = researchLogger.getDictionary();
researchLogger.mStatistics.recordWordEntered(dictionary != null
&& dictionary.isValidWord(originallyTypedWord));
}
researchLogger.enqueueEvent(logUnit != null ? logUnit : researchLogger.mCurrentLogUnit,
LOGSTATEMENT_LATINIME_REVERTCOMMIT, committedWord, originallyTypedWord);
researchLogger.mStatistics.recordRevertCommit();
researchLogger.commitCurrentLogUnitAsWord(originallyTypedWord, Long.MAX_VALUE);
researchLogger.commitCurrentLogUnitAsWord(originallyTypedWord, Long.MAX_VALUE, isBatchMode);
}
/**
@ -1295,9 +1364,10 @@ public class ResearchLogger implements SharedPreferences.OnSharedPreferenceChang
*
* SystemResponse: The IME has reverted ". ", which had previously replaced two typed spaces.
*/
public static void richInputConnection_revertDoubleSpacePeriod(final String doubleSpace) {
final ResearchLogger researchLogger = getInstance();
researchLogger.commitCurrentLogUnitAsWord(doubleSpace, Long.MAX_VALUE);
private static final LogStatement LOGSTATEMENT_RICHINPUTCONNECTION_REVERTDOUBLESPACEPERIOD =
new LogStatement("RichInputConnectionRevertDoubleSpacePeriod", false, false);
public static void richInputConnection_revertDoubleSpacePeriod() {
getInstance().enqueueEvent(LOGSTATEMENT_RICHINPUTCONNECTION_REVERTDOUBLESPACEPERIOD);
}
/**
@ -1305,9 +1375,10 @@ public class ResearchLogger implements SharedPreferences.OnSharedPreferenceChang
*
* SystemResponse: The IME has reverted a punctuation swap.
*/
public static void richInputConnection_revertSwapPunctuation(final String text) {
final ResearchLogger researchLogger = getInstance();
researchLogger.commitCurrentLogUnitAsWord(text, Long.MAX_VALUE);
private static final LogStatement LOGSTATEMENT_RICHINPUTCONNECTION_REVERTSWAPPUNCTUATION =
new LogStatement("RichInputConnectionRevertSwapPunctuation", false, false);
public static void richInputConnection_revertSwapPunctuation() {
getInstance().enqueueEvent(LOGSTATEMENT_RICHINPUTCONNECTION_REVERTSWAPPUNCTUATION);
}
/**
@ -1320,13 +1391,14 @@ public class ResearchLogger implements SharedPreferences.OnSharedPreferenceChang
new LogStatement("LatinIMECommitCurrentAutoCorrection", true, false, "typedWord",
"autoCorrection", "separatorString");
public static void latinIme_commitCurrentAutoCorrection(final String typedWord,
final String autoCorrection, final String separatorString) {
final String autoCorrection, final String separatorString, final boolean isBatchMode) {
final String scrubbedTypedWord = scrubDigitsFromString(typedWord);
final String scrubbedAutoCorrection = scrubDigitsFromString(autoCorrection);
final ResearchLogger researchLogger = getInstance();
researchLogger.enqueueEvent(LOGSTATEMENT_LATINIME_COMMITCURRENTAUTOCORRECTION,
scrubbedTypedWord, scrubbedAutoCorrection, separatorString);
researchLogger.commitCurrentLogUnitAsWord(scrubbedAutoCorrection, Long.MAX_VALUE);
researchLogger.commitCurrentLogUnitAsWord(scrubbedAutoCorrection, Long.MAX_VALUE,
isBatchMode);
}
private boolean isExpectingCommitText = false;
@ -1340,13 +1412,13 @@ public class ResearchLogger implements SharedPreferences.OnSharedPreferenceChang
// add invocations.
private static final LogStatement LOGSTATEMENT_LATINIME_COMMIT_PARTIAL_TEXT =
new LogStatement("LatinIMECommitPartialText", true, false, "newCursorPosition");
public static void latinIME_commitPartialText(final CharSequence committedWord,
final long lastTimestampOfWordData) {
public static void latinIME_commitPartialText(final String committedWord,
final long lastTimestampOfWordData, final boolean isBatchMode) {
final ResearchLogger researchLogger = getInstance();
final String scrubbedWord = scrubDigitsFromString(committedWord.toString());
final String scrubbedWord = scrubDigitsFromString(committedWord);
researchLogger.enqueueEvent(LOGSTATEMENT_LATINIME_COMMIT_PARTIAL_TEXT);
researchLogger.commitCurrentLogUnitAsWord(scrubbedWord, lastTimestampOfWordData);
researchLogger.mStatistics.recordSplitWords();
researchLogger.commitCurrentLogUnitAsWord(scrubbedWord, lastTimestampOfWordData,
isBatchMode);
}
/**
@ -1357,14 +1429,14 @@ public class ResearchLogger implements SharedPreferences.OnSharedPreferenceChang
*/
private static final LogStatement LOGSTATEMENT_RICHINPUTCONNECTIONCOMMITTEXT =
new LogStatement("RichInputConnectionCommitText", true, false, "newCursorPosition");
public static void richInputConnection_commitText(final CharSequence committedWord,
final int newCursorPosition) {
public static void richInputConnection_commitText(final String committedWord,
final int newCursorPosition, final boolean isBatchMode) {
final ResearchLogger researchLogger = getInstance();
final String scrubbedWord = scrubDigitsFromString(committedWord.toString());
final String scrubbedWord = scrubDigitsFromString(committedWord);
if (!researchLogger.isExpectingCommitText) {
researchLogger.enqueueEvent(LOGSTATEMENT_RICHINPUTCONNECTIONCOMMITTEXT,
newCursorPosition);
researchLogger.commitCurrentLogUnitAsWord(scrubbedWord, Long.MAX_VALUE);
researchLogger.commitCurrentLogUnitAsWord(scrubbedWord, Long.MAX_VALUE, isBatchMode);
}
researchLogger.isExpectingCommitText = false;
}
@ -1373,9 +1445,9 @@ public class ResearchLogger implements SharedPreferences.OnSharedPreferenceChang
* Shared event for logging committed text.
*/
private static final LogStatement LOGSTATEMENT_COMMITTEXT =
new LogStatement("CommitText", true, false, "committedText");
private void enqueueCommitText(final CharSequence word) {
enqueueEvent(LOGSTATEMENT_COMMITTEXT, word);
new LogStatement("CommitText", true, false, "committedText", "isBatchMode");
private void enqueueCommitText(final String word, final boolean isBatchMode) {
enqueueEvent(LOGSTATEMENT_COMMITTEXT, word, isBatchMode);
}
/**