aboutsummaryrefslogtreecommitdiffstats
path: root/java/src/com/android/inputmethod
diff options
context:
space:
mode:
authorJean Chalard <jchalard@google.com>2014-01-27 00:58:49 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2014-01-27 00:58:49 -0800
commit5be5fd13e03d8fc0ec4fb2f94bfae3bd4a2b2075 (patch)
tree521bbe29a496120b9c67c254fb71903e6cde31c9 /java/src/com/android/inputmethod
parentc93a0e71fe16c711b7bb1a67990e0662ea218dd7 (diff)
parent5cf70a1d44395a4a857eeb33504f8458fbba2464 (diff)
downloadlatinime-5be5fd13e03d8fc0ec4fb2f94bfae3bd4a2b2075.tar.gz
latinime-5be5fd13e03d8fc0ec4fb2f94bfae3bd4a2b2075.tar.xz
latinime-5be5fd13e03d8fc0ec4fb2f94bfae3bd4a2b2075.zip
am 5cf70a1d: Merge "[IL74] Remove unused/unwanted arguments to a method."
* commit '5cf70a1d44395a4a857eeb33504f8458fbba2464': [IL74] Remove unused/unwanted arguments to a method.
Diffstat (limited to 'java/src/com/android/inputmethod')
-rw-r--r--java/src/com/android/inputmethod/latin/LatinIME.java5
-rw-r--r--java/src/com/android/inputmethod/research/ResearchLogger.java5
2 files changed, 3 insertions, 7 deletions
diff --git a/java/src/com/android/inputmethod/latin/LatinIME.java b/java/src/com/android/inputmethod/latin/LatinIME.java
index bba9bd52c..8dd2daee4 100644
--- a/java/src/com/android/inputmethod/latin/LatinIME.java
+++ b/java/src/com/android/inputmethod/latin/LatinIME.java
@@ -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);
}
}
diff --git a/java/src/com/android/inputmethod/research/ResearchLogger.java b/java/src/com/android/inputmethod/research/ResearchLogger.java
index 2a8148d02..b1f54c0b4 100644
--- a/java/src/com/android/inputmethod/research/ResearchLogger.java
+++ b/java/src/com/android/inputmethod/research/ResearchLogger.java
@@ -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