Make "Show correction suggestions" as a binary option
Formerly "Show correction suggestions" had three options, "always
show", "show in portrait mode", and "always hide". The reason behind
"show in portrait mode" was that there may not be enough screen estate
in landscape mode to show suggestions. Because recent phone devices
have relatively large screen, we decide to remove "show in portrait
mode" option.
Bug: 15780939
Change-Id: I896d737452c3893d43ce20bd88127f10c1eb3d83
diff --git a/java/res/values/donottranslate.xml b/java/res/values/donottranslate.xml
index 83d082f..e3f0aea 100644
--- a/java/res/values/donottranslate.xml
+++ b/java/res/values/donottranslate.xml
@@ -18,26 +18,6 @@
*/
-->
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <!-- Always show the suggestion strip -->
- <string name="prefs_suggestion_visibility_show_value">0</string>
- <!-- Show the suggestion strip only on portrait mode -->
- <string name="prefs_suggestion_visibility_show_only_portrait_value">1</string>
- <!-- Always hide the suggestion strip -->
- <string name="prefs_suggestion_visibility_hide_value">2</string>
- <!-- Default value of the visibility of the suggestion strip -->
- <string name="prefs_suggestion_visibility_default_value">0</string>
- <!-- Option to show/hide the suggestion strip -->
- <string-array name="prefs_suggestion_visibility_values">
- <item>@string/prefs_suggestion_visibility_show_value</item>
- <item>@string/prefs_suggestion_visibility_show_only_portrait_value</item>
- <item>@string/prefs_suggestion_visibility_hide_value</item>
- </string-array>
- <string-array name="prefs_suggestion_visibilities">
- <item>@string/prefs_suggestion_visibility_show_name</item>
- <item>@string/prefs_suggestion_visibility_show_only_portrait_name</item>
- <item>@string/prefs_suggestion_visibility_hide_name</item>
- </string-array>
-
<!-- For backward compatibility.
See {@link SettingsValues#needsToShowVoiceInputKey(SharedPreferences,Resources)} -->
<string name="voice_mode_main">0</string>
diff --git a/java/res/values/strings.xml b/java/res/values/strings.xml
index 6df69ed..b6601c8 100644
--- a/java/res/values/strings.xml
+++ b/java/res/values/strings.xml
@@ -108,9 +108,6 @@
<string name="prefs_show_suggestions">Show correction suggestions</string>
<!-- Description for show suggestions -->
<string name="prefs_show_suggestions_summary">Display suggested words while typing</string>
- <string name="prefs_suggestion_visibility_show_name">Always show</string>
- <string name="prefs_suggestion_visibility_show_only_portrait_name">Show in portrait mode</string>
- <string name="prefs_suggestion_visibility_hide_name">Always hide</string>
<!-- Option to block potentially offensive words to be shown [CHAR_LIMIT=30] -->
<string name="prefs_block_potentially_offensive_title">Block offensive words</string>
diff --git a/java/res/xml/prefs.xml b/java/res/xml/prefs.xml
index 6febb31..7e4c284 100644
--- a/java/res/xml/prefs.xml
+++ b/java/res/xml/prefs.xml
@@ -144,13 +144,11 @@
android:entries="@array/auto_correction_threshold_modes"
android:defaultValue="@string/auto_correction_threshold_mode_index_modest"
android:persistent="true" />
- <ListPreference
- android:key="show_suggestions_setting"
+ <CheckBoxPreference
+ android:key="show_suggestions"
android:summary="@string/prefs_show_suggestions_summary"
android:title="@string/prefs_show_suggestions"
- android:entryValues="@array/prefs_suggestion_visibility_values"
- android:entries="@array/prefs_suggestion_visibilities"
- android:defaultValue="@string/prefs_suggestion_visibility_default_value"
+ android:defaultValue="true"
android:persistent="true" />
<CheckBoxPreference
android:key="pref_key_use_personalized_dicts"