From ab791d0bbcdf05c264d846010683b336168ee194 Mon Sep 17 00:00:00 2001
From: Jean Chalard <jchalard@google.com>
Date: Sun, 14 Aug 2011 23:49:01 -0700
Subject: [PATCH] Revert "Remove the "Touch to correct words" option."

This reverts commit 8e69dd80d88c356778c8c1fb1ccaf79108db9dff

...since it breaks the build
---
 java/res/values-sw600dp/config.xml                           | 1 +
 java/res/values-sw768dp/config.xml                           | 1 +
 java/res/values/config.xml                                   | 4 ++--
 .../inputmethod/deprecated/recorrection/Recorrection.java    | 5 ++---
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/java/res/values-sw600dp/config.xml b/java/res/values-sw600dp/config.xml
index d539e0d82..a59167719 100644
--- a/java/res/values-sw600dp/config.xml
+++ b/java/res/values-sw600dp/config.xml
@@ -23,6 +23,7 @@
     <bool name="config_default_show_settings_key">false</bool>
     <bool name="config_enable_show_voice_key_option">false</bool>
     <bool name="config_enable_show_popup_on_keypress_option">false</bool>
+    <bool name="config_enable_show_recorrection_option">false</bool>
     <bool name="config_enable_bigram_suggestions_option">false</bool>
     <bool name="config_sliding_key_input_enabled">false</bool>
     <bool name="config_digit_popup_characters_enabled">false</bool>
diff --git a/java/res/values-sw768dp/config.xml b/java/res/values-sw768dp/config.xml
index 0f8f106b7..091d62e59 100644
--- a/java/res/values-sw768dp/config.xml
+++ b/java/res/values-sw768dp/config.xml
@@ -23,6 +23,7 @@
     <bool name="config_default_show_settings_key">true</bool>
     <bool name="config_enable_show_voice_key_option">false</bool>
     <bool name="config_enable_show_popup_on_keypress_option">false</bool>
+    <bool name="config_enable_show_recorrection_option">false</bool>
     <bool name="config_enable_bigram_suggestions_option">false</bool>
     <bool name="config_sliding_key_input_enabled">false</bool>
     <bool name="config_digit_popup_characters_enabled">false</bool>
diff --git a/java/res/values/config.xml b/java/res/values/config.xml
index 6327ede38..472bc1e14 100644
--- a/java/res/values/config.xml
+++ b/java/res/values/config.xml
@@ -23,7 +23,7 @@
     <bool name="config_default_show_settings_key">false</bool>
     <bool name="config_enable_show_voice_key_option">true</bool>
     <bool name="config_enable_show_popup_on_keypress_option">true</bool>
-    <bool name="config_enable_show_recorrection_option">false</bool>
+    <bool name="config_enable_show_recorrection_option">true</bool>
     <bool name="config_enable_bigram_suggestions_option">true</bool>
     <bool name="config_enable_usability_study_mode_option">false</bool>
     <bool name="config_sliding_key_input_enabled">true</bool>
@@ -36,7 +36,7 @@
     <!-- Default value for bigram prediction: after entering a word and a space only, should we look
          at input history to suggest a hopefully helpful candidate for the next word? -->
     <bool name="config_default_bigram_prediction">false</bool>
-    <bool name="config_default_compat_recorrection_enabled">true</bool>
+    <bool name="config_default_recorrection_enabled">true</bool>
     <bool name="config_default_sound_enabled">false</bool>
     <bool name="config_auto_correction_spacebar_led_enabled">true</bool>
     <bool name="config_auto_correction_suggestion_strip_visual_flash_enabled">false</bool>
diff --git a/java/src/com/android/inputmethod/deprecated/recorrection/Recorrection.java b/java/src/com/android/inputmethod/deprecated/recorrection/Recorrection.java
index bf2512d7b..d40728d25 100644
--- a/java/src/com/android/inputmethod/deprecated/recorrection/Recorrection.java
+++ b/java/src/com/android/inputmethod/deprecated/recorrection/Recorrection.java
@@ -271,10 +271,9 @@ public class Recorrection implements SharedPreferences.OnSharedPreferenceChangeL
         // but always use the default setting defined in the resources.
         if (res.getBoolean(R.bool.config_enable_show_recorrection_option)) {
             mRecorrectionEnabled = prefs.getBoolean(Settings.PREF_RECORRECTION_ENABLED,
-                    res.getBoolean(R.bool.config_default_compat_recorrection_enabled));
+                    res.getBoolean(R.bool.config_default_recorrection_enabled));
         } else {
-            mRecorrectionEnabled =
-                    res.getBoolean(R.bool.config_default_compat_recorrection_enabled);
+            mRecorrectionEnabled = res.getBoolean(R.bool.config_default_recorrection_enabled);
         }
     }