Fix popup key preview on 7/11 inch tablet
Change-Id: I42b4c0c7a554089baa778205da0627daaff667c6
diff --git a/java/res/drawable-sw600dp-hdpi/keyboard_key_feedback_background_holo.9.png b/java/res/drawable-sw600dp-hdpi/keyboard_key_feedback_background_holo.9.png
deleted file mode 100644
index 39219a5..0000000
--- a/java/res/drawable-sw600dp-hdpi/keyboard_key_feedback_background_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/java/res/drawable-sw600dp-hdpi/keyboard_key_feedback_more_background_holo.9.png b/java/res/drawable-sw600dp-hdpi/keyboard_key_feedback_more_background_holo.9.png
deleted file mode 100644
index e5cc5b7..0000000
--- a/java/res/drawable-sw600dp-hdpi/keyboard_key_feedback_more_background_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/java/res/drawable-sw600dp-mdpi/keyboard_key_feedback_background_holo.9.png b/java/res/drawable-sw600dp-mdpi/keyboard_key_feedback_background_holo.9.png
deleted file mode 100644
index 5f15217..0000000
--- a/java/res/drawable-sw600dp-mdpi/keyboard_key_feedback_background_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/java/res/drawable-sw600dp-mdpi/keyboard_key_feedback_more_background_holo.9.png b/java/res/drawable-sw600dp-mdpi/keyboard_key_feedback_more_background_holo.9.png
deleted file mode 100644
index 77a806c..0000000
--- a/java/res/drawable-sw600dp-mdpi/keyboard_key_feedback_more_background_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/java/res/drawable-sw600dp-xhdpi/keyboard_key_feedback_background_holo.9.png b/java/res/drawable-sw600dp-xhdpi/keyboard_key_feedback_background_holo.9.png
deleted file mode 100644
index 8d43a4b..0000000
--- a/java/res/drawable-sw600dp-xhdpi/keyboard_key_feedback_background_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/java/res/drawable-sw600dp-xhdpi/keyboard_key_feedback_more_background_holo.9.png b/java/res/drawable-sw600dp-xhdpi/keyboard_key_feedback_more_background_holo.9.png
deleted file mode 100644
index e973c7e..0000000
--- a/java/res/drawable-sw600dp-xhdpi/keyboard_key_feedback_more_background_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/java/res/drawable-sw768dp-hdpi/keyboard_key_feedback_background_holo.9.png b/java/res/drawable-sw768dp-hdpi/keyboard_key_feedback_background_holo.9.png
deleted file mode 100644
index 099a508..0000000
--- a/java/res/drawable-sw768dp-hdpi/keyboard_key_feedback_background_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/java/res/drawable-sw768dp-hdpi/keyboard_key_feedback_more_background_holo.9.png b/java/res/drawable-sw768dp-hdpi/keyboard_key_feedback_more_background_holo.9.png
deleted file mode 100644
index c21240f..0000000
--- a/java/res/drawable-sw768dp-hdpi/keyboard_key_feedback_more_background_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/java/res/drawable-sw768dp-mdpi/keyboard_key_feedback_background_holo.9.png b/java/res/drawable-sw768dp-mdpi/keyboard_key_feedback_background_holo.9.png
deleted file mode 100644
index 286cf84..0000000
--- a/java/res/drawable-sw768dp-mdpi/keyboard_key_feedback_background_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/java/res/drawable-sw768dp-mdpi/keyboard_key_feedback_more_background_holo.9.png b/java/res/drawable-sw768dp-mdpi/keyboard_key_feedback_more_background_holo.9.png
deleted file mode 100644
index e3f5be8..0000000
--- a/java/res/drawable-sw768dp-mdpi/keyboard_key_feedback_more_background_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/java/res/drawable-sw768dp-xhdpi/keyboard_key_feedback_background_holo.9.png b/java/res/drawable-sw768dp-xhdpi/keyboard_key_feedback_background_holo.9.png
deleted file mode 100644
index 38c84e8..0000000
--- a/java/res/drawable-sw768dp-xhdpi/keyboard_key_feedback_background_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/java/res/drawable-sw768dp-xhdpi/keyboard_key_feedback_more_background_holo.9.png b/java/res/drawable-sw768dp-xhdpi/keyboard_key_feedback_more_background_holo.9.png
deleted file mode 100644
index f66e545..0000000
--- a/java/res/drawable-sw768dp-xhdpi/keyboard_key_feedback_more_background_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/java/res/values-sw600dp-land/dimens.xml b/java/res/values-sw600dp-land/dimens.xml
index 9da8f89..6e583e3 100644
--- a/java/res/values-sw600dp-land/dimens.xml
+++ b/java/res/values-sw600dp-land/dimens.xml
@@ -33,8 +33,6 @@
<dimen name="keyboard_top_padding_ics">1.1mm</dimen>
<dimen name="keyboard_bottom_padding_ics">0.0mm</dimen>
<dimen name="popup_key_height">13.0mm</dimen>
- <!-- key_height x 1.0 -->
- <dimen name="key_preview_height">13.0mm</dimen>
<fraction name="key_letter_ratio">45%</fraction>
<fraction name="key_label_ratio">32%</fraction>
diff --git a/java/res/values-sw600dp/config.xml b/java/res/values-sw600dp/config.xml
index c2c0c25..75c0edf 100644
--- a/java/res/values-sw600dp/config.xml
+++ b/java/res/values-sw600dp/config.xml
@@ -20,7 +20,6 @@
<resources>
<bool name="config_enable_show_settings_key_option">true</bool>
- <bool name="config_enable_show_subtype_settings">false</bool>
<bool name="config_enable_show_voice_key_option">false</bool>
<bool name="config_enable_show_popup_on_keypress_option">false</bool>
<bool name="config_enable_show_recorrection_option">false</bool>
diff --git a/java/res/values-sw600dp/dimens.xml b/java/res/values-sw600dp/dimens.xml
index 6c67746..274b62b 100644
--- a/java/res/values-sw600dp/dimens.xml
+++ b/java/res/values-sw600dp/dimens.xml
@@ -34,8 +34,6 @@
<dimen name="key_horizontal_gap_ics">1.0mm</dimen>
<dimen name="keyboard_top_padding_ics">1.1mm</dimen>
<dimen name="keyboard_bottom_padding_ics">0.0mm</dimen>
- <!-- key_height x 1.0 -->
- <dimen name="key_preview_height">13.0mm</dimen>
<dimen name="mini_keyboard_key_horizontal_padding">12dip</dimen>
<!-- Amount of allowance for selecting keys in a mini popup keyboard by sliding finger. -->
<!-- popup_key_height x 1.2 -->
@@ -47,7 +45,10 @@
<fraction name="key_label_ratio">22%</fraction>
<fraction name="key_hint_letter_ratio">23%</fraction>
<fraction name="key_uppercase_letter_ratio">25%</fraction>
- <fraction name="key_preview_text_ratio">82%</fraction>
+ <fraction name="key_preview_text_ratio">50%</fraction>
+ <dimen name="key_preview_height">15.0mm</dimen>
+ <dimen name="key_preview_offset">0.1in</dimen>
+ <dimen name="key_preview_offset_ics">0.05in</dimen>
<!-- left or right padding of label alignment -->
<dimen name="key_label_horizontal_alignment_padding">6dip</dimen>
diff --git a/java/res/values-sw768dp-land/dimens.xml b/java/res/values-sw768dp-land/dimens.xml
index a6cd85b..74eb08a 100644
--- a/java/res/values-sw768dp-land/dimens.xml
+++ b/java/res/values-sw768dp-land/dimens.xml
@@ -39,6 +39,7 @@
<fraction name="key_label_ratio">26%</fraction>
<fraction name="key_hint_letter_ratio">23%</fraction>
<fraction name="key_uppercase_letter_ratio">24%</fraction>
+ <dimen name="key_preview_height">17.0mm</dimen>
<!-- left or right padding of label alignment -->
<dimen name="key_label_horizontal_alignment_padding">18dip</dimen>
<dimen name="key_preview_height_holo">26.5mm</dimen>
diff --git a/java/res/values-sw768dp/config.xml b/java/res/values-sw768dp/config.xml
index dc4c287..4025b0e 100644
--- a/java/res/values-sw768dp/config.xml
+++ b/java/res/values-sw768dp/config.xml
@@ -21,8 +21,7 @@
<resources>
<bool name="config_enable_show_settings_key_option">false</bool>
<bool name="config_enable_show_voice_key_option">false</bool>
- <!-- TODO: This configuration value is temporary set true to check popup preview behavior. -->
- <bool name="config_enable_show_popup_on_keypress_option">true</bool>
+ <bool name="config_enable_show_popup_on_keypress_option">false</bool>
<bool name="config_enable_show_recorrection_option">false</bool>
<bool name="config_enable_quick_fixes_option">false</bool>
<bool name="config_enable_bigram_suggestions_option">false</bool>
@@ -32,7 +31,7 @@
<!-- Whether or not Popup on key press is enabled by default -->
<bool name="config_default_popup_preview">false</bool>
<bool name="config_default_sound_enabled">true</bool>
- <bool name="config_auto_correction_spacebar_led_enabled">true</bool>
+ <bool name="config_auto_correction_spacebar_led_enabled">false</bool>
<bool name="config_use_spacebar_language_switcher">false</bool>
<!-- Showing mini keyboard, just above the touched point if true, aligned to the key if false -->
<bool name="config_show_mini_keyboard_at_touched_point">true</bool>
diff --git a/java/res/values-sw768dp/dimens.xml b/java/res/values-sw768dp/dimens.xml
index 8152673..b5d5a84 100644
--- a/java/res/values-sw768dp/dimens.xml
+++ b/java/res/values-sw768dp/dimens.xml
@@ -47,11 +47,12 @@
<fraction name="key_label_ratio">26%</fraction>
<fraction name="key_hint_letter_ratio">23%</fraction>
<fraction name="key_uppercase_letter_ratio">25%</fraction>
+ <fraction name="key_preview_text_ratio">50%</fraction>
+ <dimen name="key_preview_height">15.0mm</dimen>
+ <dimen name="key_preview_offset">0.1in</dimen>
+ <dimen name="key_preview_offset_ics">0.05in</dimen>
<!-- left or right padding of label alignment -->
<dimen name="key_label_horizontal_alignment_padding">6dip</dimen>
- <fraction name="key_preview_text_ratio">26.3%</fraction>
- <dimen name="key_preview_height_holo">23.0mm</dimen>
- <dimen name="key_preview_offset_holo">8.0mm</dimen>
<dimen name="candidate_strip_height">46dip</dimen>
<!-- candidate_strip_minimum_height =
diff --git a/java/res/values/dimens.xml b/java/res/values/dimens.xml
index 665245c..54256de 100644
--- a/java/res/values/dimens.xml
+++ b/java/res/values/dimens.xml
@@ -55,9 +55,9 @@
<fraction name="key_uppercase_letter_ratio">35%</fraction>
<!-- left or right padding of label alignment -->
<dimen name="key_label_horizontal_alignment_padding">21dip</dimen>
+ <fraction name="key_preview_text_ratio">82%</fraction>
<dimen name="key_preview_height">80sp</dimen>
<dimen name="key_preview_offset">0.1in</dimen>
- <fraction name="key_preview_text_ratio">82%</fraction>
<dimen name="key_preview_offset_ics">0.05in</dimen>
<dimen name="candidate_strip_height">42dip</dimen>
