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

am 74330288: Merge "Uncommit separator LogUnits"

Browse source 
* commit '743302888b25235683c61aade88498d224d0c170':
  Uncommit separator LogUnits
This commit is contained in:
Kurt Partridge 2013-06-02 20:03:35 -07:00 committed by Android Git Automerger
commit 173ac0c60d
2 changed files with 19 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
java/src/com/android/inputmethod/latin/LatinIME.java
View file

@ -1859,7 +1859,8 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
mLastSelectionEnd = mLastSelectionStart; mLastSelectionEnd = mLastSelectionStart;
mConnection.deleteSurroundingText(numCharsDeleted, 0); mConnection.deleteSurroundingText(numCharsDeleted, 0);
if (ProductionFlag.USES_DEVELOPMENT_ONLY_DIAGNOSTICS) { if (ProductionFlag.USES_DEVELOPMENT_ONLY_DIAGNOSTICS) {
ResearchLogger.latinIME_handleBackspace(numCharsDeleted); ResearchLogger.latinIME_handleBackspace(numCharsDeleted,
false /* shouldUncommitLogUnit */);
} }
} else { } else {
// There is no selection, just delete one character. // There is no selection, just delete one character.
@ -1877,12 +1878,13 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
mConnection.deleteSurroundingText(1, 0); mConnection.deleteSurroundingText(1, 0);
} }
if (ProductionFlag.USES_DEVELOPMENT_ONLY_DIAGNOSTICS) { if (ProductionFlag.USES_DEVELOPMENT_ONLY_DIAGNOSTICS) {
ResearchLogger.latinIME_handleBackspace(1); ResearchLogger.latinIME_handleBackspace(1, true /* shouldUncommitLogUnit */);
} }
if (mDeleteCount > DELETE_ACCELERATE_AT) { if (mDeleteCount > DELETE_ACCELERATE_AT) {
mConnection.deleteSurroundingText(1, 0); mConnection.deleteSurroundingText(1, 0);
if (ProductionFlag.USES_DEVELOPMENT_ONLY_DIAGNOSTICS) { if (ProductionFlag.USES_DEVELOPMENT_ONLY_DIAGNOSTICS) {
ResearchLogger.latinIME_handleBackspace(1); ResearchLogger.latinIME_handleBackspace(1,
true /* shouldUncommitLogUnit */);
} }
} }
} }

17
java/src/com/android/inputmethod/research/ResearchLogger.java
View file

@ -1816,17 +1816,26 @@ public class ResearchLogger implements SharedPreferences.OnSharedPreferenceChang
SystemClock.uptimeMillis()); SystemClock.uptimeMillis());
} }
private static final LogStatement LOGSTATEMENT_LATINIME_HANDLEBACKSPACE =
new LogStatement("LatinIMEHandleBackspace", true, false, "numCharacters");
/** /**
* Log a call to LatinIME.handleBackspace() that is not a batch delete. * Log a call to LatinIME.handleBackspace() that is not a batch delete.
* *
* UserInput: The user is deleting one or more characters by hitting the backspace key once. * UserInput: The user is deleting one or more characters by hitting the backspace key once.
* The covers single character deletes as well as deleting selections. * The covers single character deletes as well as deleting selections.
*
* @param numCharacters how many characters the backspace operation deleted
* @param shouldUncommitLogUnit whether to uncommit the last {@code LogUnit} in the
* {@code LogBuffer}
*/ */
private static final LogStatement LOGSTATEMENT_LATINIME_HANDLEBACKSPACE = public static void latinIME_handleBackspace(final int numCharacters,
new LogStatement("LatinIMEHandleBackspace", true, false, "numCharacters"); final boolean shouldUncommitLogUnit) {
public static void latinIME_handleBackspace(final int numCharacters) {
final ResearchLogger researchLogger = getInstance(); final ResearchLogger researchLogger = getInstance();
researchLogger.enqueueEvent(LOGSTATEMENT_LATINIME_HANDLEBACKSPACE, numCharacters); researchLogger.enqueueEvent(LOGSTATEMENT_LATINIME_HANDLEBACKSPACE, numCharacters);
if (shouldUncommitLogUnit) {
ResearchLogger.getInstance().uncommitCurrentLogUnit(
null, true /* dumpCurrentLogUnit */);
}
} }
/** /**
@ -1844,6 +1853,8 @@ public class ResearchLogger implements SharedPreferences.OnSharedPreferenceChang
numCharacters); numCharacters);
researchLogger.mStatistics.recordGestureDelete(deletedText.length(), researchLogger.mStatistics.recordGestureDelete(deletedText.length(),
SystemClock.uptimeMillis()); SystemClock.uptimeMillis());
researchLogger.uncommitCurrentLogUnit(deletedText.toString(),
false /* dumpCurrentLogUnit */);
} }
/** /**