From 5b9a1e59bb7434cce740616c64e274a130a66ee6 Mon Sep 17 00:00:00 2001
From: "Tadashi G. Takaoka" <takaoka@google.com>
Date: Mon, 8 Sep 2014 14:12:48 +0900
Subject: Fix key preview popup for Material theme

This CL also removes unused key preview resources for Tablet.

Bug: 15143928
Change-Id: Icbf4f7b6d5c7839b4fe7a27d320a2184f0625130
---
 .../keyboard_key_feedback_background_lxx_dark.9.png   | Bin 774 -> 937 bytes
 .../keyboard_key_feedback_background_lxx_light.9.png  | Bin 714 -> 901 bytes
 ...yboard_key_feedback_more_background_lxx_dark.9.png | Bin 1020 -> 1199 bytes
 ...board_key_feedback_more_background_lxx_light.9.png | Bin 974 -> 1123 bytes
 .../keyboard_key_feedback_background_lxx_dark.9.png   | Bin 517 -> 580 bytes
 .../keyboard_key_feedback_background_lxx_light.9.png  | Bin 494 -> 553 bytes
 ...yboard_key_feedback_more_background_lxx_dark.9.png | Bin 658 -> 716 bytes
 ...board_key_feedback_more_background_lxx_light.9.png | Bin 643 -> 709 bytes
 .../keyboard_key_feedback_background_lxx_dark.9.png   | Bin 1073 -> 1312 bytes
 .../keyboard_key_feedback_background_lxx_light.9.png  | Bin 943 -> 1166 bytes
 ...yboard_key_feedback_more_background_lxx_dark.9.png | Bin 1304 -> 1564 bytes
 ...board_key_feedback_more_background_lxx_light.9.png | Bin 1218 -> 1443 bytes
 .../keyboard_key_feedback_background_lxx_dark.9.png   | Bin 1751 -> 2162 bytes
 .../keyboard_key_feedback_background_lxx_light.9.png  | Bin 1573 -> 1975 bytes
 ...yboard_key_feedback_more_background_lxx_dark.9.png | Bin 2164 -> 2584 bytes
 ...board_key_feedback_more_background_lxx_light.9.png | Bin 2000 -> 2381 bytes
 .../keyboard_key_feedback_background_lxx_dark.9.png   | Bin 3102 -> 3475 bytes
 .../keyboard_key_feedback_background_lxx_light.9.png  | Bin 2896 -> 3259 bytes
 ...yboard_key_feedback_more_background_lxx_dark.9.png | Bin 3460 -> 3883 bytes
 ...board_key_feedback_more_background_lxx_light.9.png | Bin 3270 -> 3682 bytes
 java/res/values-land/config.xml                       |   4 +++-
 java/res/values-sw600dp/config.xml                    |   2 --
 java/res/values-sw768dp-land/config.xml               |   2 --
 java/res/values-sw768dp/config.xml                    |   2 --
 java/res/values/config.xml                            |   5 +++--
 java/res/values/themes-common.xml                     |   1 -
 java/res/values/themes-ics.xml                        |   1 +
 java/res/values/themes-klp.xml                        |   1 +
 java/res/values/themes-lxx-dark.xml                   |   3 ++-
 java/res/values/themes-lxx-light.xml                  |   3 ++-
 30 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'java')

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 306e4554c..93f300a13 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 867f5516d..e7c516a0e 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 b3e6ee784..b56fcf910 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 827f80f13..32005c37b 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 4f6731f60..1a7dd34ed 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 14da5f919..268863e68 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 9bca991b2..08d67ef6a 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 14f4b5f24..d0e46b14e 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 654ccd10c..f934e33bd 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 c566e3d7c..f70599e99 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 f5f613caa..fa5ddf2b6 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 35aaa7d7c..0da8919b2 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 f5215bc56..1b92455e9 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 b565ff07c..3effde383 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 6d931ed42..55d633098 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 2c5ced966..4523be965 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 b68d3e875..0e08b6b95 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 0da475b80..fb10523d2 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 fa8634064..fd88668bb 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 e3ff4d4ca..ab1bfad7d 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 a0d12702a..d36f6a0fc 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 0df945fb3..44e0d0632 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 3d49e4a4e..fdb95c6cc 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 1863e1e70..13be6bedf 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 16826f6c7..40760f686 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 87dcb7732..110f6b792 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 9e656dd74..bfbac0a94 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 c6319bc4e..36b1fc117 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 5b2681359..67f94f329 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 f607807c8..be817f46a 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>
-- 
cgit v1.2.3-83-g751a