diff options
Diffstat (limited to 'java/res')
| -rw-r--r-- | java/res/raw/main_ru.dict | bin | 2228255 -> 2228286 bytes | |||
| -rw-r--r-- | java/res/values/attrs.xml | 68 | ||||
| -rw-r--r-- | java/res/values/config.xml | 1 | ||||
| -rw-r--r-- | java/res/values/dimens.xml | 2 | ||||
| -rw-r--r-- | java/res/values/donottranslate.xml | 13 | ||||
| -rw-r--r-- | java/res/values/strings.xml | 14 | ||||
| -rw-r--r-- | java/res/values/styles.xml | 12 | ||||
| -rw-r--r-- | java/res/xml/prefs.xml | 12 | ||||
| -rw-r--r-- | java/res/xml/prefs_for_debug.xml | 16 |
9 files changed, 71 insertions, 67 deletions
diff --git a/java/res/raw/main_ru.dict b/java/res/raw/main_ru.dict Binary files differindex f858da408..9f3884da8 100644 --- a/java/res/raw/main_ru.dict +++ b/java/res/raw/main_ru.dict diff --git a/java/res/values/attrs.xml b/java/res/values/attrs.xml index 2f1a209fc..e10bdb16d 100644 --- a/java/res/values/attrs.xml +++ b/java/res/values/attrs.xml @@ -51,46 +51,13 @@ <!-- Blur radius of key text shadow. --> <attr name="keyTextShadowRadius" format="float" /> - <!-- Layout resource for key press feedback.--> - <attr name="keyPreviewLayout" format="reference" /> <!-- Key preview background states --> <attr name="state_left_edge" format="boolean" /> <attr name="state_right_edge" format="boolean" /> <attr name="state_has_morekeys" format="boolean" /> - <!-- Vertical offset of the key press feedback from the key. --> - <attr name="keyPreviewOffset" format="dimension" /> - <!-- Height of the key press feedback popup. --> - <attr name="keyPreviewHeight" format="dimension" /> - <!-- Delay after key releasing and key press feedback dismissing in millisecond --> - <attr name="keyPreviewLingerTimeout" format="integer" /> <!-- Amount to offset the touch Y coordinate by, for bias correction. --> <attr name="verticalCorrection" format="dimension" /> - - <!-- Layout resource for more keys panel --> - <attr name="moreKeysLayout" format="reference" /> - - <attr name="backgroundDimAlpha" format="integer" /> - - <!-- Attributes for PreviewPlacerView --> - <attr name="gestureFloatingPreviewTextSize" format="dimension" /> - <attr name="gestureFloatingPreviewTextColor" format="color" /> - <attr name="gestureFloatingPreviewTextOffset" format="dimension" /> - <attr name="gestureFloatingPreviewColor" format="color" /> - <attr name="gestureFloatingPreviewHorizontalPadding" format="dimension" /> - <attr name="gestureFloatingPreviewVerticalPadding" format="dimension" /> - <attr name="gestureFloatingPreviewRoundRadius" format="dimension" /> - <!-- Delay after gesture input and gesture floating preview text dismissing in millisecond --> - <attr name="gestureFloatingPreviewTextLingerTimeout" format="integer" /> - <!-- Delay after gesture trail starts fading out in millisecond. --> - <attr name="gesturePreviewTrailFadeoutStartDelay" format="integer" /> - <!-- Duration while gesture preview trail is fading out in millisecond. --> - <attr name="gesturePreviewTrailFadeoutDuration" format="integer" /> - <!-- Interval of updating gesture preview trail in millisecond. --> - <attr name="gesturePreviewTrailUpdateInterval" format="integer" /> - <attr name="gesturePreviewTrailColor" format="color" /> - <attr name="gesturePreviewTrailStartWidth" format="dimension" /> - <attr name="gesturePreviewTrailEndWidth" format="dimension" /> </declare-styleable> <declare-styleable name="MainKeyboardView"> @@ -126,8 +93,38 @@ <attr name="longPressShiftKeyTimeout" format="integer" /> <!-- Ignore special key timeout while typing in millisecond. --> <attr name="ignoreAltCodeKeyTimeout" format="integer" /> + <!-- Layout resource for key press feedback.--> + <attr name="keyPreviewLayout" format="reference" /> + <!-- Vertical offset of the key press feedback from the key. --> + <attr name="keyPreviewOffset" format="dimension" /> + <!-- Height of the key press feedback popup. --> + <attr name="keyPreviewHeight" format="dimension" /> + <!-- Delay after key releasing and key press feedback dismissing in millisecond --> + <attr name="keyPreviewLingerTimeout" format="integer" /> + <!-- Layout resource for more keys keyboard --> + <attr name="moreKeysKeyboardLayout" format="reference" /> + <attr name="backgroundDimAlpha" format="integer" /> <!-- More keys keyboard will shown at touched point. --> <attr name="showMoreKeysKeyboardAtTouchedPoint" format="boolean" /> + <!-- Delay after gesture trail starts fading out in millisecond. --> + <attr name="gesturePreviewTrailFadeoutStartDelay" format="integer" /> + <!-- Duration while gesture preview trail is fading out in millisecond. --> + <attr name="gesturePreviewTrailFadeoutDuration" format="integer" /> + <!-- Interval of updating gesture preview trail in millisecond. --> + <attr name="gesturePreviewTrailUpdateInterval" format="integer" /> + <attr name="gesturePreviewTrailColor" format="color" /> + <attr name="gesturePreviewTrailStartWidth" format="dimension" /> + <attr name="gesturePreviewTrailEndWidth" format="dimension" /> + <!-- Delay after gesture input and gesture floating preview text dismissing in millisecond --> + <attr name="gestureFloatingPreviewTextLingerTimeout" format="integer" /> + <!-- Attributes for GestureFloatingPreviewText --> + <attr name="gestureFloatingPreviewTextSize" format="dimension" /> + <attr name="gestureFloatingPreviewTextColor" format="color" /> + <attr name="gestureFloatingPreviewTextOffset" format="dimension" /> + <attr name="gestureFloatingPreviewColor" format="color" /> + <attr name="gestureFloatingPreviewHorizontalPadding" format="dimension" /> + <attr name="gestureFloatingPreviewVerticalPadding" format="dimension" /> + <attr name="gestureFloatingPreviewRoundRadius" format="dimension" /> <!-- Static threshold for gesture after fast typing (msec) --> <attr name="gestureStaticTimeThresholdAfterFastTyping" format="integer" /> <!-- Static threshold for starting gesture detection (keyWidth%/sec) --> @@ -434,4 +431,9 @@ <!-- Enable proximity characters correction. Disabled by default. --> <attr name="enableProximityCharsCorrection" format="boolean" /> </declare-styleable> + + <declare-styleable name="SeekBarDialogPreference"> + <attr name="valueFormatText" format="reference" /> + <attr name="maxValue" format="integer" /> + </declare-styleable> </resources> diff --git a/java/res/values/config.xml b/java/res/values/config.xml index dca370a9a..503e92322 100644 --- a/java/res/values/config.xml +++ b/java/res/values/config.xml @@ -33,6 +33,7 @@ <bool name="config_default_next_word_prediction">true</bool> <bool name="config_default_sound_enabled">false</bool> <bool name="config_default_vibration_enabled">true</bool> + <integer name="config_max_vibration_duration">250</integer> <!-- milliseconds --> <integer name="config_delay_update_suggestions">100</integer> <integer name="config_delay_update_old_suggestions">300</integer> <integer name="config_delay_update_shift_state">100</integer> diff --git a/java/res/values/dimens.xml b/java/res/values/dimens.xml index c7d993698..eb0934c63 100644 --- a/java/res/values/dimens.xml +++ b/java/res/values/dimens.xml @@ -100,7 +100,7 @@ <fraction name="center_suggestion_percentile">36%</fraction> <!-- Gesture preview trail parameters --> - <dimen name="gesture_preview_trail_start_width">12.6dp</dimen> + <dimen name="gesture_preview_trail_start_width">10.0dp</dimen> <dimen name="gesture_preview_trail_end_width">2.5dp</dimen> <!-- Gesture floating preview text parameters --> <dimen name="gesture_floating_preview_text_size">24dp</dimen> diff --git a/java/res/values/donottranslate.xml b/java/res/values/donottranslate.xml index 70ace776f..36412b48f 100644 --- a/java/res/values/donottranslate.xml +++ b/java/res/values/donottranslate.xml @@ -29,19 +29,6 @@ <string name="symbols_word_separators">"	 \n"()[]{}*&<>+=|.,;:!?/_\"</string> <!-- Word connectors --> <string name="symbols_word_connectors">\'-</string> - <!-- Symbol characters list that should switch back to the main layout --> - <!-- U+2018: "‘" LEFT SINGLE QUOTATION MARK - U+2019: "’" RIGHT SINGLE QUOTATION MARK - U+201A: "‚" SINGLE LOW-9 QUOTATION MARK - U+201B: "‛" SINGLE HIGH-REVERSED-9 QUOTATION MARK - U+201C: "“" LEFT DOUBLE QUOTATION MARK - U+201D: "”" RIGHT DOUBLE QUOTATION MARK - U+201E: "„" DOUBLE LOW-9 QUOTATION MARK - U+201F: "‟" DOUBLE HIGH-REVERSED-9 QUOTATION MARK - U+00AB: "«" LEFT-POINTING DOUBLE ANGLE QUOTATION MARK - U+00BB: "»" RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK --> - <!-- <string name="layout_switch_back_symbols">\"\'‘’‚‛“”„‟«»</string> --> - <string name="layout_switch_back_symbols"></string> <!-- Always show the suggestion strip --> <string name="prefs_suggestion_visibility_show_value">0</string> diff --git a/java/res/values/strings.xml b/java/res/values/strings.xml index f9d51ff69..54ff23b1a 100644 --- a/java/res/values/strings.xml +++ b/java/res/values/strings.xml @@ -76,8 +76,8 @@ <!-- Description for delay for dismissing a popup on screen: default value of the delay [CHAR LIMIT=15] --> <string name="key_preview_popup_dismiss_default_delay">Default</string> - <!-- Units abbreviation for the keypress vibration duration (milliseconds) [CHAR LIMIT=10] --> - <string name="settings_keypress_vibration_duration"><xliff:g id="milliseconds">%s</xliff:g>ms</string> + <!-- Units abbreviation for the duration (milliseconds) [CHAR LIMIT=10] --> + <string name="abbreviation_unit_milliseconds"><xliff:g id="milliseconds">%s</xliff:g>ms</string> <!-- Option name for enabling or disabling the use of names of people in Contacts for suggestion and correction [CHAR LIMIT=25] --> <string name="use_contacts_dict">Suggest Contact names</string> @@ -375,6 +375,16 @@ <string name="prefs_keypress_vibration_duration_settings">Keypress vibration duration settings</string> <!-- Title of the settings for keypress sound volume --> <string name="prefs_keypress_sound_volume_settings">Keypress sound volume settings</string> + <!-- Title of the settings for reading an external dictionary file --> + <string name="prefs_read_external_dictionary">Read external dictionary file</string> + <!-- Message to show when there are no files to install as an external dictionary [CHAR LIMIT=100] --> + <string name="read_external_dictionary_no_files_message">No dictionary files in the Downloads folder</string> + <!-- Title of the dialog that selects a file to install as an external dictionary [CHAR LIMIT=50] --> + <string name="read_external_dictionary_multiple_files_title">Select a dictionary file to install</string> + <!-- Title of the confirmation dialog to install a file as an external dictionary [CHAR LIMIT=50] --> + <string name="read_external_dictionary_confirm_install_message">Really install this file for <xliff:g id="locale_name">%s</xliff:g>?</string> + <!-- Title for an error dialog that contains the details of the error in the body [CHAR LIMIT=80] --> + <string name="error">There was an error</string> <!-- Title of the button to revert to the default value of the device in the settings dialog [CHAR LIMIT=15] --> <string name="button_default">Default</string> diff --git a/java/res/values/styles.xml b/java/res/values/styles.xml index 0bcf943e4..c398b5924 100644 --- a/java/res/values/styles.xml +++ b/java/res/values/styles.xml @@ -53,13 +53,8 @@ <item name="keyHintLetterPadding">@dimen/key_hint_letter_padding</item> <item name="keyPopupHintLetterPadding">@dimen/key_popup_hint_letter_padding</item> <item name="keyShiftedLetterHintPadding">@dimen/key_uppercase_letter_padding</item> - <item name="keyPreviewLayout">@layout/key_preview</item> <item name="keyPreviewTextColor">@color/key_text_color_default</item> - <item name="keyPreviewOffset">@dimen/key_preview_offset</item> - <item name="keyPreviewHeight">@dimen/key_preview_height</item> <item name="keyPreviewTextRatio">@fraction/key_preview_text_ratio</item> - <item name="keyPreviewLingerTimeout">@integer/config_key_preview_linger_timeout</item> - <item name="moreKeysLayout">@layout/more_keys_keyboard</item> <item name="verticalCorrection">@dimen/keyboard_vertical_correction</item> <item name="keyTextShadowColor">@color/key_text_shadow_color_default</item> <item name="keyTextShadowRadius">2.75</item> @@ -71,7 +66,6 @@ <item name="gestureFloatingPreviewHorizontalPadding">@dimen/gesture_floating_preview_horizontal_padding</item> <item name="gestureFloatingPreviewVerticalPadding">@dimen/gesture_floating_preview_vertical_padding</item> <item name="gestureFloatingPreviewRoundRadius">@dimen/gesture_floating_preview_round_radius</item> - <item name="gestureFloatingPreviewTextLingerTimeout">@integer/config_gesture_floating_preview_text_linger_timeout</item> <item name="gesturePreviewTrailFadeoutStartDelay">@integer/config_gesture_preview_trail_fadeout_start_delay</item> <item name="gesturePreviewTrailFadeoutDuration">@integer/config_gesture_preview_trail_fadeout_duration</item> <item name="gesturePreviewTrailUpdateInterval">@integer/config_gesture_preview_trail_update_interval</item> @@ -89,12 +83,18 @@ <item name="longPressKeyTimeout">@integer/config_long_press_key_timeout</item> <item name="longPressShiftKeyTimeout">@integer/config_long_press_shift_key_timeout</item> <item name="ignoreAltCodeKeyTimeout">@integer/config_ignore_alt_code_key_timeout</item> + <item name="keyPreviewLayout">@layout/key_preview</item> + <item name="keyPreviewOffset">@dimen/key_preview_offset</item> + <item name="keyPreviewHeight">@dimen/key_preview_height</item> + <item name="keyPreviewLingerTimeout">@integer/config_key_preview_linger_timeout</item> + <item name="moreKeysKeyboardLayout">@layout/more_keys_keyboard</item> <item name="showMoreKeysKeyboardAtTouchedPoint">@bool/config_show_more_keys_keyboard_at_touched_point</item> <item name="languageOnSpacebarFinalAlpha">@integer/config_language_on_spacebar_final_alpha</item> <item name="languageOnSpacebarFadeoutAnimator">@anim/language_on_spacebar_fadeout</item> <item name="altCodeKeyWhileTypingFadeoutAnimator">@anim/alt_code_key_while_typing_fadeout</item> <item name="altCodeKeyWhileTypingFadeinAnimator">@anim/alt_code_key_while_typing_fadein</item> <!-- Common attributes of MainKeyboardView for gesture typing detection and recognition --> + <item name="gestureFloatingPreviewTextLingerTimeout">@integer/config_gesture_floating_preview_text_linger_timeout</item> <item name="gestureStaticTimeThresholdAfterFastTyping">@integer/config_gesture_static_time_threshold_after_fast_typing</item> <item name="gestureDetectFastMoveSpeedThreshold">@fraction/config_gesture_detect_fast_move_speed_threshold</item> <item name="gestureDynamicThresholdDecayDuration">@integer/config_gesture_dynamic_threshold_decay_duration</item> diff --git a/java/res/xml/prefs.xml b/java/res/xml/prefs.xml index 4ffbf14d5..cc1b52ba6 100644 --- a/java/res/xml/prefs.xml +++ b/java/res/xml/prefs.xml @@ -16,6 +16,7 @@ <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" android:title="@string/english_ime_settings" android:key="english_ime_settings"> <PreferenceCategory @@ -144,12 +145,15 @@ <ListPreference android:key="pref_key_preview_popup_dismiss_delay" android:title="@string/key_preview_popup_dismiss_delay" /> - <PreferenceScreen + <com.android.inputmethod.latin.SeekBarDialogPreference android:key="pref_vibration_duration_settings" - android:title="@string/prefs_keypress_vibration_duration_settings"/> - <PreferenceScreen + android:title="@string/prefs_keypress_vibration_duration_settings" + latin:valueFormatText="@string/abbreviation_unit_milliseconds" + latin:maxValue="@integer/config_max_vibration_duration" /> + <com.android.inputmethod.latin.SeekBarDialogPreference android:key="pref_keypress_sound_volume" - android:title="@string/prefs_keypress_sound_volume_settings" /> + android:title="@string/prefs_keypress_sound_volume_settings" + latin:maxValue="100" /> <!-- percent --> </PreferenceScreen> <PreferenceScreen android:key="debug_settings" diff --git a/java/res/xml/prefs_for_debug.xml b/java/res/xml/prefs_for_debug.xml index 605a02f07..8efd1c9e8 100644 --- a/java/res/xml/prefs_for_debug.xml +++ b/java/res/xml/prefs_for_debug.xml @@ -23,8 +23,7 @@ android:title="@string/prefs_enable_log" android:summary="@string/prefs_description_log" android:persistent="true" - android:defaultValue="false" - /> + android:defaultValue="false" /> <ListPreference android:key="pref_keyboard_layout_20110916" @@ -32,26 +31,27 @@ android:persistent="true" android:entryValues="@array/keyboard_layout_modes_values" android:entries="@array/keyboard_layout_modes" - android:defaultValue="@string/config_default_keyboard_theme_index" - /> + android:defaultValue="@string/config_default_keyboard_theme_index" /> <CheckBoxPreference android:key="debug_mode" android:title="@string/prefs_debug_mode" android:persistent="true" - android:defaultValue="false" - /> + android:defaultValue="false" /> <CheckBoxPreference android:key="force_non_distinct_multitouch" android:title="@string/prefs_force_non_distinct_multitouch" android:persistent="true" - android:defaultValue="false" - /> + android:defaultValue="false" /> <CheckBoxPreference android:key="usability_study_mode" android:title="@string/prefs_usability_study_mode" android:persistent="true" android:defaultValue="false" /> + + <PreferenceScreen + android:key="read_external_dictionary" + android:title="@string/prefs_read_external_dictionary" /> </PreferenceScreen> |