diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2012-07-10 18:35:19 -0700 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2012-07-10 18:35:19 -0700 |
| commit | 8a96175936e6f4cc02e4fc3cd3ae6759f0b1f86e (patch) | |
| tree | 9f4f6ff804f1966b3d75a995a3c2518e6def5c69 /java/src/com/android/inputmethod/latin/Settings.java | |
| parent | 949d2ae5788977c5e87e35e1bd1770f54ac88f5b (diff) | |
| parent | 86ade47236f8aac94b7e4378c034e32805d6755b (diff) | |
| download | latinime-8a96175936e6f4cc02e4fc3cd3ae6759f0b1f86e.tar.gz latinime-8a96175936e6f4cc02e4fc3cd3ae6759f0b1f86e.tar.xz latinime-8a96175936e6f4cc02e4fc3cd3ae6759f0b1f86e.zip | |
am 86ade472: Merge "Initialize SubtypeLocale from Settings (DO NOT MERGE)" into jb-dev
* commit '86ade47236f8aac94b7e4378c034e32805d6755b':
Initialize SubtypeLocale from Settings (DO NOT MERGE)
Diffstat (limited to 'java/src/com/android/inputmethod/latin/Settings.java')
| -rw-r--r-- | java/src/com/android/inputmethod/latin/Settings.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/java/src/com/android/inputmethod/latin/Settings.java b/java/src/com/android/inputmethod/latin/Settings.java index 152d66851..4bb21720b 100644 --- a/java/src/com/android/inputmethod/latin/Settings.java +++ b/java/src/com/android/inputmethod/latin/Settings.java @@ -116,6 +116,10 @@ public class Settings extends InputMethodSettingsFragment final Resources res = getResources(); final Context context = getActivity(); + // When we are called from the Settings application but we are not already running, the + // {@link SubtypeLocale} class may not have been initialized. It is safe to call + // {@link SubtypeLocale#init(Context)} multiple times. + SubtypeLocale.init(context); mVoicePreference = (ListPreference) findPreference(PREF_VOICE_MODE); mShowCorrectionSuggestionsPreference = (ListPreference) findPreference(PREF_SHOW_SUGGESTIONS_SETTING); |