From 15121cff3785f179e79b1b82753a145ffd913ea5 Mon Sep 17 00:00:00 2001
From: Jean Chalard <jchalard@google.com>
Date: Fri, 15 Jun 2012 04:20:45 +0900
Subject: [PATCH] Remove irrelevant options.
Bug: 6667355
Change-Id: I39b6db17fb52e80f510cf6462f41d9cb1f8e0341
---
java/res/xml/prefs.xml | 1 -
.../src/com/android/inputmethod/latin/Settings.java | 7 +++++--
.../android/inputmethod/latin/SettingsValues.java | 13 ++++---------
3 files changed, 9 insertions(+), 12 deletions(-)
diff --git a/java/res/xml/prefs.xml b/java/res/xml/prefs.xml
index 3598a685ef..137981949e 100644
--- a/java/res/xml/prefs.xml
+++ b/java/res/xml/prefs.xml
@@ -122,7 +122,6 @@
android:defaultValue="true" />
<CheckBoxPreference
android:key="next_word_prediction"
- android:dependency="next_word_suggestion"
android:title="@string/bigram_prediction"
android:summary="@string/bigram_prediction_summary"
android:persistent="true"
diff --git a/java/src/com/android/inputmethod/latin/Settings.java b/java/src/com/android/inputmethod/latin/Settings.java
index c9ff0a5a88..152d668513 100644
--- a/java/src/com/android/inputmethod/latin/Settings.java
+++ b/java/src/com/android/inputmethod/latin/Settings.java
@@ -149,10 +149,13 @@ public class Settings extends InputMethodSettingsFragment
generalSettings.removePreference(mVoicePreference);
}
+ final PreferenceGroup advancedSettings =
+ (PreferenceGroup) findPreference(PREF_ADVANCED_SETTINGS);
+ // Remove those meaningless options for now. TODO: delete them for good
+ advancedSettings.removePreference(findPreference(PREF_BIGRAM_SUGGESTION));
+ advancedSettings.removePreference(findPreference(PREF_KEY_ENABLE_SPAN_INSERT));
if (!VibratorUtils.getInstance(context).hasVibrator()) {
generalSettings.removePreference(findPreference(PREF_VIBRATE_ON));
- final PreferenceGroup advancedSettings =
- (PreferenceGroup) findPreference(PREF_ADVANCED_SETTINGS);
if (null != advancedSettings) { // Theoretically advancedSettings cannot be null
advancedSettings.removePreference(findPreference(PREF_VIBRATION_DURATION_SETTINGS));
}
diff --git a/java/src/com/android/inputmethod/latin/SettingsValues.java b/java/src/com/android/inputmethod/latin/SettingsValues.java
index 4aae6a85e9..b07c3e59f1 100644
--- a/java/src/com/android/inputmethod/latin/SettingsValues.java
+++ b/java/src/com/android/inputmethod/latin/SettingsValues.java
@@ -135,8 +135,8 @@ public class SettingsValues {
&& isBigramSuggestionEnabled(prefs, res, mAutoCorrectEnabled);
mBigramPredictionEnabled = mBigramSuggestionEnabled
&& isBigramPredictionEnabled(prefs, res);
- mEnableSuggestionSpanInsertion =
- prefs.getBoolean(Settings.PREF_KEY_ENABLE_SPAN_INSERT, true);
+ // TODO: remove mEnableSuggestionSpanInsertion. It's always true.
+ mEnableSuggestionSpanInsertion = true;
mVibrationDurationSettingsRawValue =
prefs.getInt(Settings.PREF_VIBRATION_DURATION_SETTINGS, -1);
mKeypressSoundVolumeRawValue = prefs.getFloat(Settings.PREF_KEYPRESS_SOUND_VOLUME, -1.0f);
@@ -242,13 +242,8 @@ public class SettingsValues {
private static boolean isBigramSuggestionEnabled(final SharedPreferences sp,
final Resources resources, final boolean autoCorrectEnabled) {
- final boolean showBigramSuggestionsOption = resources.getBoolean(
- R.bool.config_enable_next_word_suggestions_option);
- if (!showBigramSuggestionsOption) {
- return autoCorrectEnabled;
- }
- return sp.getBoolean(Settings.PREF_BIGRAM_SUGGESTION, resources.getBoolean(
- R.bool.config_default_next_word_suggestions));
+ // TODO: remove this method. Bigram suggestion is always true.
+ return true;
}
private static boolean isBigramPredictionEnabled(final SharedPreferences sp,
--
GitLab