commit 5f9593593ebaa32e17d5f26918a0efef87f0a83b
author Jean Chalard <jchalard@google.com> Thu Mar 15 12:47:05 2012 +0900
committer Jean Chalard <jchalard@google.com> Thu Mar 15 12:47:05 2012 +0900
tree c1448a83685d01cbc1c4996f10ced67112d36610
parent ca3e7cbdf43baf8f70d8f71d04de5b1b09345461

Remove useless stuff

Change-Id: I43dae30774c40a9d6e7396f8fa73ed4b82a7c777

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

diff --git a/java/src/com/android/inputmethod/latin/SettingsValues.java b/java/src/com/android/inputmethod/latin/SettingsValues.java
index d12b9c4..be9c5cf 100644
--- a/java/src/com/android/inputmethod/latin/SettingsValues.java
+++ b/java/src/com/android/inputmethod/latin/SettingsValues.java
@@ -42,9 +42,7 @@
     public final String mWeakSpaceStrippers;
     public final String mWeakSpaceSwappers;
     private final String mPhantomSpacePromotingSymbols;
-    private final String mSuggestPuncs;
     public final SuggestedWords mSuggestPuncList;
-    public final SuggestedWords mSuggestPuncOutputTextList;
     private final String mSymbolsExcludedFromWordSeparators;
     public final String mWordSeparators;
     public final CharSequence mHintToSaveText;
@@ -110,9 +108,7 @@
         }
         final String[] suggestPuncsSpec = KeySpecParser.parseCsvString(
                 res.getString(R.string.suggested_punctuations), res, R.string.english_ime_name);
-        mSuggestPuncs = createSuggestPuncs(suggestPuncsSpec);
         mSuggestPuncList = createSuggestPuncList(suggestPuncsSpec);
-        mSuggestPuncOutputTextList = createSuggestPuncOutputTextList(suggestPuncsSpec);
         mSymbolsExcludedFromWordSeparators =
                 res.getString(R.string.symbols_excluded_from_word_separators);
         mWordSeparators = createWordSeparators(mWeakSpaceStrippers, mWeakSpaceSwappers,
@@ -164,16 +160,6 @@
     }
 
     // Helper functions to create member values.
-    private static String createSuggestPuncs(final String[] puncs) {
-        final StringBuilder sb = new StringBuilder();
-        if (puncs != null) {
-            for (final String puncSpec : puncs) {
-                sb.append(KeySpecParser.getLabel(puncSpec));
-            }
-        }
-        return sb.toString();
-    }
-
     private static SuggestedWords createSuggestPuncList(final String[] puncs) {
         final ArrayList<SuggestedWords.SuggestedWordInfo> puncList =
                 new ArrayList<SuggestedWords.SuggestedWordInfo>();
@@ -190,27 +176,6 @@
                 true /* isPunctuationSuggestions */);
     }
 
-    private static SuggestedWords createSuggestPuncOutputTextList(final String[] puncs) {
-        final ArrayList<SuggestedWords.SuggestedWordInfo> puncOutputTextList =
-                new ArrayList<SuggestedWords.SuggestedWordInfo>();
-        if (puncs != null) {
-            for (final String puncSpec : puncs) {
-                final String outputText = KeySpecParser.getOutputText(puncSpec);
-                if (outputText != null) {
-                    puncOutputTextList.add(new SuggestedWords.SuggestedWordInfo(outputText));
-                } else {
-                    puncOutputTextList.add(new SuggestedWords.SuggestedWordInfo(
-                            KeySpecParser.getLabel(puncSpec)));
-                }
-            }
-        }
-        return new SuggestedWords(puncOutputTextList,
-                false /* typedWordValid */,
-                false /* hasAutoCorrectionCandidate */,
-                false /* allowsToBeAutoCorrected */,
-                true /* isPunctuationSuggestions */);
-    }
-
     private static String createWordSeparators(final String weakSpaceStrippers,
             final String weakSpaceSwappers, final String symbolsExcludedFromWordSeparators,
             final Resources res) {