am 3d209462: Merge "Uncommit LogUnits when reverting textInput"

* commit '3d2094627223dd76436e6460f43956c57053524e':
  Uncommit LogUnits when reverting textInput
main
Kurt Partridge 2013-06-02 20:00:24 -07:00 committed by Android Git Automerger
commit a856138c49
2 changed files with 13 additions and 0 deletions

View File

@ -1823,6 +1823,9 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
// like the smiley key or the .com key. // like the smiley key or the .com key.
final int length = mEnteredText.length(); final int length = mEnteredText.length();
mConnection.deleteSurroundingText(length, 0); mConnection.deleteSurroundingText(length, 0);
if (ProductionFlag.USES_DEVELOPMENT_ONLY_DIAGNOSTICS) {
ResearchLogger.latinIME_handleBackspace_cancelTextInput(mEnteredText);
}
mEnteredText = null; mEnteredText = null;
// If we have mEnteredText, then we know that mHasUncommittedTypedChars == false. // If we have mEnteredText, then we know that mHasUncommittedTypedChars == false.
// In addition we know that spaceState is false, and that we should not be // In addition we know that spaceState is false, and that we should not be

View File

@ -1273,6 +1273,16 @@ public class ResearchLogger implements SharedPreferences.OnSharedPreferenceChang
researchLogger.commitCurrentLogUnitAsWord(text, Long.MAX_VALUE, isBatchMode); researchLogger.commitCurrentLogUnitAsWord(text, Long.MAX_VALUE, isBatchMode);
} }
/**
* Log a revert of onTextInput() (known in the IME as "EnteredText").
*
* SystemResponse: Remove the LogUnit recording the textInput
*/
public static void latinIME_handleBackspace_cancelTextInput(final String text) {
final ResearchLogger researchLogger = getInstance();
researchLogger.uncommitCurrentLogUnit(text, true /* dumpCurrentLogUnit */);
}
/** /**
* Log a call to LatinIME.pickSuggestionManually(). * Log a call to LatinIME.pickSuggestionManually().
* *