Read the dictionary resource in a more sensical place.

We don't need to pass this down all the way from LatinIME any more.
It fetched be done exactly where it needs to be.

Change-Id: I9f277f9c4f9de70ae755a1334d86c67bbb24c988

1 files changed, 2 insertions, 7 deletions

diff --git a/java/src/com/android/inputmethod/latin/LatinIME.java b/java/src/com/android/inputmethod/latin/LatinIME.java
index e16be2c97..7cdeef897 100644
--- a/java/src/com/android/inputmethod/latin/LatinIME.java
+++ b/java/src/com/android/inputmethod/latin/LatinIME.java
@@ -501,9 +501,7 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
             oldContactsDictionary = null;
         }
 
-        final int mainDicResId = DictionaryFactory.getMainDictionaryResourceId(
-                mResources, keyboardLocale);
-        mSuggest = new Suggest(this, mainDicResId, keyboardLocale);
+        mSuggest = new Suggest(this, keyboardLocale);
         if (mSettingsValues.mAutoCorrectEnabled) {
             mSuggest.setAutoCorrectionThreshold(mSettingsValues.mAutoCorrectionThreshold);
         }
@@ -552,10 +550,7 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
     }
 
     /* package private */ void resetSuggestMainDict() {
-        final Locale keyboardLocale = mSubtypeSwitcher.getInputLocale();
-        int mainDicResId = DictionaryFactory.getMainDictionaryResourceId(
-                mResources, keyboardLocale);
-        mSuggest.resetMainDict(this, mainDicResId, keyboardLocale);
+        mSuggest.resetMainDict(this, mSubtypeSwitcher.getInputLocale());
     }
 
     @Override