aboutsummaryrefslogtreecommitdiffstats
path: root/java/src/com/android/inputmethod/latin/SettingsFragment.java
diff options
context:
space:
mode:
authorSatoshi Kataoka <satok@google.com>2013-04-25 15:21:31 +0900
committerSatoshi Kataoka <satok@google.com>2013-04-26 15:48:08 +0900
commitdcef94165b256c2bc8d3a05e2fe0caf0795c7155 (patch)
tree9ff9a09af51b76794ded6824f7d91c0ab2289e5a /java/src/com/android/inputmethod/latin/SettingsFragment.java
parent30f0f3a92a9244b8a0a0dbf03126955206958fff (diff)
downloadlatinime-dcef94165b256c2bc8d3a05e2fe0caf0795c7155.tar.gz
latinime-dcef94165b256c2bc8d3a05e2fe0caf0795c7155.tar.xz
latinime-dcef94165b256c2bc8d3a05e2fe0caf0795c7155.zip
Support ICS on the user dictionary settings
Bug: 8600958 Change-Id: I50e9228afc7b04147eb7c4734d3145abe8859a30
Diffstat (limited to 'java/src/com/android/inputmethod/latin/SettingsFragment.java')
-rw-r--r--java/src/com/android/inputmethod/latin/SettingsFragment.java12
1 files changed, 3 insertions, 9 deletions
diff --git a/java/src/com/android/inputmethod/latin/SettingsFragment.java b/java/src/com/android/inputmethod/latin/SettingsFragment.java
index c78064b23..830cae9b8 100644
--- a/java/src/com/android/inputmethod/latin/SettingsFragment.java
+++ b/java/src/com/android/inputmethod/latin/SettingsFragment.java
@@ -25,7 +25,6 @@ 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;
@@ -46,7 +45,7 @@ import com.android.inputmethodcommon.InputMethodSettingsFragment;
public final class SettingsFragment extends InputMethodSettingsFragment
implements SharedPreferences.OnSharedPreferenceChangeListener {
- private static final boolean DBG_USE_INTERNAL_USER_SETTINGS = false;
+ private static final boolean DBG_USE_INTERNAL_USER_DICTIONARY_SETTINGS = false;
private ListPreference mVoicePreference;
private ListPreference mShowCorrectionSuggestionsPreference;
@@ -202,13 +201,8 @@ public final class SettingsFragment extends InputMethodSettingsFragment
final Intent editPersonalDictionaryIntent = editPersonalDictionary.getIntent();
final ResolveInfo ri = context.getPackageManager().resolveActivity(
editPersonalDictionaryIntent, PackageManager.MATCH_DEFAULT_ONLY);
- if (DBG_USE_INTERNAL_USER_SETTINGS || ri == null) {
- // TODO: Support ICS
- if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {
- updateUserDictionaryPreference(editPersonalDictionary);
- } else {
- removePreference(Settings.PREF_EDIT_PERSONAL_DICTIONARY, getPreferenceScreen());
- }
+ if (DBG_USE_INTERNAL_USER_DICTIONARY_SETTINGS || ri == null) {
+ updateUserDictionaryPreference(editPersonalDictionary);
}
if (!Settings.readFromBuildConfigIfGestureInputEnabled(res)) {