commit 654d5ba165bb0a3609af42982d616c412d1ccf7c
author Jean Chalard <jchalard@google.com> Sun Jul 01 22:30:36 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Sun Jul 01 22:30:36 2012 -0700
tree 755e46399ceaea0871e1aef07969773e1b8053c8
parent 3ca3afe971fdc45e7c09e0400683024b23086d95
parent 84074cf503f67737bcfd335a775553763bd8e033

Merge "Update log and make a variable private (A35)."

java/src/com/android/inputmethod/latin/ResearchLogger.java

diff --git a/java/src/com/android/inputmethod/latin/ResearchLogger.java b/java/src/com/android/inputmethod/latin/ResearchLogger.java
index 79e1d37..e83d7c8 100644
--- a/java/src/com/android/inputmethod/latin/ResearchLogger.java
+++ b/java/src/com/android/inputmethod/latin/ResearchLogger.java
@@ -532,8 +532,7 @@
                     SuggestedWords words = (SuggestedWords) value;
                     mJsonWriter.beginObject();
                     mJsonWriter.name("typedWordValid").value(words.mTypedWordValid);
-                    mJsonWriter.name("hasAutoCorrectionCandidate")
-                        .value(words.mHasAutoCorrectionCandidate);
+                    mJsonWriter.name("willAutoCorrect").value(words.mWillAutoCorrect);
                     mJsonWriter.name("isPunctuationSuggestions")
                         .value(words.mIsPunctuationSuggestions);
                     mJsonWriter.name("isObsoleteSuggestions")

java/src/com/android/inputmethod/latin/SuggestedWords.java

diff --git a/java/src/com/android/inputmethod/latin/SuggestedWords.java b/java/src/com/android/inputmethod/latin/SuggestedWords.java
index b84820c..b980e48 100644
--- a/java/src/com/android/inputmethod/latin/SuggestedWords.java
+++ b/java/src/com/android/inputmethod/latin/SuggestedWords.java
@@ -28,7 +28,7 @@
             new ArrayList<SuggestedWordInfo>(0), false, false, false, false, false);
 
     public final boolean mTypedWordValid;
-    public final boolean mHasAutoCorrectionCandidate;
+    private final boolean mHasAutoCorrectionCandidate;
     public final boolean mWillAutoCorrect;
     public final boolean mIsPunctuationSuggestions;
     public final boolean mIsObsoleteSuggestions;