diff options
Diffstat (limited to 'java/res/xml')
| -rw-r--r-- | java/res/xml/key_styles_enter.xml | 15 | ||||
| -rw-r--r-- | java/res/xml/prefs.xml | 1 | ||||
| -rw-r--r-- | java/res/xml/prefs_for_debug.xml | 11 |
3 files changed, 10 insertions, 17 deletions
diff --git a/java/res/xml/key_styles_enter.xml b/java/res/xml/key_styles_enter.xml index 1a60bcce8..50530e1bf 100644 --- a/java/res/xml/key_styles_enter.xml +++ b/java/res/xml/key_styles_enter.xml @@ -298,7 +298,6 @@ <key-style latin:styleName="enterKeyStyle" latin:keySpec="!text/label_go_key|!code/key_enter" - latin:backgroundType="action" latin:parentStyle="defaultEnterKeyStyle" /> </case> <case @@ -317,7 +316,6 @@ <key-style latin:styleName="enterKeyStyle" latin:keySpec="!text/label_next_key|!code/key_enter" - latin:backgroundType="action" latin:parentStyle="defaultEnterKeyStyle" /> </case> <case @@ -336,7 +334,6 @@ <key-style latin:styleName="enterKeyStyle" latin:keySpec="!text/label_previous_key|!code/key_enter" - latin:backgroundType="action" latin:parentStyle="defaultEnterKeyStyle" /> </case> <case @@ -355,7 +352,6 @@ <key-style latin:styleName="enterKeyStyle" latin:keySpec="!text/label_done_key|!code/key_enter" - latin:backgroundType="action" latin:parentStyle="defaultEnterKeyStyle" /> </case> <case @@ -374,11 +370,11 @@ <key-style latin:styleName="enterKeyStyle" latin:keySpec="!text/label_send_key|!code/key_enter" - latin:backgroundType="action" latin:parentStyle="defaultEnterKeyStyle" /> </case> <case latin:imeAction="actionSearch" + latin:isIconDefined="search_key" > <key-style latin:styleName="enterKeyStyle" @@ -387,13 +383,20 @@ latin:parentStyle="defaultEnterKeyStyle" /> </case> <case + latin:imeAction="actionSearch" + > + <key-style + latin:styleName="enterKeyStyle" + latin:keySpec="!text/label_search_key|!code/key_enter" + latin:parentStyle="defaultEnterKeyStyle" /> + </case> + <case latin:imeAction="actionCustomLabel" > <key-style latin:styleName="enterKeyStyle" latin:keySpec="dummy_label|!code/key_enter" latin:keyLabelFlags="fromCustomActionLabel" - latin:backgroundType="action" latin:parentStyle="defaultEnterKeyStyle" /> </case> <!-- imeAction is either actionNone or actionUnspecified. --> diff --git a/java/res/xml/prefs.xml b/java/res/xml/prefs.xml index 61ebb6992..a62986228 100644 --- a/java/res/xml/prefs.xml +++ b/java/res/xml/prefs.xml @@ -153,6 +153,7 @@ android:defaultValue="true" /> <CheckBoxPreference android:key="pref_include_other_imes_in_language_switch_list" + android:dependency="pref_show_language_switch_key" android:title="@string/include_other_imes_in_language_switch_list" android:summary="@string/include_other_imes_in_language_switch_list_summary" android:persistent="true" diff --git a/java/res/xml/prefs_for_debug.xml b/java/res/xml/prefs_for_debug.xml index c333b0751..1a7fe71fe 100644 --- a/java/res/xml/prefs_for_debug.xml +++ b/java/res/xml/prefs_for_debug.xml @@ -21,12 +21,6 @@ android:key="english_ime_debug_settings" > <CheckBoxPreference - android:key="enable_logging" - android:title="@string/prefs_enable_log" - android:summary="@string/prefs_description_log" - android:persistent="true" - android:defaultValue="false" /> - <CheckBoxPreference android:key="debug_mode" android:title="@string/prefs_debug_mode" android:persistent="true" @@ -37,11 +31,6 @@ android:persistent="true" android:defaultValue="false" /> <CheckBoxPreference - android:key="usability_study_mode" - android:title="@string/prefs_usability_study_mode" - android:persistent="true" - android:defaultValue="false" /> - <CheckBoxPreference android:key="pref_sliding_key_input_preview" android:title="@string/sliding_key_input_preview" android:summary="@string/sliding_key_input_preview_summary" |