[FIX] Separate form factor dependent config resources
This is a cherry-pick of I668b55a514.
Change-Id: I00e9a74812d622c12af0337ba50e1b2f1d675cf1
diff --git a/java/res/values-sw540dp/config.xml b/java/res/values-sw540dp/config.xml
index 09fe7d3..8637d6b 100644
--- a/java/res/values-sw540dp/config.xml
+++ b/java/res/values-sw540dp/config.xml
@@ -20,16 +20,7 @@
<!-- Configuration values for Large Phone and Small Tablet Portrait. -->
<resources>
- <bool name="config_enable_show_key_preview_popup_option">false</bool>
- <!-- Whether or not Popup on key press is enabled by default -->
- <bool name="config_default_key_preview_popup">false</bool>
- <bool name="config_default_sound_enabled">true</bool>
-
<dimen name="config_key_hysteresis_distance">40.0dp</dimen>
- <bool name="config_key_selection_by_dragging_finger">false</bool>
- <!-- 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>
<!-- Preferable keyboard height in absolute scale: 48.0mm -->
<!-- This config_default_keyboard_height value should match with keyboard-heights.xml -->
@@ -38,29 +29,29 @@
<fraction name="config_min_keyboard_height">-35.0%p</fraction>
<dimen name="config_more_keys_keyboard_key_height">63.0dp</dimen>
+ <dimen name="config_more_keys_keyboard_key_horizontal_padding">6dp</dimen>
+ <!-- Amount of allowance for selecting keys in a mini popup keyboard by sliding finger. -->
+ <!-- config_more_keys_keyboard_key_height x 1.2 -->
+ <dimen name="config_more_keys_keyboard_slide_allowance">98.3dp</dimen>
<fraction name="config_keyboard_top_padding_gb">2.291%p</fraction>
<fraction name="config_keyboard_bottom_padding_gb">0.0%p</fraction>
<fraction name="config_key_vertical_gap_gb">4.625%p</fraction>
<fraction name="config_key_horizontal_gap_gb">2.113%p</fraction>
+ <!-- config_more_keys_keyboard_key_height x -1.0 -->
+ <dimen name="config_more_keys_keyboard_vertical_correction_gb">-81.9dp</dimen>
+ <dimen name="config_key_preview_offset_gb">16.0dp</dimen>
<fraction name="config_keyboard_top_padding_holo">2.335%p</fraction>
<fraction name="config_keyboard_bottom_padding_holo">4.0%p</fraction>
<fraction name="config_key_vertical_gap_holo">4.5%p</fraction>
<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_more_keys_keyboard_key_horizontal_padding">6dp</dimen>
- <!-- Amount of allowance for selecting keys in a mini popup keyboard by sliding finger. -->
- <!-- config_more_keys_keyboard_key_height x 1.2 -->
- <dimen name="config_more_keys_keyboard_slide_allowance">98.3dp</dimen>
- <!-- config_more_keys_keyboard_key_height x -1.0 -->
- <dimen name="config_more_keys_keyboard_vertical_correction_gb">-81.9dp</dimen>
-
- <!-- left or right padding of label alignment -->
- <dimen name="config_key_label_horizontal_padding">6dp</dimen>
- <dimen name="config_key_hint_letter_padding">3dp</dimen>
- <dimen name="config_key_shifted_letter_hint_padding">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">42%</fraction>
<fraction name="config_key_large_letter_ratio">45%</fraction>
<fraction name="config_key_label_ratio">25%</fraction>
@@ -68,20 +59,17 @@
<fraction name="config_key_hint_letter_ratio">23%</fraction>
<fraction name="config_key_hint_label_ratio">28%</fraction>
<fraction name="config_key_shifted_letter_hint_ratio">22%</fraction>
- <fraction name="config_key_preview_text_ratio">50%</fraction>
<fraction name="config_language_on_spacebar_text_ratio">28.0%</fraction>
- <dimen name="config_key_preview_height">94.5dp</dimen>
- <dimen name="config_key_preview_offset_gb">16.0dp</dimen>
+ <!-- left or right padding of label alignment -->
+ <dimen name="config_key_label_horizontal_padding">6dp</dimen>
+ <dimen name="config_key_hint_letter_padding">3dp</dimen>
+ <dimen name="config_key_shifted_letter_hint_padding">3dp</dimen>
<!-- For 5-row keyboard -->
<fraction name="config_key_vertical_gap_5row">3.20%p</fraction>
<fraction name="config_key_letter_ratio_5row">52%</fraction>
<fraction name="config_key_shifted_letter_hint_ratio_5row">27%</fraction>
- <dimen name="config_key_preview_offset_holo">8.0dp</dimen>
- <!-- config_more_keys_keyboard_key_height x -0.5 -->
- <dimen name="config_more_keys_keyboard_vertical_correction_holo">-31.5dp</dimen>
-
<dimen name="config_suggestions_strip_height">44dp</dimen>
<dimen name="config_more_suggestions_row_height">44dp</dimen>
<integer name="config_max_more_suggestions_row">6</integer>