commit c8e6c7996f440655a5b2338faab358adc6d66435
author Seigo Nonaka <nona@google.com> Mon Aug 17 21:33:30 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Aug 17 21:33:30 2015 +0000
tree 6ad08821ae754d0d6392de346ac217037ce06114
parent 7934a41bfb8a64552cecdee92770d146788631db
parent ce2c7849a0d73cc9eee22237024e52ec64b97201

Merge "Remove duplicate separator definition."

core/java/com/android/internal/inputmethod/InputMethodUtils.java

diff --git a/core/java/com/android/internal/inputmethod/InputMethodUtils.java b/core/java/com/android/internal/inputmethod/InputMethodUtils.java
index b85d5eb..a4ef00a 100644
--- a/core/java/com/android/internal/inputmethod/InputMethodUtils.java
+++ b/core/java/com/android/internal/inputmethod/InputMethodUtils.java
@@ -64,6 +64,9 @@
     private static final String TAG_ENABLED_WHEN_DEFAULT_IS_NOT_ASCII_CAPABLE =
             "EnabledWhenDefaultIsNotAsciiCapable";
     private static final String TAG_ASCII_CAPABLE = "AsciiCapable";
+
+    // The string for enabled input method is saved as follows:
+    // example: ("ime0;subtype0;subtype1;subtype2:ime1:ime2;subtype0")
     private static final char INPUT_METHOD_SEPARATOR = ':';
     private static final char INPUT_METHOD_SUBTYPE_SEPARATOR = ';';
     /**
@@ -795,15 +798,11 @@
      * TODO: Move all putters and getters of settings to this class.
      */
     public static class InputMethodSettings {
-        // The string for enabled input method is saved as follows:
-        // example: ("ime0;subtype0;subtype1;subtype2:ime1:ime2;subtype0")
-        private static final char INPUT_METHOD_SEPARATER = ':';
-        private static final char INPUT_METHOD_SUBTYPE_SEPARATER = ';';
         private final TextUtils.SimpleStringSplitter mInputMethodSplitter =
-                new TextUtils.SimpleStringSplitter(INPUT_METHOD_SEPARATER);
+                new TextUtils.SimpleStringSplitter(INPUT_METHOD_SEPARATOR);
 
         private final TextUtils.SimpleStringSplitter mSubtypeSplitter =
-                new TextUtils.SimpleStringSplitter(INPUT_METHOD_SUBTYPE_SEPARATER);
+                new TextUtils.SimpleStringSplitter(INPUT_METHOD_SUBTYPE_SEPARATOR);
 
         private final Resources mRes;
         private final ContentResolver mResolver;
@@ -820,7 +819,7 @@
             // Inputmethod and subtypes are saved in the settings as follows:
             // ime0;subtype0;subtype1:ime1;subtype0:ime2:ime3;subtype0;subtype1
             for (String subtypeId: ime.second) {
-                builder.append(INPUT_METHOD_SUBTYPE_SEPARATER).append(subtypeId);
+                builder.append(INPUT_METHOD_SUBTYPE_SEPARATOR).append(subtypeId);
             }
         }
 
@@ -830,7 +829,7 @@
             boolean needsSeparator = false;
             for (Pair<String, ArrayList<String>> ime : allImeSettingsMap) {
                 if (needsSeparator) {
-                    b.append(INPUT_METHOD_SEPARATER);
+                    b.append(INPUT_METHOD_SEPARATOR);
                 }
                 buildEnabledInputMethodsSettingString(b, ime);
                 needsSeparator = true;
@@ -970,7 +969,7 @@
                 putEnabledInputMethodsStr(id);
             } else {
                 putEnabledInputMethodsStr(
-                        mEnabledInputMethodsStrCache + INPUT_METHOD_SEPARATER + id);
+                        mEnabledInputMethodsStrCache + INPUT_METHOD_SEPARATOR + id);
             }
         }
 
@@ -991,7 +990,7 @@
                     isRemoved = true;
                 } else {
                     if (needsAppendSeparator) {
-                        builder.append(INPUT_METHOD_SEPARATER);
+                        builder.append(INPUT_METHOD_SEPARATOR);
                     } else {
                         needsAppendSeparator = true;
                     }
@@ -1041,7 +1040,7 @@
             StringBuilder builder = new StringBuilder();
             boolean isImeAdded = false;
             if (!TextUtils.isEmpty(newImeId) && !TextUtils.isEmpty(newSubtypeId)) {
-                builder.append(newImeId).append(INPUT_METHOD_SUBTYPE_SEPARATER).append(
+                builder.append(newImeId).append(INPUT_METHOD_SUBTYPE_SEPARATOR).append(
                         newSubtypeId);
                 isImeAdded = true;
             }
@@ -1052,14 +1051,14 @@
                     subtypeId = NOT_A_SUBTYPE_ID_STR;
                 }
                 if (isImeAdded) {
-                    builder.append(INPUT_METHOD_SEPARATER);
+                    builder.append(INPUT_METHOD_SEPARATOR);
                 } else {
                     isImeAdded = true;
                 }
-                builder.append(imeId).append(INPUT_METHOD_SUBTYPE_SEPARATER).append(
+                builder.append(imeId).append(INPUT_METHOD_SUBTYPE_SEPARATOR).append(
                         subtypeId);
             }
-            // Remove the last INPUT_METHOD_SEPARATER
+            // Remove the last INPUT_METHOD_SEPARATOR
             putSubtypeHistoryStr(builder.toString());
         }