am 5cf70a1d: Merge "[IL74] Remove unused/unwanted arguments to a method."

* commit '5cf70a1d44395a4a857eeb33504f8458fbba2464':
  [IL74] Remove unused/unwanted arguments to a method.
main
Jean Chalard 2014-01-27 00:58:49 -08:00 committed by Android Git Automerger
commit 5be5fd13e0
2 changed files with 3 additions and 7 deletions

View File

@ -888,10 +888,7 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
mInputLogic.finishInput();
// Notify ResearchLogger
if (ProductionFlag.USES_DEVELOPMENT_ONLY_DIAGNOSTICS) {
ResearchLogger.latinIME_onFinishInputViewInternal(finishingInput,
// TODO[IL]: mInputLogic.mConnection should be private
mInputLogic.mConnection.getExpectedSelectionStart(),
mInputLogic.mConnection.getExpectedSelectionEnd(), getCurrentInputConnection());
ResearchLogger.latinIME_onFinishInputViewInternal(finishingInput);
}
}

View File

@ -1117,14 +1117,13 @@ public class ResearchLogger implements SharedPreferences.OnSharedPreferenceChang
private static final LogStatement LOGSTATEMENT_LATINIME_ONFINISHINPUTVIEWINTERNAL =
new LogStatement("LatinIMEOnFinishInputViewInternal", false, false, "isTextTruncated",
"text");
public static void latinIME_onFinishInputViewInternal(final boolean finishingInput,
final int savedSelectionStart, final int savedSelectionEnd, final InputConnection ic) {
public static void latinIME_onFinishInputViewInternal(final boolean finishingInput) {
// The finishingInput flag is set in InputMethodService. It is true if called from
// doFinishInput(), which can be called as part of doStartInput(). This can happen at times
// when the IME is not closing, such as when powering up. The finishinInput flag is false
// if called from finishViews(), which is called from hideWindow() and onDestroy(). These
// are the situations in which we want to finish up the researchLog.
if (ic != null && !finishingInput) {
if (!finishingInput) {
final ResearchLogger researchLogger = getInstance();
// Assume that OUTPUT_ENTIRE_BUFFER is only true when we don't care about privacy (e.g.
// during a live user test), so the normal isPotentiallyPrivate and