diff --git a/java/res/drawable-hdpi/keyboard_key_feedback_background_lxx_dark.9.png b/java/res/drawable-hdpi/keyboard_key_feedback_background_lxx_dark.9.png index 306e4554cd598aa3d7349bfd5e1cb31510fc3912..93f300a13c2455d449c67cf658be14899413bc6c 100644 Binary files a/java/res/drawable-hdpi/keyboard_key_feedback_background_lxx_dark.9.png and b/java/res/drawable-hdpi/keyboard_key_feedback_background_lxx_dark.9.png differ diff --git a/java/res/drawable-hdpi/keyboard_key_feedback_background_lxx_light.9.png b/java/res/drawable-hdpi/keyboard_key_feedback_background_lxx_light.9.png index 867f5516db634a72ddd08bc5b41b1b2e8a74c05f..e7c516a0e30b2e74503f1f539801f51da038f471 100644 Binary files a/java/res/drawable-hdpi/keyboard_key_feedback_background_lxx_light.9.png and b/java/res/drawable-hdpi/keyboard_key_feedback_background_lxx_light.9.png differ diff --git a/java/res/drawable-hdpi/keyboard_key_feedback_more_background_lxx_dark.9.png b/java/res/drawable-hdpi/keyboard_key_feedback_more_background_lxx_dark.9.png index b3e6ee7844bcc8ef2d033758ababb9a77c9145cb..b56fcf910d0a6d6208e051b093c44e5c6d494ff4 100644 Binary files a/java/res/drawable-hdpi/keyboard_key_feedback_more_background_lxx_dark.9.png and b/java/res/drawable-hdpi/keyboard_key_feedback_more_background_lxx_dark.9.png differ diff --git a/java/res/drawable-hdpi/keyboard_key_feedback_more_background_lxx_light.9.png b/java/res/drawable-hdpi/keyboard_key_feedback_more_background_lxx_light.9.png index 827f80f132bf92ee48a65aed6b03c1a298691f6d..32005c37b54d2a1d494f16e17d8c7b3478902e48 100644 Binary files a/java/res/drawable-hdpi/keyboard_key_feedback_more_background_lxx_light.9.png and b/java/res/drawable-hdpi/keyboard_key_feedback_more_background_lxx_light.9.png differ diff --git a/java/res/drawable-mdpi/keyboard_key_feedback_background_lxx_dark.9.png b/java/res/drawable-mdpi/keyboard_key_feedback_background_lxx_dark.9.png index 4f6731f601243c7891737132be8fa2ce6e0ba451..1a7dd34ed4c52c9a658c9acf62e4ca543df79f3b 100644 Binary files a/java/res/drawable-mdpi/keyboard_key_feedback_background_lxx_dark.9.png and b/java/res/drawable-mdpi/keyboard_key_feedback_background_lxx_dark.9.png differ diff --git a/java/res/drawable-mdpi/keyboard_key_feedback_background_lxx_light.9.png b/java/res/drawable-mdpi/keyboard_key_feedback_background_lxx_light.9.png index 14da5f919d6b952e522abead20c310f9ff2f6005..268863e68e1acd876c136369af3e8b515258c1e9 100644 Binary files a/java/res/drawable-mdpi/keyboard_key_feedback_background_lxx_light.9.png and b/java/res/drawable-mdpi/keyboard_key_feedback_background_lxx_light.9.png differ diff --git a/java/res/drawable-mdpi/keyboard_key_feedback_more_background_lxx_dark.9.png b/java/res/drawable-mdpi/keyboard_key_feedback_more_background_lxx_dark.9.png index 9bca991b23652858821fe7fce3656318adccd8fa..08d67ef6ab10d07d4261cc836bd4b4699396bb5f 100644 Binary files a/java/res/drawable-mdpi/keyboard_key_feedback_more_background_lxx_dark.9.png and b/java/res/drawable-mdpi/keyboard_key_feedback_more_background_lxx_dark.9.png differ diff --git a/java/res/drawable-mdpi/keyboard_key_feedback_more_background_lxx_light.9.png b/java/res/drawable-mdpi/keyboard_key_feedback_more_background_lxx_light.9.png index 14f4b5f2465de9a2a4e51c0788da983135f01ebc..d0e46b14e43618dedca943959025873a2948802f 100644 Binary files a/java/res/drawable-mdpi/keyboard_key_feedback_more_background_lxx_light.9.png and b/java/res/drawable-mdpi/keyboard_key_feedback_more_background_lxx_light.9.png differ diff --git a/java/res/drawable-xhdpi/keyboard_key_feedback_background_lxx_dark.9.png b/java/res/drawable-xhdpi/keyboard_key_feedback_background_lxx_dark.9.png index 654ccd10ca56866b8f6d684b58cb29e81f7d69d4..f934e33bd071d179ca02322587ca2625d51d248c 100644 Binary files a/java/res/drawable-xhdpi/keyboard_key_feedback_background_lxx_dark.9.png and b/java/res/drawable-xhdpi/keyboard_key_feedback_background_lxx_dark.9.png differ diff --git a/java/res/drawable-xhdpi/keyboard_key_feedback_background_lxx_light.9.png b/java/res/drawable-xhdpi/keyboard_key_feedback_background_lxx_light.9.png index c566e3d7ca76baef5fb3d28f18c4479ed8740245..f70599e99b99954d4deb39ef811a982c8fe740dd 100644 Binary files a/java/res/drawable-xhdpi/keyboard_key_feedback_background_lxx_light.9.png and b/java/res/drawable-xhdpi/keyboard_key_feedback_background_lxx_light.9.png differ diff --git a/java/res/drawable-xhdpi/keyboard_key_feedback_more_background_lxx_dark.9.png b/java/res/drawable-xhdpi/keyboard_key_feedback_more_background_lxx_dark.9.png index f5f613caa61044f8219a3c96dd34a55d36522ef6..fa5ddf2b643d8ba11205d172afd5755cd75b0b53 100644 Binary files a/java/res/drawable-xhdpi/keyboard_key_feedback_more_background_lxx_dark.9.png and b/java/res/drawable-xhdpi/keyboard_key_feedback_more_background_lxx_dark.9.png differ diff --git a/java/res/drawable-xhdpi/keyboard_key_feedback_more_background_lxx_light.9.png b/java/res/drawable-xhdpi/keyboard_key_feedback_more_background_lxx_light.9.png index 35aaa7d7c0be29455139e59415cb8ba24acfa2c7..0da8919b29f9c290fa5a92b06e4a00be7bd86f19 100644 Binary files a/java/res/drawable-xhdpi/keyboard_key_feedback_more_background_lxx_light.9.png and b/java/res/drawable-xhdpi/keyboard_key_feedback_more_background_lxx_light.9.png differ diff --git a/java/res/drawable-xxhdpi/keyboard_key_feedback_background_lxx_dark.9.png b/java/res/drawable-xxhdpi/keyboard_key_feedback_background_lxx_dark.9.png index f5215bc562a75be66ba3bcbce8af1755f3b997b6..1b92455e9f747debfa9abf4c6fdf5b3a17e098ba 100644 Binary files a/java/res/drawable-xxhdpi/keyboard_key_feedback_background_lxx_dark.9.png and b/java/res/drawable-xxhdpi/keyboard_key_feedback_background_lxx_dark.9.png differ diff --git a/java/res/drawable-xxhdpi/keyboard_key_feedback_background_lxx_light.9.png b/java/res/drawable-xxhdpi/keyboard_key_feedback_background_lxx_light.9.png index b565ff07cf9a62cbeadee4780b5c0919db3061c9..3effde3838cb1d8d9cb5406771a26d06ecc5e1b3 100644 Binary files a/java/res/drawable-xxhdpi/keyboard_key_feedback_background_lxx_light.9.png and b/java/res/drawable-xxhdpi/keyboard_key_feedback_background_lxx_light.9.png differ diff --git a/java/res/drawable-xxhdpi/keyboard_key_feedback_more_background_lxx_dark.9.png b/java/res/drawable-xxhdpi/keyboard_key_feedback_more_background_lxx_dark.9.png index 6d931ed42d51e9ad940a62389d94608ff62ba207..55d63309819c2b43a93d402bf314fb450baa457b 100644 Binary files a/java/res/drawable-xxhdpi/keyboard_key_feedback_more_background_lxx_dark.9.png and b/java/res/drawable-xxhdpi/keyboard_key_feedback_more_background_lxx_dark.9.png differ diff --git a/java/res/drawable-xxhdpi/keyboard_key_feedback_more_background_lxx_light.9.png b/java/res/drawable-xxhdpi/keyboard_key_feedback_more_background_lxx_light.9.png index 2c5ced966f1a1aa3e6686f65b7b61de646c072ee..4523be965adec50e0853e5c1559f0dcd395626b1 100644 Binary files a/java/res/drawable-xxhdpi/keyboard_key_feedback_more_background_lxx_light.9.png and b/java/res/drawable-xxhdpi/keyboard_key_feedback_more_background_lxx_light.9.png differ diff --git a/java/res/drawable-xxxhdpi/keyboard_key_feedback_background_lxx_dark.9.png b/java/res/drawable-xxxhdpi/keyboard_key_feedback_background_lxx_dark.9.png index b68d3e87586de5a4623c3cf8b2bde2f67ee24b96..0e08b6b951dcd1b3b9a6bb4cf462e29cb7269d5f 100644 Binary files a/java/res/drawable-xxxhdpi/keyboard_key_feedback_background_lxx_dark.9.png and b/java/res/drawable-xxxhdpi/keyboard_key_feedback_background_lxx_dark.9.png differ diff --git a/java/res/drawable-xxxhdpi/keyboard_key_feedback_background_lxx_light.9.png b/java/res/drawable-xxxhdpi/keyboard_key_feedback_background_lxx_light.9.png index 0da475b802707ea21d1a18bb174f60927b95e886..fb10523d250d64089e60e3fdf44dfb1a3d389fd5 100644 Binary files a/java/res/drawable-xxxhdpi/keyboard_key_feedback_background_lxx_light.9.png and b/java/res/drawable-xxxhdpi/keyboard_key_feedback_background_lxx_light.9.png differ diff --git a/java/res/drawable-xxxhdpi/keyboard_key_feedback_more_background_lxx_dark.9.png b/java/res/drawable-xxxhdpi/keyboard_key_feedback_more_background_lxx_dark.9.png index fa8634064ff2f0aaf447ce67fd45545c6fdc425e..fd88668bb46ec46b0d899087948429ee4c8869ec 100644 Binary files a/java/res/drawable-xxxhdpi/keyboard_key_feedback_more_background_lxx_dark.9.png and b/java/res/drawable-xxxhdpi/keyboard_key_feedback_more_background_lxx_dark.9.png differ diff --git a/java/res/drawable-xxxhdpi/keyboard_key_feedback_more_background_lxx_light.9.png b/java/res/drawable-xxxhdpi/keyboard_key_feedback_more_background_lxx_light.9.png index e3ff4d4ca6b9d61430d10bad2b5746bef8f6f006..ab1bfad7d0dcc64e2b281941d76de9d60137ca75 100644 Binary files a/java/res/drawable-xxxhdpi/keyboard_key_feedback_more_background_lxx_light.9.png and b/java/res/drawable-xxxhdpi/keyboard_key_feedback_more_background_lxx_light.9.png differ diff --git a/java/res/values-land/config.xml b/java/res/values-land/config.xml index a0d12702a1ec29cdb5ce0be7cc430a6fb6a26b74..d36f6a0fc78155b2bff66adf40cad56eefd38e03 100644 --- a/java/res/values-land/config.xml +++ b/java/res/values-land/config.xml @@ -40,7 +40,9 @@ <!-- config_more_keys_keyboard_key_height x -0.5 --> <dimen name="config_more_keys_keyboard_vertical_correction_holo">-22.4dp</dimen> <dimen name="config_key_preview_offset_holo">1.6dp</dimen> - + <dimen name="config_key_preview_height_holo">80dp</dimen> + <dimen name="config_key_preview_offset_lxx">43.6dp</dimen> + <dimen name="config_key_preview_height_lxx">122dp</dimen> <fraction name="config_key_preview_text_ratio">90%</fraction> <fraction name="config_key_letter_ratio_holo">65%</fraction> <fraction name="config_key_letter_ratio_lxx">65%</fraction> diff --git a/java/res/values-sw600dp/config.xml b/java/res/values-sw600dp/config.xml index 0df945fb3cbb5c8402e70f1b18cf20ea344061d3..44e0d063262b024cc88175d57ba69f59c26c36b4 100644 --- a/java/res/values-sw600dp/config.xml +++ b/java/res/values-sw600dp/config.xml @@ -40,9 +40,7 @@ <fraction name="config_key_horizontal_gap_holo">1.565%p</fraction> <!-- config_more_keys_keyboard_key_height x -0.5 --> <dimen name="config_more_keys_keyboard_vertical_correction_holo">-31.5dp</dimen> - <dimen name="config_key_preview_offset_holo">8.0dp</dimen> - <dimen name="config_key_preview_height">94.5dp</dimen> <fraction name="config_key_preview_text_ratio">50%</fraction> <fraction name="config_key_letter_ratio_holo">42%</fraction> <fraction name="config_key_letter_ratio_lxx">50%</fraction> diff --git a/java/res/values-sw768dp-land/config.xml b/java/res/values-sw768dp-land/config.xml index 3d49e4a4e17536d8056aeb05cdf4bc2cda29229e..fdb95c6cc79483bb8bc46d1469c370122af311cc 100644 --- a/java/res/values-sw768dp-land/config.xml +++ b/java/res/values-sw768dp-land/config.xml @@ -29,11 +29,9 @@ <fraction name="config_keyboard_bottom_padding_holo">0.0%p</fraction> <fraction name="config_key_vertical_gap_holo">3.690%p</fraction> <fraction name="config_key_horizontal_gap_holo">1.030%p</fraction> - <dimen name="config_key_preview_offset_holo">8.0dp</dimen> <dimen name="config_more_keys_keyboard_key_height">81.9dp</dimen> - <dimen name="config_key_preview_height">107.1dp</dimen> <fraction name="config_key_letter_ratio_holo">43%</fraction> <fraction name="config_key_letter_ratio_lxx">50%</fraction> <fraction name="config_key_large_letter_ratio_holo">42%</fraction> diff --git a/java/res/values-sw768dp/config.xml b/java/res/values-sw768dp/config.xml index 1863e1e70d97afad4151d90bd42652d53dd423d7..13be6bedfd7a64baf14a4a25b574f9c22aff7c80 100644 --- a/java/res/values-sw768dp/config.xml +++ b/java/res/values-sw768dp/config.xml @@ -32,7 +32,6 @@ <fraction name="config_key_horizontal_gap_holo">1.066%p</fraction> <!-- config_more_keys_keyboard_key_height x -0.5 --> <dimen name="config_more_keys_keyboard_vertical_correction_holo">-31.5dp</dimen> - <dimen name="config_key_preview_offset_holo">8.0dp</dimen> <dimen name="config_more_keys_keyboard_key_height">63.0dp</dimen> <dimen name="config_more_keys_keyboard_key_horizontal_padding">12dp</dimen> @@ -40,7 +39,6 @@ <!-- config_more_keys_keyboard_key_height x 1.2 --> <dimen name="config_more_keys_keyboard_slide_allowance">98.3dp</dimen> - <dimen name="config_key_preview_height">94.5dp</dimen> <fraction name="config_key_preview_text_ratio">50%</fraction> <fraction name="config_key_letter_ratio_holo">40%</fraction> <fraction name="config_key_letter_ratio_lxx">50%</fraction> diff --git a/java/res/values/config.xml b/java/res/values/config.xml index 16826f6c787bf3d2e7fd56a8ca6369bf08a53977..40760f686acacf5d6d26165fb6913a75a3df74ad 100644 --- a/java/res/values/config.xml +++ b/java/res/values/config.xml @@ -43,8 +43,9 @@ <!-- config_more_keys_keyboard_key_height x -0.5 --> <dimen name="config_more_keys_keyboard_vertical_correction_holo">-26.4dp</dimen> <dimen name="config_key_preview_offset_holo">8.0dp</dimen> - - <dimen name="config_key_preview_height">80dp</dimen> + <dimen name="config_key_preview_height_holo">80dp</dimen> + <dimen name="config_key_preview_offset_lxx">50.0dp</dimen> + <dimen name="config_key_preview_height_lxx">122dp</dimen> <fraction name="config_key_preview_text_ratio">82%</fraction> <fraction name="config_key_letter_ratio_holo">55%</fraction> <fraction name="config_key_letter_ratio_lxx">55%</fraction> diff --git a/java/res/values/themes-common.xml b/java/res/values/themes-common.xml index 87dcb77326c6865f07313454182f38501974ec35..110f6b792343469c79986bf40b0e2c646e86e2bf 100644 --- a/java/res/values/themes-common.xml +++ b/java/res/values/themes-common.xml @@ -75,7 +75,6 @@ <item name="keyRepeatInterval">@integer/config_key_repeat_interval</item> <item name="longPressShiftLockTimeout">@integer/config_longpress_shift_lock_timeout</item> <item name="ignoreAltCodeKeyTimeout">@integer/config_ignore_alt_code_key_timeout</item> - <item name="keyPreviewHeight">@dimen/config_key_preview_height</item> <!-- TODO: consolidate key preview linger timeout with the key preview animation parameters. --> <item name="keyPreviewLingerTimeout">@integer/config_key_preview_linger_timeout</item> <item name="moreKeysKeyboardLayout">@layout/more_keys_keyboard</item> diff --git a/java/res/values/themes-ics.xml b/java/res/values/themes-ics.xml index 9e656dd745661b169235daa3ac34a9f346493622..bfbac0a942bc74b1e818dbd0d7f8d31e3e6b5ac8 100644 --- a/java/res/values/themes-ics.xml +++ b/java/res/values/themes-ics.xml @@ -60,6 +60,7 @@ parent="KeyboardView.ICS" > <item name="keyPreviewBackground">@drawable/keyboard_key_feedback_ics</item> + <item name="keyPreviewHeight">@dimen/config_key_preview_height_holo</item> <item name="keyPreviewOffset">@dimen/config_key_preview_offset_holo</item> <item name="keyPreviewShowUpAnimator">@anim/key_preview_show_up_holo</item> <item name="keyPreviewDismissAnimator">@anim/key_preview_dismiss_holo</item> diff --git a/java/res/values/themes-klp.xml b/java/res/values/themes-klp.xml index c6319bc4ef537c3515f5a4f28591778cf245720d..36b1fc117de4384970f80396739f5602cf1f5380 100644 --- a/java/res/values/themes-klp.xml +++ b/java/res/values/themes-klp.xml @@ -60,6 +60,7 @@ parent="KeyboardView.KLP" > <item name="keyPreviewBackground">@drawable/keyboard_key_feedback_klp</item> + <item name="keyPreviewHeight">@dimen/config_key_preview_height_holo</item> <item name="keyPreviewOffset">@dimen/config_key_preview_offset_holo</item> <item name="keyPreviewShowUpAnimator">@anim/key_preview_show_up_holo</item> <item name="keyPreviewDismissAnimator">@anim/key_preview_dismiss_holo</item> diff --git a/java/res/values/themes-lxx-dark.xml b/java/res/values/themes-lxx-dark.xml index 5b2681359739f4271804042b414c74fe33f6983e..67f94f3297ef93e9ed42db4a415655ba9b771018 100644 --- a/java/res/values/themes-lxx-dark.xml +++ b/java/res/values/themes-lxx-dark.xml @@ -60,7 +60,8 @@ > <item name="moreKeysKeyboardForActionLayout">@layout/more_keys_keyboard_for_action_lxx</item> <item name="keyPreviewBackground">@drawable/keyboard_key_feedback_lxx_dark</item> - <item name="keyPreviewOffset">@dimen/config_key_preview_offset_holo</item> + <item name="keyPreviewHeight">@dimen/config_key_preview_height_lxx</item> + <item name="keyPreviewOffset">@dimen/config_key_preview_offset_lxx</item> <item name="keyPreviewShowUpAnimator">@anim/key_preview_show_up_lxx</item> <item name="keyPreviewDismissAnimator">@anim/key_preview_dismiss_lxx</item> <item name="gestureFloatingPreviewTextColor">@color/auto_correct_color_lxx_dark</item> diff --git a/java/res/values/themes-lxx-light.xml b/java/res/values/themes-lxx-light.xml index f607807c8c7bd8ec212d900362fbbbe2d0cea21e..be817f46a5efe6618bf94fa6badad7c6d698039e 100644 --- a/java/res/values/themes-lxx-light.xml +++ b/java/res/values/themes-lxx-light.xml @@ -60,7 +60,8 @@ > <item name="moreKeysKeyboardForActionLayout">@layout/more_keys_keyboard_for_action_lxx</item> <item name="keyPreviewBackground">@drawable/keyboard_key_feedback_lxx_light</item> - <item name="keyPreviewOffset">@dimen/config_key_preview_offset_holo</item> + <item name="keyPreviewHeight">@dimen/config_key_preview_height_lxx</item> + <item name="keyPreviewOffset">@dimen/config_key_preview_offset_lxx</item> <item name="keyPreviewShowUpAnimator">@anim/key_preview_show_up_lxx</item> <item name="keyPreviewDismissAnimator">@anim/key_preview_dismiss_lxx</item> <item name="gestureFloatingPreviewTextColor">@color/auto_correct_color_lxx_light</item>