Fix auto correction threshold values array reference
This change also removes unused argument from Suggest.getSuggestions().
Change-Id: I512f8695d22898bb906e136a66e0ee6b521cd1d1
diff --git a/java/res/values/config.xml b/java/res/values/config.xml
index 456d9ad..0bb0e33 100644
--- a/java/res/values/config.xml
+++ b/java/res/values/config.xml
@@ -32,14 +32,14 @@
<integer name="config_long_press_key_timeout">400</integer>
<integer name="config_long_press_shift_key_timeout">1200</integer>
<integer name="config_multi_tap_key_timeout">800</integer>
- <string-array name="auto_complete_threshold_values">
- <!-- Off, When auto completing setting is Off, this value is not used. -->
+ <string-array name="auto_correction_threshold_values">
+ <!-- Off, When auto correction setting is Off, this value is not used. -->
<item></item>
<!-- Modest : Suggestion whose normalized score is greater than this value
- will be subject to auto-completion. -->
+ will be subject to auto-correction. -->
<item>0.22</item>
<!-- Aggressive : Suggestion whose normalized score is greater than this value
- will be subject to auto-completion. -->
+ will be subject to auto-correction. -->
<item>0</item>
</string-array>
</resources>
diff --git a/java/res/values/donottranslate.xml b/java/res/values/donottranslate.xml
index cfca4d6..5703729 100644
--- a/java/res/values/donottranslate.xml
+++ b/java/res/values/donottranslate.xml
@@ -65,13 +65,13 @@
<item>@string/prefs_suggestion_visibility_hide_name</item>
</string-array>
- <string name="auto_correction_threshold_mode_value_off">0</string>
- <string name="auto_correction_threshold_mode_value_modest">1</string>
- <string name="auto_correction_threshold_mode_value_aggeressive">2</string>
- <string-array name="auto_correction_threshold_mode_values">
- <item>@string/auto_correction_threshold_mode_value_off</item>
- <item>@string/auto_correction_threshold_mode_value_modest</item>
- <item>@string/auto_correction_threshold_mode_value_aggeressive</item>
+ <string name="auto_correction_threshold_mode_index_off">0</string>
+ <string name="auto_correction_threshold_mode_index_modest">1</string>
+ <string name="auto_correction_threshold_mode_index_aggeressive">2</string>
+ <string-array name="auto_correction_threshold_mode_indexes">
+ <item>@string/auto_correction_threshold_mode_index_off</item>
+ <item>@string/auto_correction_threshold_mode_index_modest</item>
+ <item>@string/auto_correction_threshold_mode_index_aggeressive</item>
</string-array>
<string-array name="auto_correction_threshold_modes">
<item>@string/auto_correction_threshold_mode_off</item>
diff --git a/java/res/xml/prefs.xml b/java/res/xml/prefs.xml
index 1bc3395..0eee060 100644
--- a/java/res/xml/prefs.xml
+++ b/java/res/xml/prefs.xml
@@ -106,9 +106,9 @@
android:title="@string/auto_correction"
android:summary="@string/auto_correction_summary"
android:persistent="true"
- android:entryValues="@array/auto_correction_threshold_mode_values"
+ android:entryValues="@array/auto_correction_threshold_mode_indexes"
android:entries="@array/auto_correction_threshold_modes"
- android:defaultValue="@string/auto_correction_threshold_mode_value_modest"
+ android:defaultValue="@string/auto_correction_threshold_mode_index_modest"
/>
<CheckBoxPreference