Turn off the Settings key by default
bug:5094401
Change-Id: Ieb42fdfa79be2afcfa6634e7404c17737ef6927d
diff --git a/java/res/values/donottranslate.xml b/java/res/values/donottranslate.xml
index 4cf9303..a70c795 100644
--- a/java/res/values/donottranslate.xml
+++ b/java/res/values/donottranslate.xml
@@ -50,26 +50,6 @@
<!-- Character for close candidates pane (BLACK UP-POINTING TRIANGLE) -->
<string name="label_close_candidates_pane">\u25b2</string>
- <!-- Option values to show/hide the settings key in onscreen keyboard -->
- <!-- Automatically decide to show or hide the settings key -->
- <string name="settings_key_mode_auto">0</string>
- <!-- Always show the settings key -->
- <string name="settings_key_mode_always_show">1</string>
- <!-- Always hide the settings key -->
- <string name="settings_key_mode_always_hide">2</string>
- <!-- Array of the settings key mode values -->
- <string-array name="settings_key_modes_values">
- <item>@string/settings_key_mode_auto</item>
- <item>@string/settings_key_mode_always_show</item>
- <item>@string/settings_key_mode_always_hide</item>
- </string-array>
- <!-- Array of the settings key modes -->
- <string-array name="settings_key_modes">
- <item>@string/settings_key_mode_auto_name</item>
- <item>@string/settings_key_mode_always_show_name</item>
- <item>@string/settings_key_mode_always_hide_name</item>
- </string-array>
-
<!-- Always show the suggestion strip -->
<string name="prefs_suggestion_visibility_show_value">0</string>
<!-- Show the suggestion strip only on portrait mode -->
diff --git a/java/res/values/strings.xml b/java/res/values/strings.xml
index e5b85fe..2535818 100644
--- a/java/res/values/strings.xml
+++ b/java/res/values/strings.xml
@@ -82,12 +82,6 @@
<!-- Option to show/hide the settings key -->
<string name="prefs_settings_key">Show settings key</string>
- <!-- Option to automatically decide to show/hide the settings key -->
- <string name="settings_key_mode_auto_name">Automatic</string>
- <!-- Option to always show the settings key -->
- <string name="settings_key_mode_always_show_name">Always show</string>
- <!-- Option to always hide the settings key -->
- <string name="settings_key_mode_always_hide_name">Always hide</string>
<!-- Option to decide the auto correction threshold score -->
<!-- Option to enable auto correction [CHAR LIMIT=20]-->
diff --git a/java/res/xml/prefs.xml b/java/res/xml/prefs.xml
index 8ccb46f..552e3cf 100644
--- a/java/res/xml/prefs.xml
+++ b/java/res/xml/prefs.xml
@@ -49,13 +49,11 @@
android:summary="@string/prefs_enable_recorrection_summary"
android:persistent="true"
android:defaultValue="@bool/config_default_recorrection_enabled" />
- <ListPreference
- android:key="settings_key"
+ <CheckBoxPreference
+ android:key="show_settings_key"
android:title="@string/prefs_settings_key"
android:persistent="true"
- android:entryValues="@array/settings_key_modes_values"
- android:entries="@array/settings_key_modes"
- android:defaultValue="@string/settings_key_mode_auto" />
+ android:defaultValue="false" />
<ListPreference
android:key="voice_mode"
android:title="@string/voice_input"