diff options
Diffstat (limited to 'java/res')
40 files changed, 156 insertions, 112 deletions
diff --git a/java/res/drawable-hdpi/ic_setup_wizard.png b/java/res/drawable-hdpi/ic_setup_wizard.png Binary files differdeleted file mode 100644 index 38fca6d9d..000000000 --- a/java/res/drawable-hdpi/ic_setup_wizard.png +++ /dev/null diff --git a/java/res/drawable-mdpi/ic_setup_wizard.png b/java/res/drawable-mdpi/ic_setup_wizard.png Binary files differdeleted file mode 100644 index 66e62b820..000000000 --- a/java/res/drawable-mdpi/ic_setup_wizard.png +++ /dev/null diff --git a/java/res/drawable-xhdpi/ic_setup_wizard.png b/java/res/drawable-xhdpi/ic_setup_wizard.png Binary files differdeleted file mode 100644 index 53f70a617..000000000 --- a/java/res/drawable-xhdpi/ic_setup_wizard.png +++ /dev/null diff --git a/java/res/drawable-xxhdpi/ic_setup_wizard.png b/java/res/drawable-xxhdpi/ic_setup_wizard.png Binary files differdeleted file mode 100644 index 6414b4f36..000000000 --- a/java/res/drawable-xxhdpi/ic_setup_wizard.png +++ /dev/null diff --git a/java/res/layout-land/setup_steps_screen.xml b/java/res/layout-land/setup_steps_screen.xml index 0b4a096cc..cf8c42475 100644 --- a/java/res/layout-land/setup_steps_screen.xml +++ b/java/res/layout-land/setup_steps_screen.xml @@ -27,7 +27,9 @@ android:layout_width="0dp" android:layout_height="match_parent" android:layout_weight="@integer/setup_title_weight_in_screen" - android:orientation="vertical"> + android:orientation="vertical" + android:layout_marginEnd="@dimen/setup_title_end_margin" + android:layout_marginRight="@dimen/setup_title_end_margin"> <include layout="@layout/setup_steps_title" /> </LinearLayout> <LinearLayout diff --git a/java/res/layout-land/setup_welcome_screen.xml b/java/res/layout-land/setup_welcome_screen.xml index 8b162e27f..38aea2c4f 100644 --- a/java/res/layout-land/setup_welcome_screen.xml +++ b/java/res/layout-land/setup_welcome_screen.xml @@ -27,7 +27,9 @@ android:layout_width="0dp" android:layout_height="match_parent" android:layout_weight="@integer/setup_title_weight_in_screen" - android:orientation="vertical"> + android:orientation="vertical" + android:layout_marginEnd="@dimen/setup_title_end_margin" + android:layout_marginRight="@dimen/setup_title_end_margin"> <include layout="@layout/setup_welcome_title" /> </LinearLayout> <LinearLayout diff --git a/java/res/layout/setup_welcome_video.xml b/java/res/layout/setup_welcome_video.xml index 8c04e637e..c39411e3d 100644 --- a/java/res/layout/setup_welcome_video.xml +++ b/java/res/layout/setup_welcome_video.xml @@ -25,24 +25,27 @@ android:orientation="horizontal" android:paddingTop="@dimen/setup_welcome_video_vertical_margin" android:paddingBottom="@dimen/setup_welcome_video_vertical_margin"> - <View - android:layout_weight="@integer/setup_welcome_video_left_padding_weight_in_screen" - android:layout_width="0dp" - android:layout_height="0dp" /> - <VideoView - android:id="@+id/setup_welcome_video" - android:background="@color/setup_background" - android:layout_weight="@integer/setup_welcome_video_weight_in_screen" - android:layout_width="0dp" - android:layout_height="wrap_content" /> - <ImageView - android:id="@+id/setup_welcome_image" - android:visibility="gone" + <LinearLayout + android:id="@+id/setup_welcome_video_frame" android:layout_weight="@integer/setup_welcome_video_weight_in_screen" android:layout_width="0dp" - android:layout_height="wrap_content" /> + android:layout_height="wrap_content" + android:orientation="horizontal" + android:padding="1dp" + android:background="@color/setup_welcome_video_margin_color" > + <VideoView + android:id="@+id/setup_welcome_video" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:background="@color/setup_background" /> + <ImageView + android:id="@+id/setup_welcome_image" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:visibility="gone" /> + </LinearLayout> <View - android:layout_weight="@integer/setup_welcome_video_right_padding_weight_in_screen" + android:layout_weight="@integer/setup_welcome_video_end_padding_weight_in_screen" android:layout_width="0dp" android:layout_height="0dp" /> </LinearLayout> diff --git a/java/res/layout/setup_wizard.xml b/java/res/layout/setup_wizard.xml index 176f83630..87db4d012 100644 --- a/java/res/layout/setup_wizard.xml +++ b/java/res/layout/setup_wizard.xml @@ -19,6 +19,7 @@ --> <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/setup_wizard" android:layout_width="match_parent" android:layout_height="match_parent" android:background="@color/setup_background" diff --git a/java/res/layout/user_dictionary_add_word_fullscreen.xml b/java/res/layout/user_dictionary_add_word_fullscreen.xml index 75e86c509..219485b66 100644 --- a/java/res/layout/user_dictionary_add_word_fullscreen.xml +++ b/java/res/layout/user_dictionary_add_word_fullscreen.xml @@ -19,12 +19,6 @@ android:layout_height="wrap_content" android:orientation="vertical" > - <TextView - style="?android:attr/listSeparatorTextViewStyle" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:text="@string/user_dict_settings_add_screen_title" /> - <EditText android:id="@+id/user_dictionary_add_word_text" android:layout_width="match_parent" diff --git a/java/res/mipmap-hdpi/ic_ime_settings.png b/java/res/mipmap-hdpi/ic_ime_settings.png Binary files differdeleted file mode 100644 index 486c70d34..000000000 --- a/java/res/mipmap-hdpi/ic_ime_settings.png +++ /dev/null diff --git a/java/res/mipmap-hdpi/ic_launcher_keyboard.png b/java/res/mipmap-hdpi/ic_launcher_keyboard.png Binary files differnew file mode 100644 index 000000000..36b1ccae2 --- /dev/null +++ b/java/res/mipmap-hdpi/ic_launcher_keyboard.png diff --git a/java/res/mipmap-mdpi/ic_ime_settings.png b/java/res/mipmap-mdpi/ic_ime_settings.png Binary files differdeleted file mode 100644 index 75f4afb60..000000000 --- a/java/res/mipmap-mdpi/ic_ime_settings.png +++ /dev/null diff --git a/java/res/mipmap-mdpi/ic_launcher_keyboard.png b/java/res/mipmap-mdpi/ic_launcher_keyboard.png Binary files differnew file mode 100644 index 000000000..67ef189ff --- /dev/null +++ b/java/res/mipmap-mdpi/ic_launcher_keyboard.png diff --git a/java/res/mipmap-xhdpi/ic_ime_settings.png b/java/res/mipmap-xhdpi/ic_ime_settings.png Binary files differdeleted file mode 100644 index bbf191975..000000000 --- a/java/res/mipmap-xhdpi/ic_ime_settings.png +++ /dev/null diff --git a/java/res/mipmap-xhdpi/ic_launcher_keyboard.png b/java/res/mipmap-xhdpi/ic_launcher_keyboard.png Binary files differnew file mode 100644 index 000000000..b33208332 --- /dev/null +++ b/java/res/mipmap-xhdpi/ic_launcher_keyboard.png diff --git a/java/res/mipmap-xxhdpi/ic_ime_settings.png b/java/res/mipmap-xxhdpi/ic_ime_settings.png Binary files differdeleted file mode 100644 index 16fc693ef..000000000 --- a/java/res/mipmap-xxhdpi/ic_ime_settings.png +++ /dev/null diff --git a/java/res/mipmap-xxhdpi/ic_launcher_keyboard.png b/java/res/mipmap-xxhdpi/ic_launcher_keyboard.png Binary files differnew file mode 100644 index 000000000..acc424fe2 --- /dev/null +++ b/java/res/mipmap-xxhdpi/ic_launcher_keyboard.png diff --git a/java/res/raw/setup_welcome_image.png b/java/res/raw/setup_welcome_image.png Binary files differindex 17e31111f..db5dc344f 100644 --- a/java/res/raw/setup_welcome_image.png +++ b/java/res/raw/setup_welcome_image.png diff --git a/java/res/raw/setup_welcome_video.mp4 b/java/res/raw/setup_welcome_video.mp4 Binary files differindex 09357d8de..820852531 100644 --- a/java/res/raw/setup_welcome_video.mp4 +++ b/java/res/raw/setup_welcome_video.mp4 diff --git a/java/res/values-h1200dp-port/setup-dimens-large-tablet-port.xml b/java/res/values-h1200dp-port/setup-dimens-large-tablet-port.xml index ad61c1a3a..d1df81e01 100644 --- a/java/res/values-h1200dp-port/setup-dimens-large-tablet-port.xml +++ b/java/res/values-h1200dp-port/setup-dimens-large-tablet-port.xml @@ -33,8 +33,8 @@ <dimen name="setup_step_horizontal_line_height">2dp</dimen> <integer name="setup_title_weight_in_screen">40</integer> <integer name="setup_body_weight_in_screen">60</integer> + <dimen name="setup_title_end_margin">24dp</dimen> <dimen name="setup_welcome_video_vertical_margin">24dp</dimen> - <integer name="setup_welcome_video_weight_in_screen">50</integer> - <integer name="setup_welcome_video_left_padding_weight_in_screen">25</integer> - <integer name="setup_welcome_video_right_padding_weight_in_screen">25</integer> + <integer name="setup_welcome_video_weight_in_screen">70</integer> + <integer name="setup_welcome_video_end_padding_weight_in_screen">30</integer> </resources> diff --git a/java/res/values-h330dp-land/setup-dimens-large-phone-land.xml b/java/res/values-h330dp-land/setup-dimens-large-phone-land.xml index 69a8a7ad5..babc05bf2 100644 --- a/java/res/values-h330dp-land/setup-dimens-large-phone-land.xml +++ b/java/res/values-h330dp-land/setup-dimens-large-phone-land.xml @@ -33,8 +33,8 @@ <dimen name="setup_step_horizontal_line_height">2dp</dimen> <integer name="setup_title_weight_in_screen">40</integer> <integer name="setup_body_weight_in_screen">60</integer> + <dimen name="setup_title_end_margin">24dp</dimen> <dimen name="setup_welcome_video_vertical_margin">24dp</dimen> - <integer name="setup_welcome_video_weight_in_screen">80</integer> - <integer name="setup_welcome_video_left_padding_weight_in_screen">10</integer> - <integer name="setup_welcome_video_right_padding_weight_in_screen">10</integer> + <integer name="setup_welcome_video_weight_in_screen">70</integer> + <integer name="setup_welcome_video_end_padding_weight_in_screen">30</integer> </resources> diff --git a/java/res/values-h520dp-land/setup-dimens-small-tablet-land.xml b/java/res/values-h520dp-land/setup-dimens-small-tablet-land.xml index 6a14d5918..772587491 100644 --- a/java/res/values-h520dp-land/setup-dimens-small-tablet-land.xml +++ b/java/res/values-h520dp-land/setup-dimens-small-tablet-land.xml @@ -33,8 +33,8 @@ <dimen name="setup_step_horizontal_line_height">2dp</dimen> <integer name="setup_title_weight_in_screen">40</integer> <integer name="setup_body_weight_in_screen">60</integer> + <dimen name="setup_title_end_margin">24dp</dimen> <dimen name="setup_welcome_video_vertical_margin">24dp</dimen> <integer name="setup_welcome_video_weight_in_screen">60</integer> - <integer name="setup_welcome_video_left_padding_weight_in_screen">20</integer> - <integer name="setup_welcome_video_right_padding_weight_in_screen">20</integer> + <integer name="setup_welcome_video_end_padding_weight_in_screen">40</integer> </resources> diff --git a/java/res/values-h540dp-port/setup-dimens-large-phone-port.xml b/java/res/values-h540dp-port/setup-dimens-large-phone-port.xml index b8dd33df4..42d2284f5 100644 --- a/java/res/values-h540dp-port/setup-dimens-large-phone-port.xml +++ b/java/res/values-h540dp-port/setup-dimens-large-phone-port.xml @@ -33,8 +33,8 @@ <dimen name="setup_step_horizontal_line_height">2dp</dimen> <integer name="setup_title_weight_in_screen">40</integer> <integer name="setup_body_weight_in_screen">60</integer> + <dimen name="setup_title_end_margin">24dp</dimen> <dimen name="setup_welcome_video_vertical_margin">24dp</dimen> - <integer name="setup_welcome_video_weight_in_screen">80</integer> - <integer name="setup_welcome_video_left_padding_weight_in_screen">10</integer> - <integer name="setup_welcome_video_right_padding_weight_in_screen">10</integer> + <integer name="setup_welcome_video_weight_in_screen">70</integer> + <integer name="setup_welcome_video_end_padding_weight_in_screen">30</integer> </resources> diff --git a/java/res/values-h720dp-land/setup-dimens-large-tablet-land.xml b/java/res/values-h720dp-land/setup-dimens-large-tablet-land.xml index 0004a3c85..b5f0e5cea 100644 --- a/java/res/values-h720dp-land/setup-dimens-large-tablet-land.xml +++ b/java/res/values-h720dp-land/setup-dimens-large-tablet-land.xml @@ -33,8 +33,8 @@ <dimen name="setup_step_horizontal_line_height">2dp</dimen> <integer name="setup_title_weight_in_screen">40</integer> <integer name="setup_body_weight_in_screen">60</integer> + <dimen name="setup_title_end_margin">24dp</dimen> <dimen name="setup_welcome_video_vertical_margin">24dp</dimen> - <integer name="setup_welcome_video_weight_in_screen">50</integer> - <integer name="setup_welcome_video_left_padding_weight_in_screen">25</integer> - <integer name="setup_welcome_video_right_padding_weight_in_screen">25</integer> + <integer name="setup_welcome_video_weight_in_screen">70</integer> + <integer name="setup_welcome_video_end_padding_weight_in_screen">30</integer> </resources> diff --git a/java/res/values-h800dp-port/setup-dimens-small-tablet-port.xml b/java/res/values-h800dp-port/setup-dimens-small-tablet-port.xml index 87c991c4d..770b4e825 100644 --- a/java/res/values-h800dp-port/setup-dimens-small-tablet-port.xml +++ b/java/res/values-h800dp-port/setup-dimens-small-tablet-port.xml @@ -33,8 +33,8 @@ <dimen name="setup_step_horizontal_line_height">2dp</dimen> <integer name="setup_title_weight_in_screen">40</integer> <integer name="setup_body_weight_in_screen">60</integer> + <dimen name="setup_title_end_margin">24dp</dimen> <dimen name="setup_welcome_video_vertical_margin">24dp</dimen> <integer name="setup_welcome_video_weight_in_screen">60</integer> - <integer name="setup_welcome_video_left_padding_weight_in_screen">20</integer> - <integer name="setup_welcome_video_right_padding_weight_in_screen">20</integer> + <integer name="setup_welcome_video_end_padding_weight_in_screen">40</integer> </resources> diff --git a/java/res/values-land/keyboard-heights.xml b/java/res/values-land/keyboard-heights.xml index 4ebeda559..670be3329 100644 --- a/java/res/values-land/keyboard-heights.xml +++ b/java/res/values-land/keyboard-heights.xml @@ -19,19 +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.100in --> <!-- Droid --> - <item>sholes,194.3333</item> + <item>HARDWARE=sholes,194.3333</item> <!-- Nexus One --> - <item>mahimahi,186.2667</item> + <item>HARDWARE=mahimahi,186.2667</item> <!-- Nexus S --> - <item>herring,171.9385</item> + <item>HARDWARE=herring,171.9385</item> <!-- Galaxy Nexus --> - <item>tuna,173.4207</item> + <item>HARDWARE=tuna,173.4207</item> <!-- Preferable keyboard height in absolute scale: 45.0mm --> <!-- Xoom --> - <item>stingray,265.4378</item> + <item>HARDWARE=stingray,265.4378</item> + <!-- Default value for unknown device: empty string --> + <item>,</item> </string-array> </resources> diff --git a/java/res/values-land/setup-dimens-small-phone-land.xml b/java/res/values-land/setup-dimens-small-phone-land.xml index 63f4661d1..e6dbaa71c 100644 --- a/java/res/values-land/setup-dimens-small-phone-land.xml +++ b/java/res/values-land/setup-dimens-small-phone-land.xml @@ -33,8 +33,8 @@ <dimen name="setup_step_horizontal_line_height">2dp</dimen> <integer name="setup_title_weight_in_screen">40</integer> <integer name="setup_body_weight_in_screen">60</integer> - <dimen name="setup_welcome_video_vertical_margin">24dp</dimen> - <integer name="setup_welcome_video_weight_in_screen">80</integer> - <integer name="setup_welcome_video_left_padding_weight_in_screen">10</integer> - <integer name="setup_welcome_video_right_padding_weight_in_screen">10</integer> + <dimen name="setup_title_end_margin">12dp</dimen> + <dimen name="setup_welcome_video_vertical_margin">12dp</dimen> + <integer name="setup_welcome_video_weight_in_screen">60</integer> + <integer name="setup_welcome_video_end_padding_weight_in_screen">40</integer> </resources> diff --git a/java/res/values-port/setup-dimens-small-phone-port.xml b/java/res/values-port/setup-dimens-small-phone-port.xml index 34f4d9240..a3b18afbc 100644 --- a/java/res/values-port/setup-dimens-small-phone-port.xml +++ b/java/res/values-port/setup-dimens-small-phone-port.xml @@ -33,8 +33,8 @@ <dimen name="setup_step_horizontal_line_height">2dp</dimen> <integer name="setup_title_weight_in_screen">40</integer> <integer name="setup_body_weight_in_screen">60</integer> + <dimen name="setup_title_end_margin">16dp</dimen> <dimen name="setup_welcome_video_vertical_margin">16dp</dimen> - <integer name="setup_welcome_video_weight_in_screen">80</integer> - <integer name="setup_welcome_video_left_padding_weight_in_screen">10</integer> - <integer name="setup_welcome_video_right_padding_weight_in_screen">10</integer> + <integer name="setup_welcome_video_weight_in_screen">70</integer> + <integer name="setup_welcome_video_end_padding_weight_in_screen">30</integer> </resources> diff --git a/java/res/values-sw600dp/dimens.xml b/java/res/values-sw600dp/dimens.xml index 586fbe6da..75b476c64 100644 --- a/java/res/values-sw600dp/dimens.xml +++ b/java/res/values-sw600dp/dimens.xml @@ -85,8 +85,8 @@ <dimen name="suggestion_text_size">22dp</dimen> <dimen name="more_suggestions_hint_text_size">33dp</dimen> - <!-- Gesture preview trail parameters --> - <dimen name="gesture_preview_trail_width">2.5dp</dimen> + <!-- Gesture trail parameters --> + <dimen name="gesture_trail_width">2.5dp</dimen> <!-- Gesture floating preview text parameters --> <dimen name="gesture_floating_preview_text_size">28dp</dimen> <dimen name="gesture_floating_preview_text_offset">87dp</dimen> diff --git a/java/res/values-sw768dp/dimens.xml b/java/res/values-sw768dp/dimens.xml index 2fd732293..91251f5a4 100644 --- a/java/res/values-sw768dp/dimens.xml +++ b/java/res/values-sw768dp/dimens.xml @@ -86,8 +86,8 @@ <dimen name="suggestion_text_size">22dp</dimen> <dimen name="more_suggestions_hint_text_size">33dp</dimen> - <!-- Gesture preview trail parameters --> - <dimen name="gesture_preview_trail_width">2.5dp</dimen> + <!-- Gesture trail parameters --> + <dimen name="gesture_trail_width">2.5dp</dimen> <!-- Gesture floating preview text parameters --> <dimen name="gesture_floating_preview_text_size">26dp</dimen> <dimen name="gesture_floating_preview_text_offset">86dp</dimen> 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 23b579400..d3a21f2aa 100644 --- a/java/res/values/config.xml +++ b/java/res/values/config.xml @@ -31,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,9 +75,9 @@ <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) --> diff --git a/java/res/values/dimens.xml b/java/res/values/dimens.xml index da735cf5a..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> 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/styles.xml b/java/res/values/styles.xml index dad7e2064..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> @@ -344,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> |
