diff options
| author |   Satoshi Kataoka <satok@google.com> | 2012-07-06 16:35:27 +0900 |
|---|---|---|
| committer | Satoshi Kataoka <satok@google.com> | 2012-07-06 16:35:27 +0900 |
| commit | 46eea3c13f0e536c8cbd30c8d571de2a321e7a99 (patch) | |
| tree | f88a62f73a40e8e715974eac8576cb7f49235cd8 /java/src/com/android/inputmethod/latin/Settings.java | |
| parent | b8add1a24ea60d28bf2436f675326f34b6a13ac1 (diff) | |
| parent | 362ea3cacbe1f19625f6a75e2bd7cd5de33fe0f2 (diff) | |
| download | latinime-46eea3c13f0e536c8cbd30c8d571de2a321e7a99.tar.gz latinime-46eea3c13f0e536c8cbd30c8d571de2a321e7a99.tar.xz latinime-46eea3c13f0e536c8cbd30c8d571de2a321e7a99.zip | |
Merge remote-tracking branch 'goog/master' into mergescript
Conflicts:
native/jni/Android.mk
Change-Id: I5e4657b0949274ce29315a2c9047db428d5455af
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 4c89a6e91..70acdc771 100644 --- a/java/src/com/android/inputmethod/latin/Settings.java +++ b/java/src/com/android/inputmethod/latin/Settings.java @@ -111,6 +111,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); |