commit 9770336a9b9b65fc62bde6f361e90909d4259769
author Dan Zivkovic <zivkovic@google.com> Fri Feb 27 21:33:01 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Feb 27 21:33:02 2015 +0000
tree 443577e3ea4ceb4718919b7d00a25135dd9a115d
parent 98886775cfb95dc7f6ab50653215373b94b13941
parent 24c275ccb9d12d6160b09c20afe17601b09957f1

Merge "Label empty suggestions."

java-overridable/src/com/android/inputmethod/latin/utils/StatsUtils.java

diff --git a/java-overridable/src/com/android/inputmethod/latin/utils/StatsUtils.java b/java-overridable/src/com/android/inputmethod/latin/utils/StatsUtils.java
index 011bc59..3ae277a 100644
--- a/java-overridable/src/com/android/inputmethod/latin/utils/StatsUtils.java
+++ b/java-overridable/src/com/android/inputmethod/latin/utils/StatsUtils.java
@@ -83,6 +83,9 @@
             final String commitWord, final boolean isBatchMode) {
     }
 
+    public static void onDoubleSpacePeriod() {
+    }
+
     public static void onLoadSettings(SettingsValues settingsValues) {
     }
 

java/src/com/android/inputmethod/latin/inputlogic/InputLogic.java

diff --git a/java/src/com/android/inputmethod/latin/inputlogic/InputLogic.java b/java/src/com/android/inputmethod/latin/inputlogic/InputLogic.java
index 7907aaa..3f1646b 100644
--- a/java/src/com/android/inputmethod/latin/inputlogic/InputLogic.java
+++ b/java/src/com/android/inputmethod/latin/inputlogic/InputLogic.java
@@ -925,6 +925,7 @@
         if (tryPerformDoubleSpacePeriod(event, inputTransaction)) {
             mSpaceState = SpaceState.DOUBLE;
             inputTransaction.setRequiresUpdateSuggestions();
+            StatsUtils.onDoubleSpacePeriod();
         } else if (swapWeakSpace && trySwapSwapperAndSpace(event, inputTransaction)) {
             mSpaceState = SpaceState.SWAP_PUNCTUATION;
             mSuggestionStripViewAccessor.setNeutralSuggestionStrip();

java/src/com/android/inputmethod/latin/makedict/FormatSpec.java

diff --git a/java/src/com/android/inputmethod/latin/makedict/FormatSpec.java b/java/src/com/android/inputmethod/latin/makedict/FormatSpec.java
index 1e9f8e4..32a746d 100644
--- a/java/src/com/android/inputmethod/latin/makedict/FormatSpec.java
+++ b/java/src/com/android/inputmethod/latin/makedict/FormatSpec.java
@@ -172,8 +172,8 @@
     public static final int VERSION2 = 2;
     public static final int VERSION201 = 201;
     public static final int VERSION202 = 202;
-    // format version for Fava
-    public static final int VERSION300 = 300;
+    // format version for Fava Dictionaries.
+    public static final int VERSION_DELIGHT3 = 86736212;
     public static final int MINIMUM_SUPPORTED_VERSION_OF_CODE_POINT_TABLE = VERSION201;
     // Dictionary version used for testing.
     public static final int VERSION4_ONLY_FOR_TESTING = 399;
@@ -182,7 +182,7 @@
     public static final int VERSION4 = VERSION403;
     public static final int VERSION4_DEV = VERSION403;
     public static final int MINIMUM_SUPPORTED_STATIC_VERSION = VERSION202;
-    public static final int MAXIMUM_SUPPORTED_STATIC_VERSION = VERSION300;
+    public static final int MAXIMUM_SUPPORTED_STATIC_VERSION = VERSION_DELIGHT3;
     static final int MINIMUM_SUPPORTED_DYNAMIC_VERSION = VERSION4;
     static final int MAXIMUM_SUPPORTED_DYNAMIC_VERSION = VERSION4_DEV;
 

java/src/com/android/inputmethod/latin/utils/DictionaryInfoUtils.java

diff --git a/java/src/com/android/inputmethod/latin/utils/DictionaryInfoUtils.java b/java/src/com/android/inputmethod/latin/utils/DictionaryInfoUtils.java
index 293623c..3ed6a02 100644
--- a/java/src/com/android/inputmethod/latin/utils/DictionaryInfoUtils.java
+++ b/java/src/com/android/inputmethod/latin/utils/DictionaryInfoUtils.java
@@ -153,7 +153,7 @@
     }
 
     /**
-     * Reverse escaping done by replaceFileNameDangerousCharacters.
+     * Reverse escaping done by {@link #replaceFileNameDangerousCharacters(String)}.
      */
     @Nonnull
     public static String getWordListIdFromFileName(@Nonnull final String fname) {