Merge "Clean up bigram settings"

This commit is contained in:
Jean Chalard 2011-08-31 00:03:41 -07:00 committed by Android (Google) Code Review
commit b29b225847
2 changed files with 14 additions and 18 deletions

View file

@ -90,23 +90,6 @@
android:entries="@array/prefs_suggestion_visibilities"
android:defaultValue="@string/prefs_suggestion_visibility_default_value" />
</PreferenceCategory>
<PreferenceCategory
android:title="@string/ngram_category"
android:key="ngram_settings">
<CheckBoxPreference
android:key="bigram_suggestion"
android:title="@string/bigram_suggestion"
android:summary="@string/bigram_suggestion_summary"
android:persistent="true"
android:defaultValue="true" />
<CheckBoxPreference
android:key="bigram_prediction"
android:dependency="bigram_suggestion"
android:title="@string/bigram_prediction"
android:summary="@string/bigram_prediction_summary"
android:persistent="true"
android:defaultValue="false" />
</PreferenceCategory>
<PreferenceCategory
android:title="@string/misc_category"
android:key="misc_settings">
@ -143,6 +126,20 @@
android:summary="@string/use_contacts_dict_summary"
android:persistent="true"
android:defaultValue="true" />
<CheckBoxPreference
android:key="bigram_suggestion"
android:title="@string/bigram_suggestion"
android:summary="@string/bigram_suggestion_summary"
android:persistent="true"
android:defaultValue="true" />
<!-- TODO: evaluate results and revive this option. The code already supports it. -->
<!-- <CheckBoxPreference -->
<!-- android:key="bigram_prediction" -->
<!-- android:dependency="bigram_suggestion" -->
<!-- android:title="@string/bigram_prediction" -->
<!-- android:summary="@string/bigram_prediction_summary" -->
<!-- android:persistent="true" -->
<!-- android:defaultValue="false" /> -->
</PreferenceScreen>
<!-- <Preference
android:title="Debug Settings"

View file

@ -73,7 +73,6 @@ public class Settings extends InputMethodSettingsActivity
public static final String PREF_AUTO_CORRECTION_THRESHOLD = "auto_correction_threshold";
public static final String PREF_DEBUG_SETTINGS = "debug_settings";
public static final String PREF_NGRAM_SETTINGS_KEY = "ngram_settings";
public static final String PREF_BIGRAM_SUGGESTIONS = "bigram_suggestion";
public static final String PREF_BIGRAM_PREDICTIONS = "bigram_prediction";