From 18ccd552a8e2bf69dc38af3bfce9e5a2a7614e1f Mon Sep 17 00:00:00 2001
From: Jean Chalard <jchalard@google.com>
Date: Wed, 31 Aug 2011 15:41:13 +0900
Subject: [PATCH] Clean up bigram settings
Move bigram suggestion option to the advanced settings screen,
remove bigram prediction option for ICS release and remove the
now-empty bigram option category.
Bug: 5240082
Change-Id: Ib1fc608ad33d5598410f7b0cb4a1639bffef28c7
---
java/res/xml/prefs.xml | 31 +++++++++----------
.../android/inputmethod/latin/Settings.java | 1 -
2 files changed, 14 insertions(+), 18 deletions(-)
diff --git a/java/res/xml/prefs.xml b/java/res/xml/prefs.xml
index 6d2218d2f..2f321814e 100644
--- a/java/res/xml/prefs.xml
+++ b/java/res/xml/prefs.xml
@@ -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"
diff --git a/java/src/com/android/inputmethod/latin/Settings.java b/java/src/com/android/inputmethod/latin/Settings.java
index a5eed9015..b79c441d7 100644
--- a/java/src/com/android/inputmethod/latin/Settings.java
+++ b/java/src/com/android/inputmethod/latin/Settings.java
@@ -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";