nyancrimew
/
LatinIME
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

am 939e3f31: Merge "[Rlog59d] Pass separatorString through revertCommit" 

* commit '939e3f3152f7c2a1593b5ab4161597f4fe73315c':
  [Rlog59d] Pass separatorString through revertCommit
main
Kurt Partridge 2013-01-14 09:28:01 -08:00 committed by Android Git Automerger
parent 284730bae1 939e3f3152
commit 50cb9eab28
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2321,7 +2321,7 @@ public final class LatinIME extends InputMethodService implements KeyboardAction
} }
if (ProductionFlag.IS_EXPERIMENTAL) { if (ProductionFlag.IS_EXPERIMENTAL) {
ResearchLogger.latinIME_revertCommit(committedWord, originallyTypedWord, ResearchLogger.latinIME_revertCommit(committedWord, originallyTypedWord,
mWordComposer.isBatchMode()); mWordComposer.isBatchMode(), mLastComposedWord.mSeparatorString);
ResearchLogger.getInstance().uncommitCurrentLogUnit(committedWord, ResearchLogger.getInstance().uncommitCurrentLogUnit(committedWord,
true /* dumpCurrentLogUnit */); true /* dumpCurrentLogUnit */);
} }

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

@ -1297,9 +1297,10 @@ public class ResearchLogger implements SharedPreferences.OnSharedPreferenceChang
*/ */
private static final LogStatement LOGSTATEMENT_LATINIME_REVERTCOMMIT = private static final LogStatement LOGSTATEMENT_LATINIME_REVERTCOMMIT =
new LogStatement("LatinIMERevertCommit", true, false, "committedWord", new LogStatement("LatinIMERevertCommit", true, false, "committedWord",
"originallyTypedWord"); "originallyTypedWord", "separatorString");
public static void latinIME_revertCommit(final String committedWord, 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(); final ResearchLogger researchLogger = getInstance();
// TODO: Verify that mCurrentLogUnit has been restored and contains the reverted word. // TODO: Verify that mCurrentLogUnit has been restored and contains the reverted word.
final LogUnit logUnit; final LogUnit logUnit;
@ -1314,7 +1315,8 @@ public class ResearchLogger implements SharedPreferences.OnSharedPreferenceChang
} }
} }
researchLogger.enqueueEvent(logUnit != null ? logUnit : researchLogger.mCurrentLogUnit, researchLogger.enqueueEvent(logUnit != null ? logUnit : researchLogger.mCurrentLogUnit,
LOGSTATEMENT_LATINIME_REVERTCOMMIT, committedWord, originallyTypedWord); LOGSTATEMENT_LATINIME_REVERTCOMMIT, committedWord, originallyTypedWord,
separatorString);
researchLogger.mStatistics.recordRevertCommit(SystemClock.uptimeMillis()); researchLogger.mStatistics.recordRevertCommit(SystemClock.uptimeMillis());
researchLogger.commitCurrentLogUnitAsWord(originallyTypedWord, Long.MAX_VALUE, isBatchMode); researchLogger.commitCurrentLogUnitAsWord(originallyTypedWord, Long.MAX_VALUE, isBatchMode);
} }