diff options
Diffstat (limited to 'java/res')
40 files changed, 269 insertions, 157 deletions
diff --git a/java/res/drawable-mdpi/sym_keyboard_settings_holo.png b/java/res/drawable-mdpi/sym_keyboard_settings_holo.png Binary files differnew file mode 100644 index 000000000..ad7618fa0 --- /dev/null +++ b/java/res/drawable-mdpi/sym_keyboard_settings_holo.png diff --git a/java/res/drawable-xlarge/btn_center_default.9.png b/java/res/drawable-xlarge/btn_center_default.9.png Binary files differnew file mode 100755 index 000000000..d5ec36ba4 --- /dev/null +++ b/java/res/drawable-xlarge/btn_center_default.9.png diff --git a/java/res/drawable-xlarge/btn_center_pressed.9.png b/java/res/drawable-xlarge/btn_center_pressed.9.png Binary files differnew file mode 100755 index 000000000..593a679d0 --- /dev/null +++ b/java/res/drawable-xlarge/btn_center_pressed.9.png diff --git a/java/res/drawable-xlarge/btn_center_selected.9.png b/java/res/drawable-xlarge/btn_center_selected.9.png Binary files differnew file mode 100644 index 000000000..f1914a886 --- /dev/null +++ b/java/res/drawable-xlarge/btn_center_selected.9.png diff --git a/java/res/drawable-xlarge/caution.png b/java/res/drawable-xlarge/caution.png Binary files differnew file mode 100755 index 000000000..eaef53425 --- /dev/null +++ b/java/res/drawable-xlarge/caution.png diff --git a/java/res/drawable-xlarge/mic_base.png b/java/res/drawable-xlarge/mic_base.png Binary files differnew file mode 100644 index 000000000..53e29ff4b --- /dev/null +++ b/java/res/drawable-xlarge/mic_base.png diff --git a/java/res/drawable-xlarge/mic_full.png b/java/res/drawable-xlarge/mic_full.png Binary files differnew file mode 100644 index 000000000..e3e3dfac3 --- /dev/null +++ b/java/res/drawable-xlarge/mic_full.png diff --git a/java/res/drawable-xlarge/mic_slash.png b/java/res/drawable-xlarge/mic_slash.png Binary files differnew file mode 100644 index 000000000..1dd05c5b4 --- /dev/null +++ b/java/res/drawable-xlarge/mic_slash.png diff --git a/java/res/drawable-xlarge/vs_dialog_blue.9.png b/java/res/drawable-xlarge/vs_dialog_blue.9.png Binary files differnew file mode 100644 index 000000000..cf27e8f43 --- /dev/null +++ b/java/res/drawable-xlarge/vs_dialog_blue.9.png diff --git a/java/res/drawable-xlarge/vs_dialog_red.9.png b/java/res/drawable-xlarge/vs_dialog_red.9.png Binary files differnew file mode 100644 index 000000000..6c08d5a30 --- /dev/null +++ b/java/res/drawable-xlarge/vs_dialog_red.9.png diff --git a/java/res/drawable-xlarge/vs_dialog_yellow.9.png b/java/res/drawable-xlarge/vs_dialog_yellow.9.png Binary files differnew file mode 100644 index 000000000..2fb06c263 --- /dev/null +++ b/java/res/drawable-xlarge/vs_dialog_yellow.9.png diff --git a/java/res/drawable-xlarge/vs_popup_mic_edge.png b/java/res/drawable-xlarge/vs_popup_mic_edge.png Binary files differnew file mode 100644 index 000000000..4ff6337a2 --- /dev/null +++ b/java/res/drawable-xlarge/vs_popup_mic_edge.png diff --git a/java/res/drawable/background_voice.xml b/java/res/drawable/background_voice.xml new file mode 100644 index 000000000..3b6137df3 --- /dev/null +++ b/java/res/drawable/background_voice.xml @@ -0,0 +1,25 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** +** Copyright 2011, The Android Open Source Project +** +** Licensed under the Apache License, Version 2.0 (the "License"); +** you may not use this file except in compliance with the License. +** You may obtain a copy of the License at +** +** http://www.apache.org/licenses/LICENSE-2.0 +** +** Unless required by applicable law or agreed to in writing, software +** distributed under the License is distributed on an "AS IS" BASIS, +** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +** See the License for the specific language governing permissions and +** limitations under the License. +*/ +--> +<shape xmlns:android="http://schemas.android.com/apk/res/android"> + <gradient + android:startColor="#ff000000" + android:endColor="#ff000e29" + android:angle="90" /> +</shape>
\ No newline at end of file diff --git a/java/res/drawable/btn_center.xml b/java/res/drawable/btn_center.xml new file mode 100644 index 000000000..19b298f75 --- /dev/null +++ b/java/res/drawable/btn_center.xml @@ -0,0 +1,39 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** +** Copyright 2011, The Android Open Source Project +** +** Licensed under the Apache License, Version 2.0 (the "License"); +** you may not use this file except in compliance with the License. +** You may obtain a copy of the License at +** +** http://www.apache.org/licenses/LICENSE-2.0 +** +** Unless required by applicable law or agreed to in writing, software +** distributed under the License is distributed on an "AS IS" BASIS, +** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +** See the License for the specific language governing permissions and +** limitations under the License. +*/ +--> + +<selector + xmlns:android="http://schemas.android.com/apk/res/android"> + <item + android:state_window_focused="false" + android:state_enabled="true" + android:drawable="@drawable/btn_center_default" /> + <item + android:state_pressed="true" + android:drawable="@drawable/btn_center_pressed" /> + <item + android:state_focused="true" + android:state_enabled="true" + android:drawable="@drawable/btn_center_selected" /> + <item + android:state_enabled="true" + android:drawable="@drawable/btn_center_default" /> + <item + android:drawable="@drawable/btn_center_default" /> +</selector> diff --git a/java/res/drawable/btn_center_default.9.png b/java/res/drawable/btn_center_default.9.png Binary files differnew file mode 100755 index 000000000..d5ec36ba4 --- /dev/null +++ b/java/res/drawable/btn_center_default.9.png diff --git a/java/res/drawable/btn_center_pressed.9.png b/java/res/drawable/btn_center_pressed.9.png Binary files differnew file mode 100755 index 000000000..593a679d0 --- /dev/null +++ b/java/res/drawable/btn_center_pressed.9.png diff --git a/java/res/drawable/btn_center_selected.9.png b/java/res/drawable/btn_center_selected.9.png Binary files differnew file mode 100644 index 000000000..f1914a886 --- /dev/null +++ b/java/res/drawable/btn_center_selected.9.png diff --git a/java/res/drawable/caution.png b/java/res/drawable/caution.png Binary files differnew file mode 100755 index 000000000..eaef53425 --- /dev/null +++ b/java/res/drawable/caution.png diff --git a/java/res/drawable/mic_base.png b/java/res/drawable/mic_base.png Binary files differnew file mode 100644 index 000000000..53e29ff4b --- /dev/null +++ b/java/res/drawable/mic_base.png diff --git a/java/res/drawable/mic_full.png b/java/res/drawable/mic_full.png Binary files differnew file mode 100644 index 000000000..e3e3dfac3 --- /dev/null +++ b/java/res/drawable/mic_full.png diff --git a/java/res/drawable/mic_slash.png b/java/res/drawable/mic_slash.png Binary files differnew file mode 100644 index 000000000..1dd05c5b4 --- /dev/null +++ b/java/res/drawable/mic_slash.png diff --git a/java/res/drawable/vs_dialog_blue.9.png b/java/res/drawable/vs_dialog_blue.9.png Binary files differnew file mode 100644 index 000000000..cf27e8f43 --- /dev/null +++ b/java/res/drawable/vs_dialog_blue.9.png diff --git a/java/res/drawable/vs_dialog_red.9.png b/java/res/drawable/vs_dialog_red.9.png Binary files differnew file mode 100644 index 000000000..6c08d5a30 --- /dev/null +++ b/java/res/drawable/vs_dialog_red.9.png diff --git a/java/res/drawable/vs_dialog_yellow.9.png b/java/res/drawable/vs_dialog_yellow.9.png Binary files differnew file mode 100644 index 000000000..2fb06c263 --- /dev/null +++ b/java/res/drawable/vs_dialog_yellow.9.png diff --git a/java/res/drawable/vs_popup_mic_edge.png b/java/res/drawable/vs_popup_mic_edge.png Binary files differnew file mode 100644 index 000000000..4ff6337a2 --- /dev/null +++ b/java/res/drawable/vs_popup_mic_edge.png diff --git a/java/res/layout/recognition_status.xml b/java/res/layout/recognition_status.xml index ea2d9eefe..b2c9f4a51 100644 --- a/java/res/layout/recognition_status.xml +++ b/java/res/layout/recognition_status.xml @@ -16,83 +16,70 @@ ** See the License for the specific language governing permissions and ** limitations under the License. */ ---> - - -<LinearLayout - xmlns:android="http://schemas.android.com/apk/res/android" - android:orientation="vertical" - android:layout_height="wrap_content" - android:layout_width="wrap_content" - android:background="@android:color/black" - android:paddingBottom="0dip" - android:paddingLeft="0dip" - android:paddingRight="0dip" -> - - <LinearLayout - xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/main_image" - android:orientation="vertical" - android:background="@drawable/voice_ime_background" - android:scaleType="fitXY" - android:layout_width="match_parent" - android:layout_height="180dip" - android:paddingBottom="2dip" - android:paddingTop="2dip" - > - - <TextView android:id="@+id/text" - android:text="@string/voice_initializing" +--> +<RelativeLayout + xmlns:android="http://schemas.android.com/apk/res/android" android:layout_height="wrap_content" - android:layout_width="wrap_content" - android:layout_marginTop="15dip" - android:textSize="28sp" - android:textColor="#ffffff" - android:layout_gravity="center_horizontal" - /> - - <ImageView android:id="@+id/image" - android:layout_height="wrap_content" - android:layout_width="wrap_content" - android:layout_marginTop="20dip" - android:layout_gravity="center_horizontal" - android:src="@drawable/mic_slash_holo" - /> - - <ProgressBar android:id="@+id/progress" - android:layout_height="60dip" - android:layout_width="60dip" - android:layout_gravity="center" - android:visibility="gone" - android:indeterminate="true" - android:indeterminateOnly="false" - /> - - - - </LinearLayout> - - <LinearLayout android:id="@+id/button" - android:orientation="vertical" - android:background="@drawable/ok_cancel" - android:scaleType="fitXY" android:layout_width="match_parent" - android:layout_height="42dip" - android:paddingLeft="1dip" - android:paddingRight="1dip" - > - - <TextView android:id="@+id/button_text" - android:text="@string/cancel" - android:layout_height="wrap_content" - android:layout_width="wrap_content" - android:layout_marginTop="7dip" - android:textSize="19sp" - android:textColor="#ffffff" - android:layout_gravity="center_horizontal" - /> + android:background="@drawable/background_voice"> + <LinearLayout + xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/popup_layout" + android:orientation="vertical" + android:layout_height="0dip" + android:layout_width="500dip" + android:layout_centerInParent="true" + android:background="@drawable/vs_dialog_red"> + <TextView + android:id="@+id/text" + android:text="@string/voice_error" + android:layout_height="wrap_content" + android:layout_width="wrap_content" + android:singleLine="true" + android:layout_marginTop="10dip" + android:textSize="28sp" + android:textColor="#ffffff" + android:layout_gravity="center" + android:visibility="invisible"/> + <RelativeLayout + android:layout_height="0dip" + android:layout_width="match_parent" + android:layout_weight="1.0"> + <com.android.inputmethod.voice.SoundIndicator + android:id="@+id/sound_indicator" + android:src="@drawable/mic_full" + android:background="@drawable/mic_base" + android:adjustViewBounds="true" + android:layout_height="wrap_content" + android:layout_width="wrap_content" + android:layout_centerInParent="true" + android:visibility="gone"/> + <ImageView + android:id="@+id/image" + android:src="@drawable/mic_slash" + android:layout_height="wrap_content" + android:layout_width="wrap_content" + android:layout_centerInParent="true" + android:visibility="visible"/> + <ProgressBar + android:id="@+id/progress" + android:indeterminate="true" + android:indeterminateOnly="false" + android:layout_height="60dip" + android:layout_width="60dip" + android:layout_centerInParent="true" + android:visibility="gone"/> + </RelativeLayout> + <Button + android:id="@+id/button" + android:layout_width="match_parent" + android:layout_height="54dip" + android:singleLine="true" + android:focusable="true" + android:text="@string/cancel" + android:layout_gravity="center_horizontal" + android:background="@drawable/btn_center" + android:textColor="#ffffff" + android:textSize="19sp" /> </LinearLayout> - -</LinearLayout> - +</RelativeLayout> diff --git a/java/res/values-xlarge/config.xml b/java/res/values-xlarge/config.xml index 56b9a166f..004b39b92 100644 --- a/java/res/values-xlarge/config.xml +++ b/java/res/values-xlarge/config.xml @@ -22,12 +22,19 @@ <bool name="config_enable_show_settings_key_option">false</bool> <bool name="config_enable_show_subtype_settings">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_quick_fixes_option">false</bool> + <bool name="config_enable_bigram_suggestions_option">false</bool> <bool name="config_candidate_highlight_font_color_enabled">false</bool> <bool name="config_swipe_down_dismiss_keyboard_enabled">false</bool> <bool name="config_sliding_key_input_enabled">false</bool> <bool name="config_digit_popup_characters_enabled">false</bool> <!-- Whether or not Popup on key press is enabled by default --> <bool name="config_default_popup_preview">false</bool> + <bool name="config_use_spacebar_language_switcher">false</bool> + <!-- The language is never displayed if == 0, always displayed if < 0 --> + <integer name="config_delay_before_fadeout_language_on_spacebar">1200</integer> <!-- This configuration is the index of the array {@link KeyboardSwitcher.KEYBOARD_THEMES}. --> <string name="config_default_keyboard_theme_id" translatable="false">5</string> <string name="config_text_size_of_language_on_spacebar" translatable="false">medium</string> diff --git a/java/res/values-xlarge/donottranslate.xml b/java/res/values-xlarge/donottranslate.xml index 6f4e9b1f0..672dea589 100644 --- a/java/res/values-xlarge/donottranslate.xml +++ b/java/res/values-xlarge/donottranslate.xml @@ -19,5 +19,5 @@ --> <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <!-- Default value of the visibility of the suggestion strip --> - <string name="prefs_suggestion_visibility_default_value" translatable="false">1</string> + <string name="prefs_suggestion_visibility_default_value" translatable="false">2</string> </resources> diff --git a/java/res/values/config.xml b/java/res/values/config.xml index 63af9a9ba..6a1b27a05 100644 --- a/java/res/values/config.xml +++ b/java/res/values/config.xml @@ -25,12 +25,25 @@ <bool name="config_enable_show_settings_key_option">true</bool> <bool name="config_enable_show_subtype_settings">true</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">true</bool> + <bool name="config_enable_quick_fixes_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_candidate_highlight_font_color_enabled">true</bool> <bool name="config_swipe_down_dismiss_keyboard_enabled">true</bool> <bool name="config_sliding_key_input_enabled">true</bool> <bool name="config_digit_popup_characters_enabled">true</bool> <!-- Whether or not Popup on key press is enabled by default --> <bool name="config_default_popup_preview">true</bool> + <!-- Default values for whether quick fixes and bigram suggestions are activated --> + <bool name="config_default_quick_fixes">true</bool> + <bool name="config_default_bigram_suggestions">true</bool> + <bool name="config_use_spacebar_language_switcher">true</bool> + <!-- The language is never displayed if == 0, always displayed if < 0 --> + <integer name="config_delay_before_fadeout_language_on_spacebar">-1</integer> + <integer name="config_duration_of_fadeout_language_on_spacebar">50</integer> + <integer name="config_final_fadeout_percentage_of_language_on_spacebar">15</integer> <integer name="config_delay_before_preview">0</integer> <integer name="config_delay_after_preview">10</integer> <integer name="config_preview_fadein_anim_time">0</integer> diff --git a/java/res/values/donottranslate.xml b/java/res/values/donottranslate.xml index 8dc212279..6a1069e99 100644 --- a/java/res/values/donottranslate.xml +++ b/java/res/values/donottranslate.xml @@ -138,4 +138,14 @@ <item>4</item> <item>5</item> </string-array> + + <!-- Subtype locale name exceptions --> + <string-array name="subtype_locale_exception_keys"> + <item>en_US</item> + <item>en_GB</item> + </string-array> + <string-array name="subtype_locale_exception_values"> + <item>English (US)</item> + <item>English (UK)</item> + </string-array> </resources> diff --git a/java/res/values/strings.xml b/java/res/values/strings.xml index b191e7fa0..7b8087a06 100644 --- a/java/res/values/strings.xml +++ b/java/res/values/strings.xml @@ -22,7 +22,7 @@ <string name="english_ime_name">Android keyboard</string> <!-- Title for Latin keyboard settings activity / dialog --> <string name="english_ime_settings">Android keyboard settings</string> - <!-- Title for Latin keyboard input options dialog --> + <!-- Title for Latin keyboard input options dialog [CHAR LIMIT=25] --> <string name="english_ime_input_options">Input options</string> <!-- Option to provide vibrate/haptic feedback on keypress --> @@ -34,8 +34,11 @@ <!-- Option to pop up the character with a larger font above soft keyboard --> <string name="popup_on_keypress">Popup on keypress</string> + <!-- Category title for general settings for Android keyboard --> + <string name="general_category">General</string> + <!-- Category title for text prediction --> - <string name="prediction_category">Word suggestion settings</string> + <string name="prediction_category">Text correction</string> <!-- Option to enable auto capitalization of sentences --> <string name="auto_cap">Auto-capitalization</string> @@ -46,7 +49,7 @@ <string name="quick_fixes_summary">Corrects commonly typed mistakes</string> <!-- Option to enable showing suggestions --> - <string name="prefs_show_suggestions">Show suggestions</string> + <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> @@ -111,15 +114,15 @@ <string name="voice_warning_locale_not_supported">Voice input is not currently supported for your language, but does work in English.</string> <!-- Message of the warning dialog that shows when a user initiates voice input for - the first time, or turns it on in settings. --> + the first time, or turns it on in settings. [CHAR LIMIT=200] --> <string name="voice_warning_may_not_understand">Voice input uses Google\'s speech recognition. <a href="http://m.google.com/privacy">The Mobile Privacy Policy</a> applies.</string> <!-- An additional part of the warning dialog for voice input that only shows when the user - actually initiates voice input, rather than just turning it on in settings. --> + actually initiates voice input, rather than just turning it on in settings. [CHAR LIMIT=200] --> <string name="voice_warning_how_to_turn_off">To turn off voice input, go to input method settings.</string> <!-- Message to show when user enables the voice input settings (which says - "Press the microphone button"). --> + "Press the microphone button"). [CHAR LIMIT=100] --> <string name="voice_hint_dialog_message">To use voice input, press the microphone button.</string> <!-- Short message to tell the user the system is ready for them to speak. --> diff --git a/java/res/xml-xlarge/kbd_key_styles.xml b/java/res/xml-xlarge/kbd_key_styles.xml index c6b785896..26659a2ad 100644 --- a/java/res/xml-xlarge/kbd_key_styles.xml +++ b/java/res/xml-xlarge/kbd_key_styles.xml @@ -57,7 +57,6 @@ <key-style latin:styleName="nonSpecialBackgroundSpaceKeyStyle" latin:code="@integer/key_space" - latin:keyIcon="@drawable/sym_keyboard_space_holo" latin:iconPreview="@drawable/sym_keyboard_feedback_space" /> <key-style latin:styleName="smileyKeyStyle" @@ -67,6 +66,12 @@ latin:popupCharacters="@string/alternates_for_smiley" latin:maxPopupKeyboardColumn="5" /> <key-style + latin:styleName="settingsKeyStyle" + latin:code="@integer/key_settings" + latin:keyIcon="@drawable/sym_keyboard_settings_holo" + latin:iconPreview="@drawable/sym_keyboard_feedback_settings" + latin:parentStyle="functionalKeyStyle" /> + <key-style latin:styleName="micKeyStyle" latin:code="@integer/key_voice" latin:keyIcon="@drawable/sym_keyboard_voice_holo" @@ -102,12 +107,10 @@ <key-style latin:styleName="spaceKeyStyle" latin:code="@integer/key_space" - latin:keyIcon="@drawable/sym_bkeyboard_space" latin:iconPreview="@drawable/sym_keyboard_feedback_space" /> <key-style latin:styleName="nonSpecialBackgroundSpaceKeyStyle" latin:code="@integer/key_space" - latin:keyIcon="@drawable/sym_bkeyboard_space" latin:iconPreview="@drawable/sym_keyboard_feedback_space" /> <key-style latin:styleName="smileyKeyStyle" @@ -117,6 +120,12 @@ latin:popupCharacters="@string/alternates_for_smiley" latin:maxPopupKeyboardColumn="5" /> <key-style + latin:styleName="settingsKeyStyle" + latin:code="@integer/key_settings" + latin:keyIcon="@drawable/sym_bkeyboard_settings" + latin:iconPreview="@drawable/sym_keyboard_feedback_settings" + latin:parentStyle="functionalKeyStyle" /> + <key-style latin:styleName="micKeyStyle" latin:code="@integer/key_voice" latin:keyIcon="@drawable/sym_bkeyboard_mic" diff --git a/java/res/xml-xlarge/kbd_number.xml b/java/res/xml-xlarge/kbd_number.xml index c2cbb31c4..875548ba7 100644 --- a/java/res/xml-xlarge/kbd_number.xml +++ b/java/res/xml-xlarge/kbd_number.xml @@ -120,7 +120,10 @@ <!-- There is an empty area bellow the "More" key and left of the "space" key. To ignore the touch event on the area, "space" is intentionally not marked as a left edge key. --> <Spacer - latin:horizontalGap="16.406%p" /> + latin:horizontalGap="8.362%p" /> + <Key + latin:keyStyle="settingsKeyStyle" + latin:keyWidth="8.042%p" /> <Key latin:keyStyle="nonSpecialBackgroundSpaceKeyStyle" latin:keyWidth="24.127%p" /> diff --git a/java/res/xml-xlarge/kbd_numkey_styles.xml b/java/res/xml-xlarge/kbd_numkey_styles.xml index 3c62cb017..e27db94c7 100644 --- a/java/res/xml-xlarge/kbd_numkey_styles.xml +++ b/java/res/xml-xlarge/kbd_numkey_styles.xml @@ -81,7 +81,6 @@ <key-style latin:styleName="numSpaceKeyStyle" latin:code="@integer/key_space" - latin:keyIcon="@drawable/sym_keyboard_space_holo" latin:iconPreview="@drawable/sym_keyboard_feedback_space" /> </case> <case @@ -143,7 +142,6 @@ <key-style latin:styleName="numSpaceKeyStyle" latin:code="@integer/key_space" - latin:keyIcon="@drawable/sym_bkeyboard_space" latin:iconPreview="@drawable/sym_keyboard_feedback_space" /> </case> </switch> diff --git a/java/res/xml-xlarge/kbd_phone.xml b/java/res/xml-xlarge/kbd_phone.xml index c320ebbbc..b9444ad50 100644 --- a/java/res/xml-xlarge/kbd_phone.xml +++ b/java/res/xml-xlarge/kbd_phone.xml @@ -128,10 +128,13 @@ <!-- There is an empty area bellow the "More" key and left of the "space" key. To ignore the touch event on the area, "space" is intentionally not marked as a left edge key. --> <Spacer - latin:horizontalGap="20.427%p" /> + latin:horizontalGap="12.340%p" /> + <Key + latin:keyStyle="settingsKeyStyle" + latin:keyWidth="8.042%p" /> <Key latin:keyStyle="nonSpecialBackgroundSpaceKeyStyle" - latin:keyWidth="16.085%p" /> + latin:keyWidth="16.084%p" /> <Spacer latin:horizontalGap="8.479%p" /> <Key diff --git a/java/res/xml-xlarge/kbd_phone_symbols.xml b/java/res/xml-xlarge/kbd_phone_symbols.xml index da15b5ad0..690bcde0c 100644 --- a/java/res/xml-xlarge/kbd_phone_symbols.xml +++ b/java/res/xml-xlarge/kbd_phone_symbols.xml @@ -140,7 +140,10 @@ <!-- There is an empty area bellow the "More" key and left of the "space" key. To ignore the touch event on the area, "space" is intentionally not marked as a left edge key. --> <Spacer - latin:horizontalGap="16.406%p" /> + latin:horizontalGap="8.362%p" /> + <Key + latin:keyStyle="settingsKeyStyle" + latin:keyWidth="8.042%p" /> <Key latin:keyStyle="nonSpecialBackgroundSpaceKeyStyle" latin:keyWidth="24.127%p" /> diff --git a/java/res/xml-xlarge/kbd_qwerty_row4.xml b/java/res/xml-xlarge/kbd_qwerty_row4.xml index 98acfc162..9d0fd81c7 100644 --- a/java/res/xml-xlarge/kbd_qwerty_row4.xml +++ b/java/res/xml-xlarge/kbd_qwerty_row4.xml @@ -26,7 +26,9 @@ latin:keyWidth="8.042%p" > <Spacer - latin:horizontalGap="16.404%p" /> + latin:horizontalGap="8.362%p" /> + <Key + latin:keyStyle="settingsKeyStyle" /> <switch> <case latin:mode="email" diff --git a/java/res/xml-xlarge/kbd_symbols.xml b/java/res/xml-xlarge/kbd_symbols.xml index d804f7909..e56cc92d2 100644 --- a/java/res/xml-xlarge/kbd_symbols.xml +++ b/java/res/xml-xlarge/kbd_symbols.xml @@ -149,7 +149,9 @@ latin:keyWidth="8.042%p" > <Spacer - latin:horizontalGap="16.404%p" /> + latin:horizontalGap="8.362%p" /> + <Key + latin:keyStyle="settingsKeyStyle" /> <Key latin:keyLabel="/" /> <Key diff --git a/java/res/xml-xlarge/kbd_symbols_shift.xml b/java/res/xml-xlarge/kbd_symbols_shift.xml index db33aaaca..f7cf24a3f 100644 --- a/java/res/xml-xlarge/kbd_symbols_shift.xml +++ b/java/res/xml-xlarge/kbd_symbols_shift.xml @@ -135,7 +135,9 @@ latin:keyWidth="8.042%p" > <Spacer - latin:horizontalGap="32.488%p" /> + latin:horizontalGap="24.446%p" /> + <Key + latin:keyStyle="settingsKeyStyle" /> <Key latin:keyStyle="spaceKeyStyle" latin:keyWidth="37.454%p" /> diff --git a/java/res/xml/prefs.xml b/java/res/xml/prefs.xml index 85b6d4767..e882320a3 100644 --- a/java/res/xml/prefs.xml +++ b/java/res/xml/prefs.xml @@ -4,9 +4,9 @@ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - + http://www.apache.org/licenses/LICENSE-2.0 - + Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -18,62 +18,68 @@ android:title="@string/english_ime_settings" android:key="english_ime_settings"> - <CheckBoxPreference - android:key="vibrate_on" - android:title="@string/vibrate_on_keypress" - android:persistent="true" - /> + <PreferenceCategory + android:title="@string/general_category" + android:key="general_settings"> - <CheckBoxPreference - android:key="sound_on" - android:title="@string/sound_on_keypress" - android:persistent="true" - /> + <CheckBoxPreference + android:key="auto_cap" + android:title="@string/auto_cap" + android:persistent="true" + android:defaultValue="true" + /> - <CheckBoxPreference - android:key="popup_on" - android:title="@string/popup_on_keypress" - android:persistent="true" - android:defaultValue="@bool/config_default_popup_preview" - /> + <CheckBoxPreference + android:key="vibrate_on" + android:title="@string/vibrate_on_keypress" + android:persistent="true" + /> - <CheckBoxPreference - android:key="recorrection_enabled" - android:title="@string/prefs_enable_recorrection" - android:summary="@string/prefs_enable_recorrection_summary" - android:persistent="true" - android:defaultValue="@bool/default_recorrection_enabled" - /> + <CheckBoxPreference + android:key="sound_on" + android:title="@string/sound_on_keypress" + android:persistent="true" + /> - <CheckBoxPreference - android:key="auto_cap" - android:title="@string/auto_cap" - android:persistent="true" - android:defaultValue="true" - /> + <CheckBoxPreference + android:key="popup_on" + android:title="@string/popup_on_keypress" + android:persistent="true" + android:defaultValue="@bool/config_default_popup_preview" + /> - <ListPreference - android:key="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" - /> + <CheckBoxPreference + android:key="recorrection_enabled" + android:title="@string/prefs_enable_recorrection" + android:summary="@string/prefs_enable_recorrection_summary" + android:persistent="true" + android:defaultValue="@bool/default_recorrection_enabled" + /> - <ListPreference - android:key="voice_mode" - android:title="@string/voice_input" - android:persistent="true" - android:entryValues="@array/voice_input_modes_values" - android:entries="@array/voice_input_modes" - android:defaultValue="@string/voice_mode_main" - /> + <ListPreference + android:key="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" + /> - <PreferenceScreen - android:key="subtype_settings" - android:title="@string/language_selection_title" - android:summary="@string/language_selection_summary" /> + <ListPreference + android:key="voice_mode" + android:title="@string/voice_input" + android:persistent="true" + android:entryValues="@array/voice_input_modes_values" + android:entries="@array/voice_input_modes" + android:defaultValue="@string/voice_mode_main" + /> + + <PreferenceScreen + android:key="subtype_settings" + android:title="@string/language_selection_title" + android:summary="@string/language_selection_summary" /> + + </PreferenceCategory> <PreferenceCategory android:title="@string/prediction_category" @@ -88,16 +94,6 @@ /> <ListPreference - android:key="show_suggestions_setting" - android:summary="@string/prefs_show_suggestions_summary" - android:title="@string/prefs_show_suggestions" - android:persistent="true" - android:entryValues="@array/prefs_suggestion_visibility_values" - android:entries="@array/prefs_suggestion_visibilities" - android:defaultValue="@string/prefs_suggestion_visibility_default_value" - /> - - <ListPreference android:key="auto_correction_threshold" android:title="@string/auto_correction" android:summary="@string/auto_correction_summary" @@ -107,6 +103,16 @@ android:defaultValue="@string/auto_correction_threshold_mode_index_modest" /> + <ListPreference + android:key="show_suggestions_setting" + android:summary="@string/prefs_show_suggestions_summary" + android:title="@string/prefs_show_suggestions" + android:persistent="true" + android:entryValues="@array/prefs_suggestion_visibility_values" + android:entries="@array/prefs_suggestion_visibilities" + android:defaultValue="@string/prefs_suggestion_visibility_default_value" + /> + <CheckBoxPreference android:key="bigram_suggestion" android:title="@string/bigram_suggestion" |
