diff options
Diffstat (limited to 'java/res/values')
| -rw-r--r-- | java/res/values/attrs.xml | 28 | ||||
| -rw-r--r-- | java/res/values/colors.xml | 1 | ||||
| -rw-r--r-- | java/res/values/config.xml | 19 | ||||
| -rw-r--r-- | java/res/values/dimens.xml | 20 | ||||
| -rw-r--r-- | java/res/values/keyboard-heights.xml | 14 | ||||
| -rw-r--r-- | java/res/values/keypress-vibration-durations.xml | 31 | ||||
| -rw-r--r-- | java/res/values/keypress-volumes.xml | 16 | ||||
| -rw-r--r-- | java/res/values/phantom-sudden-move-event-device-list.xml | 6 | ||||
| -rw-r--r-- | java/res/values/setup-dimens.xml | 20 | ||||
| -rw-r--r-- | java/res/values/setup-styles-common.xml | 73 | ||||
| -rw-r--r-- | java/res/values/setup-styles.xml | 29 | ||||
| -rw-r--r-- | java/res/values/strings-appname.xml | 37 | ||||
| -rw-r--r-- | java/res/values/strings.xml | 102 | ||||
| -rw-r--r-- | java/res/values/styles.xml | 24 | ||||
| -rw-r--r-- | java/res/values/sudden-jumping-touch-event-device-list.xml | 8 |
15 files changed, 300 insertions, 128 deletions
diff --git a/java/res/values/attrs.xml b/java/res/values/attrs.xml index a71e7cc11..478a5c020 100644 --- a/java/res/values/attrs.xml +++ b/java/res/values/attrs.xml @@ -108,17 +108,25 @@ <attr name="backgroundDimAlpha" format="integer" /> <!-- More keys keyboard will shown at touched point. --> <attr name="showMoreKeysKeyboardAtTouchedPoint" format="boolean" /> + <!-- Minimum distance between gesture trail sampling points. --> + <attr name="gestureTrailMinSamplingDistance" format="dimension" /> + <!-- Maximum angular threshold between gesture trail interpolation segments in degree. --> + <attr name="gestureTrailMaxInterpolationAngularThreshold" format="integer" /> + <!-- Maximum distance threshold between gesture trail interpolation segments. --> + <attr name="gestureTrailMaxInterpolationDistanceThreshold" format="dimension" /> + <!-- Maximum number of gesture trail interpolation segments. --> + <attr name="gestureTrailMaxInterpolationSegments" 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" /> - <attr name="gesturePreviewTrailBodyRatio" format="integer" /> - <attr name="gesturePreviewTrailShadowRatio" format="integer" /> + <attr name="gestureTrailFadeoutStartDelay" format="integer" /> + <!-- Duration while gesture trail is fading out in millisecond. --> + <attr name="gestureTrailFadeoutDuration" format="integer" /> + <!-- Interval of updating gesture trail in millisecond. --> + <attr name="gestureTrailUpdateInterval" format="integer" /> + <attr name="gestureTrailColor" format="color" /> + <attr name="gestureTrailStartWidth" format="dimension" /> + <attr name="gestureTrailEndWidth" format="dimension" /> + <attr name="gestureTrailBodyRatio" format="integer" /> + <attr name="gestureTrailShadowRatio" format="integer" /> <!-- Delay after gesture input and gesture floating preview text dismissing in millisecond --> <attr name="gestureFloatingPreviewTextLingerTimeout" format="integer" /> <!-- Attributes for GestureFloatingPreviewText --> diff --git a/java/res/values/colors.xml b/java/res/values/colors.xml index 8a8049f1f..daa167c8a 100644 --- a/java/res/values/colors.xml +++ b/java/res/values/colors.xml @@ -58,4 +58,5 @@ <color name="setup_text_dark">#FF707070</color> <color name="setup_text_action">@android:color/holo_blue_light</color> <color name="setup_step_background">@android:color/background_light</color> + <color name="setup_welcome_video_margin_color">#FFCCCCCC</color> </resources> diff --git a/java/res/values/config.xml b/java/res/values/config.xml index 4e2936c5c..d3a21f2aa 100644 --- a/java/res/values/config.xml +++ b/java/res/values/config.xml @@ -19,8 +19,6 @@ --> <resources> - <!-- Device form factor. This value must be aligned with {@link KeyboardId.FORM_FACTOR_PHONE} --> - <integer name="config_device_form_factor">0</integer> <bool name="config_use_fullscreen_mode">false</bool> <bool name="config_enable_show_voice_key_option">true</bool> <bool name="config_enable_show_option_of_key_preview_popup">true</bool> @@ -33,7 +31,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_max_vibration_duration">100</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> @@ -75,10 +73,11 @@ <!-- Showing more keys keyboard, just above the touched point if true, aligned to the key if false --> <bool name="config_show_more_keys_keyboard_at_touched_point">false</bool> + <bool name="config_block_potentially_offensive">true</bool> <integer name="config_gesture_floating_preview_text_linger_timeout">200</integer> - <integer name="config_gesture_preview_trail_fadeout_start_delay">100</integer> - <integer name="config_gesture_preview_trail_fadeout_duration">800</integer> - <integer name="config_gesture_preview_trail_update_interval">20</integer> + <integer name="config_gesture_trail_fadeout_start_delay">100</integer> + <integer name="config_gesture_trail_fadeout_duration">800</integer> + <integer name="config_gesture_trail_update_interval">20</integer> <!-- Static threshold for gesture after fast typing (msec) --> <integer name="config_gesture_static_time_threshold_after_fast_typing">500</integer> <!-- Static threshold for starting gesture detection (keyWidth%/sec) --> @@ -111,15 +110,13 @@ <!-- Aggressive --> <item>0.067</item> <!-- Very Aggressive : Suggestion whose normalized score is greater than this value - will be subject to auto-correction. --> - <item>0</item> + will be subject to auto-correction. "floatNegativeInfinity" is a special marker + string for Float.NEGATIVE_INFINITY --> + <item>floatNegativeInfinity</item> </string-array> <!-- Threshold of the normalized score of the best suggestion for the spell checker to declare a word to be "recommended" --> <string name="spellchecker_recommended_threshold_value" translatable="false">0.11</string> - <!-- Threshold of the normalized score of any dictionary lookup to be offered as a suggestion - by the spell checker --> - <string name="spellchecker_suggestion_threshold_value" translatable="false">0.03</string> <!-- Screen metrics for logging. 0 = "mdpi phone screen" 1 = "hdpi phone screen" diff --git a/java/res/values/dimens.xml b/java/res/values/dimens.xml index e9b34aa12..98ae76cb1 100644 --- a/java/res/values/dimens.xml +++ b/java/res/values/dimens.xml @@ -100,14 +100,22 @@ <integer name="suggestions_count_in_strip">3</integer> <fraction name="center_suggestion_percentile">36%</fraction> - <!-- Gesture preview trail parameters --> - <dimen name="gesture_preview_trail_start_width">10.0dp</dimen> - <dimen name="gesture_preview_trail_end_width">2.5dp</dimen> + <!-- Gesture trail parameters --> + <!-- Minimum distance between gesture trail sampling points. --> + <dimen name="gesture_trail_min_sampling_distance">9.6dp</dimen> + <!-- Maximum angular threshold between gesture trails interpolation segments in degree. --> + <integer name="gesture_trail_max_interpolation_angular_threshold">15</integer> + <!-- Maximum distance threshold between gesture trails interpolation segments. --> + <dimen name="gesture_trail_max_interpolation_distance_threshold">16.0dp</dimen> + <!-- Maximum number of gesture trail interpolation segments. --> + <integer name="gesture_trail_max_interpolation_segments">6</integer> + <dimen name="gesture_trail_start_width">10.0dp</dimen> + <dimen name="gesture_trail_end_width">2.5dp</dimen> <!-- Percentages of gesture preview taril body and shadow, in proportion to the trail width. A negative value of the shadow ratio disables drawing shadow. --> <!-- TODO: May use the shadow to alleviate rugged trail drawing. --> - <integer name="gesture_preview_trail_body_ratio">100</integer> - <integer name="gesture_preview_trail_shadow_ratio">-1</integer> + <integer name="gesture_trail_body_ratio">100</integer> + <integer name="gesture_trail_shadow_ratio">-1</integer> <!-- Gesture floating preview text parameters --> <dimen name="gesture_floating_preview_text_size">24dp</dimen> <dimen name="gesture_floating_preview_text_offset">73dp</dimen> @@ -117,4 +125,6 @@ <!-- Inset used in Accessibility mode to avoid accidental key presses when a finger slides off the screen. --> <dimen name="accessibility_edge_slop">8dp</dimen> + + <integer name="user_dictionary_max_word_length" translatable="false">48</integer> </resources> diff --git a/java/res/values/keyboard-heights.xml b/java/res/values/keyboard-heights.xml index 418d3e5b6..c651a89b3 100644 --- a/java/res/values/keyboard-heights.xml +++ b/java/res/values/keyboard-heights.xml @@ -19,21 +19,21 @@ --> <resources> - <!-- Build.HARDWARE,keyboard_height_in_dp --> + <!-- Build condition,keyboard_height_in_dp --> <string-array name="keyboard_heights" translatable="false"> <!-- Preferable keyboard height in absolute scale: 1.285in --> <!-- Droid --> - <item>sholes,227.0167</item> + <item>HARDWARE=sholes,227.0167</item> <!-- Nexus One --> - <item>mahimahi,217.5932</item> + <item>HARDWARE=mahimahi,217.5932</item> <!-- Nexus S --> - <item>herring,200.8554</item> + <item>HARDWARE=herring,200.8554</item> <!-- Galaxy Nexus --> - <item>tuna,202.5869</item> + <item>HARDWARE=tuna,202.5869</item> <!-- Preferable keyboard height in absolute scale: 48.0mm --> <!-- Xoom --> - <item>stingray,283.1337</item> + <item>HARDWARE=stingray,283.1337</item> <!-- Default value for unknown device: empty string --> - <item>DEFAULT,</item> + <item>,</item> </string-array> </resources> diff --git a/java/res/values/keypress-vibration-durations.xml b/java/res/values/keypress-vibration-durations.xml index 10400be83..9ce5051d2 100644 --- a/java/res/values/keypress-vibration-durations.xml +++ b/java/res/values/keypress-vibration-durations.xml @@ -18,17 +18,36 @@ */ --> <resources> - <!-- Build.HARDWARE,duration_in_milliseconds --> + <!-- Build condition,duration_in_milliseconds --> <string-array name="keypress_vibration_durations" translatable="false"> <!-- Nexus S --> - <item>herring,5</item> + <item>MODEL=Nexus S:BRAND=google,5</item> <!-- Galaxy Nexus --> - <item>tuna,5</item> + <item>MODEL=Galaxy Nexus:BRAND=google,5</item> <!-- Nexus 4 --> - <item>mako,5</item> + <item>MODEL=Nexus 4:BRAND=google,8</item> <!-- Nexus 10 --> - <item>manta,16</item> + <item>MODEL=Nexus 10:BRAND=google,16</item> + <!-- Samsung Galaxy SII --> + <item>MODEL=GT-I(9100[GMPT]?|9108|9210T?):MANUFACTURER=samsung,8</item> + <item>MODEL=SGH-(I9[27]7R?|I927|T989D?):MANUFACTURER=samsung,8</item> + <item>MODEL=SHW-M250[KLS]?|SPH-D710|SCH-R760:MANUFACTURER=samsung,8</item> + <item>MODEL=ISW11SC|SC-02C:MANUFACTURER=samsung,8</item> + <!-- Samsung Galaxy SIII --> + <item>MODEL=(SAMSUNG-)?GT-I(930[05][NT]?|9308):MANUFACTURER=samsung,8</item> + <item>MODEL=(SAMSUNG-)?SGH-(T999[V]?|I747[M]?|N064|N035):MANUFACTURER=samsung,8</item> + <item>MODEL=(SAMSUNG-)?SCH-(J021|R530|I535|I939):MANUFACTURER=samsung,8</item> + <item>MODEL=(SAMSUNG-)?(SCL21|SC-06D|SC-03E]):MANUFACTURER=samsung,8</item> + <item>MODEL=(SAMSUNG-)?(SHV-210[KLS]?|SPH-L710):MANUFACTURER=samsung,8</item> + <!-- LG Optimus G --> + <item>MODEL=LG-E97[013]|LS970|L-01E:MANUFACTURER=LGE,15</item> + <!-- HTC One X --> + <item>MODEL=HTC One X:MANUFACTURER=HTC,20</item> + <!-- Motorola Razor M --> + <item>MODEL=XT907:MANUFACTURER=motorola,30</item> + <!-- Sony Xperia Z --> + <item>MODEL=C6603:MANUFACTURER=Sony,35</item> <!-- Default value for unknown device --> - <item>DEFAULT,20</item> + <item>,20</item> </string-array> </resources> diff --git a/java/res/values/keypress-volumes.xml b/java/res/values/keypress-volumes.xml index 047fe0c5f..a096c341b 100644 --- a/java/res/values/keypress-volumes.xml +++ b/java/res/values/keypress-volumes.xml @@ -18,15 +18,15 @@ */ --> <resources> + <!-- Build condition,volume --> <string-array name="keypress_volumes" translatable="false"> - <!-- Build.HARDWARE,volume --> - <item>herring,0.5f</item> - <item>tuna,0.5f</item> - <item>stingray,0.4f</item> - <item>grouper,0.3f</item> - <item>mako,0.3f</item> - <item>manta,0.2f</item> + <item>HARDWARE=herring,0.5f</item> + <item>HARDWARE=tuna,0.5f</item> + <item>HARDWARE=stingray,0.4f</item> + <item>HARDWARE=grouper,0.3f</item> + <item>HARDWARE=mako,0.3f</item> + <item>HARDWARE=manta,0.2f</item> <!-- Default value for unknown device --> - <item>DEFAULT,0.2f</item> + <item>,0.2f</item> </string-array> </resources> diff --git a/java/res/values/phantom-sudden-move-event-device-list.xml b/java/res/values/phantom-sudden-move-event-device-list.xml index 22f510229..53002b31e 100644 --- a/java/res/values/phantom-sudden-move-event-device-list.xml +++ b/java/res/values/phantom-sudden-move-event-device-list.xml @@ -19,11 +19,11 @@ --> <resources> <string-array name="phantom_sudden_move_event_device_list" translatable="false"> - <!-- "Build.HARDWARE,true" that needs "phantom sudden move event" hack. + <!-- "Build condition,true" that needs "phantom sudden move event" hack. See {@link com.android.inputmethod.keyboard.PointerTracker}. --> <!-- Xoom --> - <item>stingray,true</item> + <item>HARDWARE=stingray,true</item> <!-- Default value for unknown device --> - <item>DEFAULT,false</item> + <item>,false</item> </string-array> </resources> diff --git a/java/res/values/setup-dimens.xml b/java/res/values/setup-dimens.xml deleted file mode 100644 index 007906dc0..000000000 --- a/java/res/values/setup-dimens.xml +++ /dev/null @@ -1,20 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2013 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. ---> - -<resources xmlns:android="http://schemas.android.com/apk/res/android"> - <dimen name="setup_title_text_size">46sp</dimen> - <dimen name="setup_horizontal_padding">16dp</dimen> -</resources> diff --git a/java/res/values/setup-styles-common.xml b/java/res/values/setup-styles-common.xml new file mode 100644 index 000000000..686decfba --- /dev/null +++ b/java/res/values/setup-styles-common.xml @@ -0,0 +1,73 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2013 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. +--> + +<resources xmlns:android="http://schemas.android.com/apk/res/android"> + <style name="setupTitleStyleCommon"> + <item name="android:textColor">@color/setup_text_dark</item> + <item name="android:textSize">@dimen/setup_title_text_size</item> + <item name="android:layout_width">match_parent</item> + <item name="android:layout_height">wrap_content</item> + </style> + <style name="setupWelcomeDescritpionStyle" parent="setupTitleStyle"> + <item name="android:textSize">@dimen/setup_welcome_description_text_size</item> + </style> + <style name="setupStepIndicatorStyle"> + <item name="android:layout_width">match_parent</item> + <item name="android:layout_height">@dimen/setup_step_triangle_indicator_height</item> + </style> + <style name="setupStepBulletStyle"> + <item name="android:textColor">@color/setup_text_dark</item> + <item name="android:textSize">@dimen/setup_step_bullet_text_size</item> + <item name="android:layout_width">0dp</item> + <item name="android:layout_weight">1.0</item> + <item name="android:layout_height">wrap_content</item> + <item name="android:gravity">center_horizontal</item> + </style> + <style name="setupStepBaseStyle"> + <item name="android:textColor">@color/setup_text_dark</item> + <item name="android:background">@color/setup_step_background</item> + <item name="android:layout_width">match_parent</item> + <item name="android:layout_height">wrap_content</item> + <item name="android:paddingLeft">@dimen/setup_step_horizontal_padding</item> + <item name="android:paddingRight">@dimen/setup_step_horizontal_padding</item> + </style> + <style name="setupStepTitleStyle" parent="setupStepBaseStyle"> + <item name="android:textSize">@dimen/setup_step_title_text_size</item> + </style> + <style name="setupStepInstructionStyle" parent="setupStepBaseStyle"> + <item name="android:textSize">@dimen/setup_step_instruction_text_size</item> + </style> + <style name="setupStepStartIndicatorStyle"> + <!-- The triangle indicator here is placed sideways. --> + <item name="android:layout_width">@dimen/setup_step_triangle_indicator_height</item> + <item name="android:layout_height">@dimen/setup_step_action_height</item> + </style> + <style name="setupStepActionLabelStyleCommon" parent="setupStepBaseStyle"> + <item name="android:textColor">@color/setup_step_action_color</item> + <item name="android:background">@drawable/setup_step_action_background</item> + <item name="android:layout_height">@dimen/setup_step_action_height</item> + <item name="android:paddingLeft">@dimen/setup_step_horizontal_padding_half</item> + <item name="android:textSize">@dimen/setup_step_action_text_size</item> + <item name="android:drawablePadding">@dimen/setup_step_horizontal_padding_half</item> + <item name="android:gravity">center_vertical</item> + <item name="android:clickable">true</item> + <item name="android:focusable">true</item> + </style> + <style name="setupStepStartActionLabelStyleCommon" parent="setupStepActionLabelStyleCommon"> + <item name="android:paddingLeft">@dimen/setup_step_horizontal_padding</item> + <item name="android:paddingRight">@dimen/setup_step_horizontal_padding</item> + </style> +</resources> diff --git a/java/res/values/setup-styles.xml b/java/res/values/setup-styles.xml index 420adcbb7..1ffe8ca46 100644 --- a/java/res/values/setup-styles.xml +++ b/java/res/values/setup-styles.xml @@ -15,31 +15,6 @@ --> <resources xmlns:android="http://schemas.android.com/apk/res/android"> - <style name="setupTitleStyle"> - <item name="android:textColor">@color/setup_text_dark</item> - <item name="android:textSize">@dimen/setup_title_text_size</item> - </style> - <style name="setupStepBulletStyle"> - <item name="android:textColor">@color/setup_text_dark</item> - <item name="android:textSize">22sp</item> - <item name="android:layout_width">0dp</item> - <item name="android:layout_weight">1.0</item> - <item name="android:layout_height">wrap_content</item> - <item name="android:gravity">center_horizontal</item> - </style> - <style name="setupStepTitleStyle"> - <item name="android:background">@color/setup_step_background</item> - <item name="android:textColor">@color/setup_text_dark</item> - <item name="android:textSize">22sp</item> - </style> - <style name="setupStepInstructionStyle"> - <item name="android:background">@color/setup_step_background</item> - <item name="android:textColor">@color/setup_text_dark</item> - <item name="android:textSize">14sp</item> - </style> - <style name="setupStepActionLabelStyle"> - <item name="android:background">@drawable/setup_step_action_background</item> - <item name="android:textColor">@drawable/setup_step_action_color</item> - <item name="android:textSize">18sp</item> - </style> + <style name="setupTitleStyle" parent="setupTitleStyleCommon" /> + <style name="setupStepActionLabelStyle" parent="setupStepActionLabelStyleCommon" /> </resources> diff --git a/java/res/values/strings-appname.xml b/java/res/values/strings-appname.xml new file mode 100644 index 000000000..46d8c44ac --- /dev/null +++ b/java/res/values/strings-appname.xml @@ -0,0 +1,37 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** +** Copyright 2013, 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. +*/ +--> + +<resources> + <!-- Application name for opensource Android keyboard. AOSP(Android Open Source Project) should not be translated. + This resource should be copied from msgid="8250992613616792321" --> + <string name="english_ime_name">Android Keyboard (AOSP)</string> + + <!-- Name of Android spell checker service. AOSP(Android Open Source Project) should not be translated. + This resource should be copied from msgid="511950477199948048" --> + <string name="spell_checker_service_name">Android Spell Checker (AOSP)</string> + + <!-- Title for Android Keyboard settings screen. AOSP(Android Open Source Project) should not be translated. + This resource should be copied from msgid="423615877174850267" --> + <string name="english_ime_settings">Android Keyboard Settings (AOSP)</string> + + <!-- Title for the spell checking service settings screen. AOSP(Android Open Source Project) should not be translated. + This resource should be copied from msgid="2970535894327288421" --> + <string name="android_spell_checker_settings">Android Spell Checker Settings (AOSP)</string> +</resources> diff --git a/java/res/values/strings.xml b/java/res/values/strings.xml index eef37c21f..85abb08fe 100644 --- a/java/res/values/strings.xml +++ b/java/res/values/strings.xml @@ -18,18 +18,6 @@ */ --> <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <!-- Application name for opensource Android keyboard. AOSP(Android Open Source Project) should not be translated. --> - <string name="aosp_android_keyboard_ime_name">Android Keyboard (AOSP)</string> - - <!-- Title for Android Keyboard settings screen. AOSP(Android Open Source Project) should not be translated. --> - <string name="aosp_android_keyboard_ime_settings">Android Keyboard Settings (AOSP)</string> - - <!-- Name of Android spell checker service. AOSP(Android Open Source Project) should not be translated. --> - <string name="aosp_spell_checker_service_name">Android Spell Checker (AOSP)</string> - - <!-- Title for the spell checking service settings screen. AOSP(Android Open Source Project) should not be translated. --> - <string name="aosp_android_spell_checker_service_settings">Android Spell Checker Settings (AOSP)</string> - <!-- Title for Latin keyboard input options dialog [CHAR LIMIT=25] --> <string name="english_ime_input_options">Input options</string> @@ -107,6 +95,9 @@ <!-- Description for option to enable auto capitalization of sentences --> <string name="auto_cap_summary">Capitalize the first word of each sentence</string> + <!-- Option to edit personal dictionary. [CHAR_LIMIT=30]--> + <string name="edit_personal_dictionary">Personal dictionary</string> + <!-- Option to configure dictionaries --> <string name="configure_dictionaries_title">Add-on dictionaries</string> <!-- Name of the main dictionary, as opposed to auxiliary dictionaries (medical/entertainment/sports...) --> @@ -120,6 +111,11 @@ <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> + <!-- Summary for option to block potentially offensive words to be shown [CHAR_LIMIT=80 (two lines) or 40 (fits on one line, preferable)] --> + <string name="prefs_block_potentially_offensive_summary">Do not suggest potentially offensive words</string> + <!-- Option to decide the auto correction threshold score --> <!-- Option to enable auto correction [CHAR LIMIT=20]--> <string name="auto_correction">Auto-correction</string> @@ -456,15 +452,17 @@ <string name="setup_step1_bullet" translatable="false">1</string> <!-- Title of the 1st step in the setup wizard. [CHAR LIMIT=64] --> <string name="setup_step1_title">"Enable <xliff:g id="application_name">%s</xliff:g>"</string> - <!-- Detailed instruction of the 1st step in the setup wizard. [CHAR LIMIT=80] --> + <!-- Detailed instruction of the 1st step in the setup wizard. [CHAR LIMIT=120] --> <string name="setup_step1_instruction">"Please check \"<xliff:g id="application_name">%s</xliff:g>\" in your Language & input settings. This will authorize it to run on your device."</string> + <!-- Detailed instruction of the already finished 1st step in the setup wizard. [CHAR LIMIT=120] --> + <string name="setup_step1_finished_instruction">"<xliff:g id="application_name">%s</xliff:g> is already enabled in your Language & input settings, so this step is done. On to the next one!"</string> <!-- The label of the button that triggers the Language & input settings in order to enable the keyboard. [CHAR_LIMIT=64] --> <string name="setup_step1_action">Enable in Settings</string> <!-- Ordinal number of the 2nd step in the setup wizard. [CHAR LIMIT=5] --> <string name="setup_step2_bullet" translatable="false">2</string> <!-- Title of the 2nd step in the setup wizard. [CHAR LIMIT=64] --> <string name="setup_step2_title">"Switch to <xliff:g id="application_name">%s</xliff:g>"</string> - <!-- Detailed instruction of the 2nd step in the setup wizard. [CHAR LIMIT=80] --> + <!-- Detailed instruction of the 2nd step in the setup wizard. [CHAR LIMIT=120] --> <string name="setup_step2_instruction">"Next, select \"<xliff:g id="application_name">%s</xliff:g>\" as your active text-input method."</string> <!-- The label of the button that triggers the choose input method dialog in order to select the keyboard. [CHAR_LIMIT=64] --> <string name="setup_step2_action">Switch input methods</string> @@ -472,14 +470,16 @@ <string name="setup_step3_bullet" translatable="false">3</string> <!-- Title of the 3rd step in the setup wizard. [CHAR LIMIT=64] --> <string name="setup_step3_title">"Congratulations, you're all set!"</string> - <!-- Detailed instruction of the 3rd step in the setup wizard. [CHAR LIMIT=80] --> + <!-- Detailed instruction of the 3rd step in the setup wizard. [CHAR LIMIT=120] --> <string name="setup_step3_instruction">Now you can type in all your favorite apps with <xliff:g id="application_name">%s</xliff:g>.</string> <!-- The label of the button that triggers the screen for configuaring additional languages of the keyboard. [CHAR_LIMIT=64] --> <string name="setup_step3_action">Configure additional languages</string> <!-- The label of the button that finishes the setup wizard. [CHAR_LIMIT=64] --> <string name="setup_finish_action">Finished</string> <!-- Option to show setup wizard icon. [CHAR LIMIT=30]--> - <string name="show_setup_wizard_icon" translatable="false">Show setup wizard icon</string> + <string name="show_setup_wizard_icon">Show app icon</string> + <!-- Description for the option to show setup wizard application icon of this IME in the laucher. [CHAR_LIMIT=65] --> + <string name="show_setup_wizard_icon_summary">Display application icon in the launcher</string> <!-- The dictionary provider application name. Visible in Settings/Applications/Manage applications. --> <string name="app_name">Dictionary Provider</string> @@ -509,9 +509,9 @@ <!-- Message about some dictionary indicating the file is installed, but the dictionary is disabled --> <string name="dictionary_disabled">Installed, disabled</string> - <!-- Message to display in the dictionaries setting screen when some error prevented us to list installed dictionaries [CHAR LIMIT=50] --> + <!-- Message to display in the dictionaries setting screen when some error prevented us to list installed dictionaries [CHAR LIMIT=20] --> <string name="cannot_connect_to_dict_service">Problem connecting to dictionary service</string> - <!-- Message to display in the dictionaries setting screen when we found that no dictionaries are available [CHAR LIMIT=50]--> + <!-- Message to display in the dictionaries setting screen when we found that no dictionaries are available [CHAR LIMIT=20]--> <string name="no_dictionaries_available">No dictionaries available</string> <!-- Title of the options to press to refresh the list (as in, check for updates now) [CHAR_LIMIT=50] --> @@ -554,4 +554,70 @@ Tip: You can download and remove dictionaries by going to <b>Language & i <!-- The text of the toast warning a download is starting automatically to enable suggestions for the selected language [CHAR LIMIT=100] --> <string name="toast_downloading_suggestions">Downloading: suggestions for <xliff:g id="language" example="English">%1$s</xliff:g> will be ready soon.</string> + + <!-- Version text [CHAR LIMIT=30]--> + <string name="version_text">Version <xliff:g id="version_number" example="1.0.1864.643521">%1$s</xliff:g></string> + + <!-- User dictionary settings --> + <!-- User dictionary settings. The summary of the listem item to go into the User dictionary settings screen. --> + <string name="user_dict_settings_summary" translatable="false">""</string> + <!-- User dictionary settings. The title of the menu item to add a new word to the user dictionary. --> + <!-- This resource is corresponding to msgid="4056762757149923551" --> + <string name="user_dict_settings_add_menu_title">Add</string> + <!-- User dictionary settings. The title of the dialog to add a new word to the user dictionary. [CHAR LIMIT=25] --> + <!-- This resource is corresponding to msgid="4702613990174126482" --> + <string name="user_dict_settings_add_dialog_title">Add to dictionary</string> + <!-- User dictionary settings. The title of the screen to add/edit a new word to the user dictionary; it describes the phrase that will be added to the user dictionary. [CHAR LIMIT=25] --> + <!-- This resource is corresponding to msgid="742580720124344291" --> + <string name="user_dict_settings_add_screen_title">Phrase</string> + <!-- User dictionary settings. Text on the dialog button to pop more options for adding a word. [CHAR LIMIT=16] --> + <!-- This resource is corresponding to msgid="8848798370746019825" --> + <string name="user_dict_settings_add_dialog_more_options">More options</string> + <!-- User dictionary settings. Text on the dialog button mask advanced options. [CHAR LIMIT=15] --> + <!-- This resource is corresponding to msgid="2441785268726036101" --> + <string name="user_dict_settings_add_dialog_less_options">Less options</string> + <!-- User dictionary settings. Text on the dialog button to confirm adding a word. [CHAR LIMIT=15] --> + <!-- This resource is corresponding to msgid="6225823625332416144" --> + <string name="user_dict_settings_add_dialog_confirm">OK</string> + <!-- User dictionary settings. Label to put before the word field (that's the word that will actually be added to the user dictionary when OK is pressed). [CHAR LIMIT=20] --> + <!-- This resource is corresponding to msgid="7868879174905963135" --> + <string name="user_dict_settings_add_word_option_name">Word:</string> + <!-- User dictionary settings. Label to put before the shortcut field (once a shortcut is registered, the user can type the shortcut and get the word it points to in the suggestions). [CHAR LIMIT=20] --> + <!-- This resource is corresponding to msgid="660089258866063925" --> + <string name="user_dict_settings_add_shortcut_option_name">Shortcut:</string> + <!-- User dictionary settings. Label to put before the language field. [CHAR LIMIT=20] --> + <!-- This resource is corresponding to msgid="5696358317061318532" --> + <string name="user_dict_settings_add_locale_option_name">Language:</string> + <!-- User dictionary settings. Hint for the text field to type the word to add to the user dictionary. [CHAR LIMIT=35] --> + <!-- This resource is corresponding to msgid="5725254076556821247" --> + <string name="user_dict_settings_add_word_hint">Type a word</string> + <!-- User dictionary settings. Hint for the text field to type the optional shortcut to add to the user dictionary. [CHAR LIMIT=35] --> + <!-- This resource is corresponding to msgid="7333763456561873445" --> + <string name="user_dict_settings_add_shortcut_hint">Optional shortcut</string> + <!-- User dictionary settings. The title of the dialog to edit an existing word in the user dictionary. --> + <!-- This resource is corresponding to msgid="8967476444840548674" --> + <string name="user_dict_settings_edit_dialog_title">Edit word</string> + <!-- User dictionary settings. The title of the context menu item to edit the current word --> + <!-- This resource is corresponding to msgid="2210564879320004837" --> + <string name="user_dict_settings_context_menu_edit_title">Edit</string> + <!-- User dictionary settings. The title of the context menu item to delete the current word --> + <!-- This resource is corresponding to msgid="9140703913776549054" --> + <string name="user_dict_settings_context_menu_delete_title">Delete</string> + <!-- User dictionary settings. The text to show when there are no user-defined words in the dictionary [CHAR LIMIT=200] --> + <!-- This resource is corresponding to msgid="8165273379942105271" --> + <string name="user_dict_settings_empty_text">You don\'t have any words in the user dictionary. Add a word by touching the Add (+) button.</string> + <!-- User dictionary settings. The list item to choose to insert a word into the user dictionary for all languages --> + <!-- This resource is corresponding to msgid="6742000040975959247" --> + <string name="user_dict_settings_all_languages">For all languages</string> + <!-- User dictionary settings. The text to show for the option that shows the entire list of supported locales to choose one [CHAR LIMIT=30] --> + <!-- This resource is corresponding to msgid="7316375944684977910" --> + <string name="user_dict_settings_more_languages">More languages…</string> + <!-- User dictionary settings. Label to delete an entry in the user dictionary [CHAR LIMIT=30] + This resource is copied from packages/apps/Settings/res/values/strings.xml --> + <!-- This resource is corresponding to msgid="4219243412325163003" --> + <string name="user_dict_settings_delete">Delete</string> + <!-- User dictionary settings. Index of the user dictionary [CHAR LIMIT=30] + This resource is copied from packages/apps/Settings/res/values/strings.xml --> + <!-- This resource is corresponding to msgid="5433275485499039199" --> + <string name="user_dict_fast_scroll_alphabet">\u0020ABCDEFGHIJKLMNOPQRSTUVWXYZ</string> </resources> diff --git a/java/res/values/styles.xml b/java/res/values/styles.xml index 436e080f7..8b6c29e59 100644 --- a/java/res/values/styles.xml +++ b/java/res/values/styles.xml @@ -64,14 +64,18 @@ <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="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> - <item name="gesturePreviewTrailColor">@color/highlight_color_default</item> - <item name="gesturePreviewTrailStartWidth">@dimen/gesture_preview_trail_start_width</item> - <item name="gesturePreviewTrailEndWidth">@dimen/gesture_preview_trail_end_width</item> - <item name="gesturePreviewTrailBodyRatio">@integer/gesture_preview_trail_body_ratio</item> - <item name="gesturePreviewTrailShadowRatio">@integer/gesture_preview_trail_shadow_ratio</item> + <item name="gestureTrailMinSamplingDistance">@dimen/gesture_trail_min_sampling_distance</item> + <item name="gestureTrailMaxInterpolationAngularThreshold">@integer/gesture_trail_max_interpolation_angular_threshold</item> + <item name="gestureTrailMaxInterpolationDistanceThreshold">@dimen/gesture_trail_max_interpolation_distance_threshold</item> + <item name="gestureTrailMaxInterpolationSegments">@integer/gesture_trail_max_interpolation_segments</item> + <item name="gestureTrailFadeoutStartDelay">@integer/config_gesture_trail_fadeout_start_delay</item> + <item name="gestureTrailFadeoutDuration">@integer/config_gesture_trail_fadeout_duration</item> + <item name="gestureTrailUpdateInterval">@integer/config_gesture_trail_update_interval</item> + <item name="gestureTrailColor">@color/highlight_color_default</item> + <item name="gestureTrailStartWidth">@dimen/gesture_trail_start_width</item> + <item name="gestureTrailEndWidth">@dimen/gesture_trail_end_width</item> + <item name="gestureTrailBodyRatio">@integer/gesture_trail_body_ratio</item> + <item name="gestureTrailShadowRatio">@integer/gesture_trail_shadow_ratio</item> <!-- Common attributes of MainKeyboardView --> <item name="keyHysteresisDistance">@dimen/config_key_hysteresis_distance</item> <item name="keyHysteresisDistanceForSlidingModifier">@dimen/config_key_hysteresis_distance_for_sliding_modifier</item> @@ -94,8 +98,10 @@ <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> + <!-- Remove animations for now because it could drain a non-negligible amount of battery while typing. <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> @@ -342,7 +348,7 @@ <item name="keyTextShadowRadius">0.0</item> <item name="slidingKeyInputPreviewColor">@color/highlight_translucent_color_ics</item> <item name="gestureFloatingPreviewTextColor">@color/highlight_color_ics</item> - <item name="gesturePreviewTrailColor">@color/highlight_color_ics</item> + <item name="gestureTrailColor">@color/highlight_color_ics</item> </style> <style name="MainKeyboardView.IceCreamSandwich" diff --git a/java/res/values/sudden-jumping-touch-event-device-list.xml b/java/res/values/sudden-jumping-touch-event-device-list.xml index 3fdc0c7e3..3a9c379a7 100644 --- a/java/res/values/sudden-jumping-touch-event-device-list.xml +++ b/java/res/values/sudden-jumping-touch-event-device-list.xml @@ -19,13 +19,13 @@ --> <resources> <string-array name="sudden_jumping_touch_event_device_list" translatable="false"> - <!-- "Build.HARDWARE,true" that needs "sudden jump touch event" hack. + <!-- "Build condition,true" that needs "sudden jump touch event" hack. See {@link com.android.inputmethod.keyboard.SuddenJumpingTouchEventHandler}. --> <!-- Nexus One --> - <item>mahimahi,true</item> + <item>HARDWARE=mahimahi,true</item> <!-- Droid --> - <item>sholes,true</item> + <item>HARDWARE=sholes,true</item> <!-- Default value for unknown device --> - <item>DEFAULT,false</item> + <item>,false</item> </string-array> </resources> |