diff options
| author |   Satoshi Kataoka <satok@google.com> | 2013-06-27 14:10:50 +0900 |
|---|---|---|
| committer | Satoshi Kataoka <satok@google.com> | 2013-06-27 19:20:05 +0900 |
| commit | a2bfd46adf6aca5864be3d6ef2204bc18008e9c9 (patch) | |
| tree | e118288946ce4a385b0e89bb374f06ed7efd12c4 /java/src/com/android/inputmethod/latin/SettingsFragment.java | |
| parent | d9e08beebf1bf7cfb45173a8140b9eaf62ba1319 (diff) | |
| download | latinime-a2bfd46adf6aca5864be3d6ef2204bc18008e9c9.tar.gz latinime-a2bfd46adf6aca5864be3d6ef2204bc18008e9c9.tar.xz latinime-a2bfd46adf6aca5864be3d6ef2204bc18008e9c9.zip | |
Use internal personal dictionary settings on JBMR2 or before
Bug: 9117704
Change-Id: I7e20b03daa23b59211235183cf48d933e32845e4
Diffstat (limited to 'java/src/com/android/inputmethod/latin/SettingsFragment.java')
| -rw-r--r-- | java/src/com/android/inputmethod/latin/SettingsFragment.java | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/java/src/com/android/inputmethod/latin/SettingsFragment.java b/java/src/com/android/inputmethod/latin/SettingsFragment.java index 46fa1913c..f52e56441 100644 --- a/java/src/com/android/inputmethod/latin/SettingsFragment.java +++ b/java/src/com/android/inputmethod/latin/SettingsFragment.java @@ -25,6 +25,7 @@ import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; import android.content.res.Resources; import android.media.AudioManager; +import android.os.Build; import android.os.Bundle; import android.preference.CheckBoxPreference; import android.preference.ListPreference; @@ -51,7 +52,10 @@ import java.util.TreeSet; public final class SettingsFragment extends InputMethodSettingsFragment implements SharedPreferences.OnSharedPreferenceChangeListener { private static final String TAG = SettingsFragment.class.getSimpleName(); - private static final boolean DBG_USE_INTERNAL_USER_DICTIONARY_SETTINGS = false; + private static final boolean DBG_USE_INTERNAL_PERSONAL_DICTIONARY_SETTINGS = false; + private static final boolean USE_INTERNAL_PERSONAL_DICTIONARY_SETTIGS = + DBG_USE_INTERNAL_PERSONAL_DICTIONARY_SETTINGS + || Build.VERSION.SDK_INT <= 18 /* Build.VERSION.JELLY_BEAN_MR2 */; private ListPreference mVoicePreference; private ListPreference mShowCorrectionSuggestionsPreference; @@ -212,10 +216,11 @@ public final class SettingsFragment extends InputMethodSettingsFragment final Preference editPersonalDictionary = findPreference(Settings.PREF_EDIT_PERSONAL_DICTIONARY); final Intent editPersonalDictionaryIntent = editPersonalDictionary.getIntent(); - final ResolveInfo ri = context.getPackageManager().resolveActivity( - editPersonalDictionaryIntent, PackageManager.MATCH_DEFAULT_ONLY); - if (DBG_USE_INTERNAL_USER_DICTIONARY_SETTINGS || ri == null) { - updateUserDictionaryPreference(editPersonalDictionary); + final ResolveInfo ri = USE_INTERNAL_PERSONAL_DICTIONARY_SETTIGS ? null + : context.getPackageManager().resolveActivity( + editPersonalDictionaryIntent, PackageManager.MATCH_DEFAULT_ONLY); + if (ri == null) { + overwriteUserDictionaryPreference(editPersonalDictionary); } if (!Settings.readFromBuildConfigIfGestureInputEnabled(res)) { @@ -470,7 +475,7 @@ public final class SettingsFragment extends InputMethodSettingsFragment }); } - private void updateUserDictionaryPreference(Preference userDictionaryPreference) { + private void overwriteUserDictionaryPreference(Preference userDictionaryPreference) { final Activity activity = getActivity(); final TreeSet<String> localeList = UserDictionaryList.getUserDictionaryLocalesSet(activity); if (null == localeList) { |