diff --git a/java/res/values-land/config.xml b/java/res/values-land/config.xml
index 8cf7d95afa0158a2700ef755b30004665e86423c..2cfca486b7b0f3f621a33de379810d6498097943 100644
--- a/java/res/values-land/config.xml
+++ b/java/res/values-land/config.xml
@@ -21,4 +21,67 @@
<!-- Configuration values for Small Phone Landscape. -->
<resources>
<bool name="config_use_fullscreen_mode">true</bool>
+
+ <!-- TODO: Add config_ prefix to the following resources that have been merged from dimens.xml -->
+
+ <!-- Preferable keyboard height in absolute scale: 1.100in -->
+ <!-- This keyboardHeight value should match with keyboard-heights.xml -->
+ <dimen name="keyboardHeight">176.0dp</dimen>
+ <fraction name="minKeyboardHeight">45%p</fraction>
+ <!-- key_height + key_bottom_gap = popup_key_height -->
+ <dimen name="popup_key_height">44.8dp</dimen>
+
+ <fraction name="keyboard_top_padding_gb">1.818%p</fraction>
+ <fraction name="keyboard_bottom_padding_gb">0.0%p</fraction>
+ <fraction name="key_bottom_gap_gb">5.941%p</fraction>
+ <fraction name="key_horizontal_gap_gb">0.997%p</fraction>
+
+ <fraction name="keyboard_top_padding_holo">2.727%p</fraction>
+ <fraction name="keyboard_bottom_padding_holo">0.0%p</fraction>
+ <fraction name="key_bottom_gap_holo">5.368%p</fraction>
+ <fraction name="key_horizontal_gap_holo">1.020%p</fraction>
+
+ <!-- left or right padding of label alignment -->
+ <dimen name="key_label_horizontal_padding">8dp</dimen>
+
+ <fraction name="key_letter_ratio">65%</fraction>
+ <fraction name="key_large_letter_ratio">74%</fraction>
+ <fraction name="key_label_ratio">40%</fraction>
+ <fraction name="key_hint_letter_ratio">30%</fraction>
+ <fraction name="key_hint_label_ratio">52%</fraction>
+ <fraction name="key_uppercase_letter_ratio">40%</fraction>
+ <fraction name="key_preview_text_ratio">90%</fraction>
+ <fraction name="spacebar_text_ratio">40.000%</fraction>
+ <dimen name="key_preview_offset_gb">0.0dp</dimen>
+
+ <!-- For 5-row keyboard -->
+ <fraction name="key_bottom_gap_5row">3.20%p</fraction>
+ <fraction name="key_letter_ratio_5row">78%</fraction>
+ <fraction name="key_uppercase_letter_ratio_5row">48%</fraction>
+
+ <dimen name="key_preview_offset_holo">1.6dp</dimen>
+ <!-- popup_key_height x -0.5 -->
+ <dimen name="more_keys_keyboard_vertical_correction_holo">-22.4dp</dimen>
+
+ <dimen name="suggestions_strip_height">36dp</dimen>
+ <dimen name="more_suggestions_row_height">36dp</dimen>
+ <integer name="max_more_suggestions_row">2</integer>
+ <fraction name="min_more_suggestions_width">60%</fraction>
+ <!-- Amount of allowance for selecting keys in a mini popup keyboard by sliding finger. -->
+ <!-- popup_key_height x 1.2 -->
+ <dimen name="more_keys_keyboard_slide_allowance">53.76dp</dimen>
+ <!-- popup_key_height x -1.0 -->
+ <dimen name="more_keys_keyboard_vertical_correction_gb">-44.8dp</dimen>
+
+ <!-- Gesture floating preview text parameters -->
+ <dimen name="gesture_floating_preview_text_size">23dp</dimen>
+ <dimen name="gesture_floating_preview_text_offset">54dp</dimen>
+ <dimen name="gesture_floating_preview_horizontal_padding">23dp</dimen>
+ <dimen name="gesture_floating_preview_vertical_padding">15dp</dimen>
+
+ <!-- Emoji keyboard -->
+ <fraction name="emoji_keyboard_key_width">10%p</fraction>
+ <fraction name="emoji_keyboard_row_height">50%p</fraction>
+ <fraction name="emoji_keyboard_key_letter_size">54%p</fraction>
+ <integer name="emoji_keyboard_max_key_count">20</integer>
</resources>
diff --git a/java/res/values-land/dimens.xml b/java/res/values-land/dimens.xml
deleted file mode 100644
index c2b360a429a53fd1ed9a4c4520df04c02d448730..0000000000000000000000000000000000000000
--- a/java/res/values-land/dimens.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2008, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-** http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<!-- Configurable dimensions for Small Phone Landscape. -->
-<resources>
- <!-- Preferable keyboard height in absolute scale: 1.100in -->
- <!-- This keyboardHeight value should match with keyboard-heights.xml -->
- <dimen name="keyboardHeight">176.0dp</dimen>
- <fraction name="minKeyboardHeight">45%p</fraction>
- <!-- key_height + key_bottom_gap = popup_key_height -->
- <dimen name="popup_key_height">44.8dp</dimen>
-
- <fraction name="keyboard_top_padding_gb">1.818%p</fraction>
- <fraction name="keyboard_bottom_padding_gb">0.0%p</fraction>
- <fraction name="key_bottom_gap_gb">5.941%p</fraction>
- <fraction name="key_horizontal_gap_gb">0.997%p</fraction>
-
- <fraction name="keyboard_top_padding_holo">2.727%p</fraction>
- <fraction name="keyboard_bottom_padding_holo">0.0%p</fraction>
- <fraction name="key_bottom_gap_holo">5.368%p</fraction>
- <fraction name="key_horizontal_gap_holo">1.020%p</fraction>
-
- <!-- left or right padding of label alignment -->
- <dimen name="key_label_horizontal_padding">8dp</dimen>
-
- <fraction name="key_letter_ratio">65%</fraction>
- <fraction name="key_large_letter_ratio">74%</fraction>
- <fraction name="key_label_ratio">40%</fraction>
- <fraction name="key_hint_letter_ratio">30%</fraction>
- <fraction name="key_hint_label_ratio">52%</fraction>
- <fraction name="key_uppercase_letter_ratio">40%</fraction>
- <fraction name="key_preview_text_ratio">90%</fraction>
- <fraction name="spacebar_text_ratio">40.000%</fraction>
- <dimen name="key_preview_offset_gb">0.0dp</dimen>
-
- <!-- For 5-row keyboard -->
- <fraction name="key_bottom_gap_5row">3.20%p</fraction>
- <fraction name="key_letter_ratio_5row">78%</fraction>
- <fraction name="key_uppercase_letter_ratio_5row">48%</fraction>
-
- <dimen name="key_preview_offset_holo">1.6dp</dimen>
- <!-- popup_key_height x -0.5 -->
- <dimen name="more_keys_keyboard_vertical_correction_holo">-22.4dp</dimen>
-
- <dimen name="suggestions_strip_height">36dp</dimen>
- <dimen name="more_suggestions_row_height">36dp</dimen>
- <integer name="max_more_suggestions_row">2</integer>
- <fraction name="min_more_suggestions_width">60%</fraction>
- <!-- Amount of allowance for selecting keys in a mini popup keyboard by sliding finger. -->
- <!-- popup_key_height x 1.2 -->
- <dimen name="more_keys_keyboard_slide_allowance">53.76dp</dimen>
- <!-- popup_key_height x -1.0 -->
- <dimen name="more_keys_keyboard_vertical_correction_gb">-44.8dp</dimen>
-
- <!-- Gesture floating preview text parameters -->
- <dimen name="gesture_floating_preview_text_size">23dp</dimen>
- <dimen name="gesture_floating_preview_text_offset">54dp</dimen>
- <dimen name="gesture_floating_preview_horizontal_padding">23dp</dimen>
- <dimen name="gesture_floating_preview_vertical_padding">15dp</dimen>
-
- <!-- Emoji keyboard -->
- <fraction name="emoji_keyboard_key_width">10%p</fraction>
- <fraction name="emoji_keyboard_row_height">50%p</fraction>
- <fraction name="emoji_keyboard_key_letter_size">54%p</fraction>
- <integer name="emoji_keyboard_max_key_count">20</integer>
-
-</resources>
diff --git a/java/res/values-sw540dp-land/config.xml b/java/res/values-sw540dp-land/config.xml
index 796f148388f96a216c39f730cc652efe4127d9d3..03c23cecc88a47a70863ced2ca3645e8f6e22370 100644
--- a/java/res/values-sw540dp-land/config.xml
+++ b/java/res/values-sw540dp-land/config.xml
@@ -21,4 +21,56 @@
<!-- Configuration values for Large Phone and Small Tablet Landscape. -->
<resources>
<bool name="config_use_fullscreen_mode">false</bool>
+
+ <!-- TODO: Add config_ prefix to the following resources that have been merged from dimens.xml -->
+
+ <!-- Preferable keyboard height in absolute scale: 45.0mm -->
+ <!-- This keyboardHeight value should match with keyboard-heights.xml -->
+ <dimen name="keyboardHeight">283.5dp</dimen>
+ <fraction name="minKeyboardHeight">45%p</fraction>
+
+ <fraction name="keyboard_top_padding_gb">2.444%p</fraction>
+ <fraction name="keyboard_bottom_padding_gb">0.0%p</fraction>
+ <fraction name="key_bottom_gap_gb">5.200%p</fraction>
+ <fraction name="key_horizontal_gap_gb">1.447%p</fraction>
+
+ <fraction name="keyboard_top_padding_holo">2.727%p</fraction>
+ <fraction name="keyboard_bottom_padding_holo">0.0%p</fraction>
+ <fraction name="key_bottom_gap_holo">4.5%p</fraction>
+ <fraction name="key_horizontal_gap_holo">0.9%p</fraction>
+
+ <dimen name="popup_key_height">81.9dp</dimen>
+
+ <!-- left or right padding of label alignment -->
+ <dimen name="key_label_horizontal_padding">18dp</dimen>
+
+ <fraction name="key_letter_ratio">50%</fraction>
+ <fraction name="key_large_letter_ratio">48%</fraction>
+ <fraction name="key_label_ratio">32%</fraction>
+ <fraction name="key_hint_letter_ratio">23%</fraction>
+ <fraction name="key_hint_label_ratio">34%</fraction>
+ <fraction name="key_uppercase_letter_ratio">29%</fraction>
+ <fraction name="spacebar_text_ratio">30.0%</fraction>
+ <dimen name="key_uppercase_letter_padding">4dp</dimen>
+
+ <!-- For 5-row keyboard -->
+ <fraction name="key_bottom_gap_5row">3.20%p</fraction>
+ <fraction name="key_letter_ratio_5row">62%</fraction>
+ <fraction name="key_uppercase_letter_ratio_5row">36%</fraction>
+
+ <dimen name="suggestions_strip_padding">252.0dp</dimen>
+ <integer name="max_more_suggestions_row">5</integer>
+ <fraction name="min_more_suggestions_width">50%</fraction>
+
+ <!-- Gesture floating preview text parameters -->
+ <dimen name="gesture_floating_preview_text_size">26dp</dimen>
+ <dimen name="gesture_floating_preview_text_offset">76dp</dimen>
+ <dimen name="gesture_floating_preview_horizontal_padding">26dp</dimen>
+ <dimen name="gesture_floating_preview_vertical_padding">17dp</dimen>
+
+ <!-- Emoji keyboard -->
+ <fraction name="emoji_keyboard_key_width">10%p</fraction>
+ <fraction name="emoji_keyboard_row_height">33%p</fraction>
+ <fraction name="emoji_keyboard_key_letter_size">70%p</fraction>
+ <integer name="emoji_keyboard_max_key_count">30</integer>
</resources>
diff --git a/java/res/values-sw540dp-land/dimens.xml b/java/res/values-sw540dp-land/dimens.xml
deleted file mode 100644
index 35b2009b20640f1030c48dcd14ce7ca8f9fbf6b2..0000000000000000000000000000000000000000
--- a/java/res/values-sw540dp-land/dimens.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2011, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-** http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<!-- Configurable dimensions for Large Phone and Small Tablet Landscape. -->
-<resources>
- <!-- Preferable keyboard height in absolute scale: 45.0mm -->
- <!-- This keyboardHeight value should match with keyboard-heights.xml -->
- <dimen name="keyboardHeight">283.5dp</dimen>
- <fraction name="minKeyboardHeight">45%p</fraction>
-
- <fraction name="keyboard_top_padding_gb">2.444%p</fraction>
- <fraction name="keyboard_bottom_padding_gb">0.0%p</fraction>
- <fraction name="key_bottom_gap_gb">5.200%p</fraction>
- <fraction name="key_horizontal_gap_gb">1.447%p</fraction>
-
- <fraction name="keyboard_top_padding_holo">2.727%p</fraction>
- <fraction name="keyboard_bottom_padding_holo">0.0%p</fraction>
- <fraction name="key_bottom_gap_holo">4.5%p</fraction>
- <fraction name="key_horizontal_gap_holo">0.9%p</fraction>
-
- <dimen name="popup_key_height">81.9dp</dimen>
-
- <!-- left or right padding of label alignment -->
- <dimen name="key_label_horizontal_padding">18dp</dimen>
-
- <fraction name="key_letter_ratio">50%</fraction>
- <fraction name="key_large_letter_ratio">48%</fraction>
- <fraction name="key_label_ratio">32%</fraction>
- <fraction name="key_hint_letter_ratio">23%</fraction>
- <fraction name="key_hint_label_ratio">34%</fraction>
- <fraction name="key_uppercase_letter_ratio">29%</fraction>
- <fraction name="spacebar_text_ratio">30.0%</fraction>
- <dimen name="key_uppercase_letter_padding">4dp</dimen>
-
- <!-- For 5-row keyboard -->
- <fraction name="key_bottom_gap_5row">3.20%p</fraction>
- <fraction name="key_letter_ratio_5row">62%</fraction>
- <fraction name="key_uppercase_letter_ratio_5row">36%</fraction>
-
- <dimen name="suggestions_strip_padding">252.0dp</dimen>
- <integer name="max_more_suggestions_row">5</integer>
- <fraction name="min_more_suggestions_width">50%</fraction>
-
- <!-- Gesture floating preview text parameters -->
- <dimen name="gesture_floating_preview_text_size">26dp</dimen>
- <dimen name="gesture_floating_preview_text_offset">76dp</dimen>
- <dimen name="gesture_floating_preview_horizontal_padding">26dp</dimen>
- <dimen name="gesture_floating_preview_vertical_padding">17dp</dimen>
-
- <!-- Emoji keyboard -->
- <fraction name="emoji_keyboard_key_width">10%p</fraction>
- <fraction name="emoji_keyboard_row_height">33%p</fraction>
- <fraction name="emoji_keyboard_key_letter_size">70%p</fraction>
- <integer name="emoji_keyboard_max_key_count">30</integer>
-
-</resources>
diff --git a/java/res/values-sw540dp/config.xml b/java/res/values-sw540dp/config.xml
index 6ef53b61164670cae4e8b6ec4c135eac89dc74c1..f7322d27c3b45611c28401b311b34d0a7f1dac6b 100644
--- a/java/res/values-sw540dp/config.xml
+++ b/java/res/values-sw540dp/config.xml
@@ -33,4 +33,80 @@
<!-- 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">true</bool>
+
+ <!-- TODO: Add config_ prefix to the following resources that have been merged from dimens.xml -->
+
+ <!-- Preferable keyboard height in absolute scale: 48.0mm -->
+ <!-- This keyboardHeight value should match with keyboard-heights.xml -->
+ <dimen name="keyboardHeight">302.4dp</dimen>
+ <fraction name="maxKeyboardHeight">46%p</fraction>
+ <fraction name="minKeyboardHeight">-35.0%p</fraction>
+
+ <dimen name="popup_key_height">63.0dp</dimen>
+
+ <fraction name="keyboard_top_padding_gb">2.291%p</fraction>
+ <fraction name="keyboard_bottom_padding_gb">0.0%p</fraction>
+ <fraction name="key_bottom_gap_gb">4.625%p</fraction>
+ <fraction name="key_horizontal_gap_gb">2.113%p</fraction>
+
+ <fraction name="keyboard_top_padding_holo">2.335%p</fraction>
+ <fraction name="keyboard_bottom_padding_holo">4.0%p</fraction>
+ <fraction name="key_bottom_gap_holo">4.5%p</fraction>
+ <fraction name="key_horizontal_gap_holo">1.565%p</fraction>
+
+ <dimen name="more_keys_keyboard_key_horizontal_padding">6dp</dimen>
+ <!-- Amount of allowance for selecting keys in a mini popup keyboard by sliding finger. -->
+ <!-- popup_key_height x 1.2 -->
+ <dimen name="more_keys_keyboard_slide_allowance">98.3dp</dimen>
+ <!-- popup_key_height x -1.0 -->
+ <dimen name="more_keys_keyboard_vertical_correction_gb">-81.9dp</dimen>
+
+ <!-- left or right padding of label alignment -->
+ <dimen name="key_label_horizontal_padding">6dp</dimen>
+ <dimen name="key_hint_letter_padding">3dp</dimen>
+ <dimen name="key_uppercase_letter_padding">3dp</dimen>
+
+ <fraction name="key_letter_ratio">42%</fraction>
+ <fraction name="key_large_letter_ratio">45%</fraction>
+ <fraction name="key_label_ratio">25%</fraction>
+ <fraction name="key_large_label_ratio">32%</fraction>
+ <fraction name="key_hint_letter_ratio">23%</fraction>
+ <fraction name="key_hint_label_ratio">28%</fraction>
+ <fraction name="key_uppercase_letter_ratio">22%</fraction>
+ <fraction name="key_preview_text_ratio">50%</fraction>
+ <fraction name="spacebar_text_ratio">28.0%</fraction>
+ <dimen name="key_preview_height">94.5dp</dimen>
+ <dimen name="key_preview_offset_gb">16.0dp</dimen>
+
+ <!-- For 5-row keyboard -->
+ <fraction name="key_bottom_gap_5row">3.20%p</fraction>
+ <fraction name="key_letter_ratio_5row">52%</fraction>
+ <fraction name="key_uppercase_letter_ratio_5row">27%</fraction>
+
+ <dimen name="key_preview_offset_holo">8.0dp</dimen>
+ <!-- popup_key_height x -0.5 -->
+ <dimen name="more_keys_keyboard_vertical_correction_holo">-31.5dp</dimen>
+
+ <dimen name="suggestions_strip_height">44dp</dimen>
+ <dimen name="more_suggestions_row_height">44dp</dimen>
+ <integer name="max_more_suggestions_row">6</integer>
+ <fraction name="min_more_suggestions_width">90%</fraction>
+ <dimen name="suggestions_strip_padding">94.5dp</dimen>
+ <dimen name="suggestion_min_width">48.0dp</dimen>
+ <dimen name="suggestion_padding">12dp</dimen>
+ <dimen name="suggestion_text_size">22dp</dimen>
+ <dimen name="more_suggestions_hint_text_size">33dp</dimen>
+
+ <!-- Gesture floating preview text parameters -->
+ <dimen name="gesture_floating_preview_text_size">28dp</dimen>
+ <dimen name="gesture_floating_preview_text_offset">87dp</dimen>
+ <dimen name="gesture_floating_preview_horizontal_padding">28dp</dimen>
+ <dimen name="gesture_floating_preview_vertical_padding">19dp</dimen>
+ <dimen name="gesture_floating_preview_round_radius">3dp</dimen>
+
+ <!-- Emoji keyboard -->
+ <fraction name="emoji_keyboard_key_width">12.5%p</fraction>
+ <fraction name="emoji_keyboard_row_height">33%p</fraction>
+ <fraction name="emoji_keyboard_key_letter_size">60%p</fraction>
+ <integer name="emoji_keyboard_max_key_count">24</integer>
</resources>
diff --git a/java/res/values-sw540dp/dimens.xml b/java/res/values-sw540dp/dimens.xml
deleted file mode 100644
index 79e923a33b6b64fe435e890f7cd499c041f5ea43..0000000000000000000000000000000000000000
--- a/java/res/values-sw540dp/dimens.xml
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2011, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-** http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<!-- Configurable dimensions for Large Phone and Small Tablet Portrait. -->
-<resources>
- <!-- Preferable keyboard height in absolute scale: 48.0mm -->
- <!-- This keyboardHeight value should match with keyboard-heights.xml -->
- <dimen name="keyboardHeight">302.4dp</dimen>
- <fraction name="maxKeyboardHeight">46%p</fraction>
- <fraction name="minKeyboardHeight">-35.0%p</fraction>
-
- <dimen name="popup_key_height">63.0dp</dimen>
-
- <fraction name="keyboard_top_padding_gb">2.291%p</fraction>
- <fraction name="keyboard_bottom_padding_gb">0.0%p</fraction>
- <fraction name="key_bottom_gap_gb">4.625%p</fraction>
- <fraction name="key_horizontal_gap_gb">2.113%p</fraction>
-
- <fraction name="keyboard_top_padding_holo">2.335%p</fraction>
- <fraction name="keyboard_bottom_padding_holo">4.0%p</fraction>
- <fraction name="key_bottom_gap_holo">4.5%p</fraction>
- <fraction name="key_horizontal_gap_holo">1.565%p</fraction>
-
- <dimen name="more_keys_keyboard_key_horizontal_padding">6dp</dimen>
- <!-- Amount of allowance for selecting keys in a mini popup keyboard by sliding finger. -->
- <!-- popup_key_height x 1.2 -->
- <dimen name="more_keys_keyboard_slide_allowance">98.3dp</dimen>
- <!-- popup_key_height x -1.0 -->
- <dimen name="more_keys_keyboard_vertical_correction_gb">-81.9dp</dimen>
-
- <!-- left or right padding of label alignment -->
- <dimen name="key_label_horizontal_padding">6dp</dimen>
- <dimen name="key_hint_letter_padding">3dp</dimen>
- <dimen name="key_uppercase_letter_padding">3dp</dimen>
-
- <fraction name="key_letter_ratio">42%</fraction>
- <fraction name="key_large_letter_ratio">45%</fraction>
- <fraction name="key_label_ratio">25%</fraction>
- <fraction name="key_large_label_ratio">32%</fraction>
- <fraction name="key_hint_letter_ratio">23%</fraction>
- <fraction name="key_hint_label_ratio">28%</fraction>
- <fraction name="key_uppercase_letter_ratio">22%</fraction>
- <fraction name="key_preview_text_ratio">50%</fraction>
- <fraction name="spacebar_text_ratio">28.0%</fraction>
- <dimen name="key_preview_height">94.5dp</dimen>
- <dimen name="key_preview_offset_gb">16.0dp</dimen>
-
- <!-- For 5-row keyboard -->
- <fraction name="key_bottom_gap_5row">3.20%p</fraction>
- <fraction name="key_letter_ratio_5row">52%</fraction>
- <fraction name="key_uppercase_letter_ratio_5row">27%</fraction>
-
- <dimen name="key_preview_offset_holo">8.0dp</dimen>
- <!-- popup_key_height x -0.5 -->
- <dimen name="more_keys_keyboard_vertical_correction_holo">-31.5dp</dimen>
-
- <dimen name="suggestions_strip_height">44dp</dimen>
- <dimen name="more_suggestions_row_height">44dp</dimen>
- <integer name="max_more_suggestions_row">6</integer>
- <fraction name="min_more_suggestions_width">90%</fraction>
- <dimen name="suggestions_strip_padding">94.5dp</dimen>
- <dimen name="suggestion_min_width">48.0dp</dimen>
- <dimen name="suggestion_padding">12dp</dimen>
- <dimen name="suggestion_text_size">22dp</dimen>
- <dimen name="more_suggestions_hint_text_size">33dp</dimen>
-
- <!-- Gesture floating preview text parameters -->
- <dimen name="gesture_floating_preview_text_size">28dp</dimen>
- <dimen name="gesture_floating_preview_text_offset">87dp</dimen>
- <dimen name="gesture_floating_preview_horizontal_padding">28dp</dimen>
- <dimen name="gesture_floating_preview_vertical_padding">19dp</dimen>
- <dimen name="gesture_floating_preview_round_radius">3dp</dimen>
-
- <!-- Emoji keyboard -->
- <fraction name="emoji_keyboard_key_width">12.5%p</fraction>
- <fraction name="emoji_keyboard_row_height">33%p</fraction>
- <fraction name="emoji_keyboard_key_letter_size">60%p</fraction>
- <integer name="emoji_keyboard_max_key_count">24</integer>
-
-</resources>
diff --git a/java/res/values-sw768dp-land/config.xml b/java/res/values-sw768dp-land/config.xml
index 7490e52ce1337557623d5b7a83780fb6b9c51a14..3e6e77b421486fc82172d74bb1386262d7b100e0 100644
--- a/java/res/values-sw768dp-land/config.xml
+++ b/java/res/values-sw768dp-land/config.xml
@@ -21,4 +21,57 @@
<!-- Configuration values for Large Tablet Landscape. -->
<resources>
<bool name="config_use_fullscreen_mode">false</bool>
+
+ <!-- TODO: Add config_ prefix to the following resources that have been merged from dimens.xml -->
+
+ <!-- Preferable keyboard height in absolute scale: 58.0mm -->
+ <!-- This keyboardHeight value should match with keyboard-heights.xml -->
+ <dimen name="keyboardHeight">365.4dp</dimen>
+ <fraction name="minKeyboardHeight">45%p</fraction>
+
+ <fraction name="keyboard_top_padding_gb">1.896%p</fraction>
+ <fraction name="keyboard_bottom_padding_gb">0.0%p</fraction>
+ <fraction name="key_bottom_gap_gb">3.896%p</fraction>
+ <fraction name="key_horizontal_gap_gb">1.195%p</fraction>
+
+ <fraction name="keyboard_top_padding_holo">1.896%p</fraction>
+ <fraction name="keyboard_bottom_padding_holo">0.0%p</fraction>
+ <fraction name="key_bottom_gap_holo">3.690%p</fraction>
+ <fraction name="key_horizontal_gap_holo">1.030%p</fraction>
+
+ <dimen name="popup_key_height">81.9dp</dimen>
+
+ <!-- left or right padding of label alignment -->
+ <dimen name="key_label_horizontal_padding">18dp</dimen>
+
+ <fraction name="key_letter_ratio">43%</fraction>
+ <fraction name="key_large_letter_ratio">42%</fraction>
+ <fraction name="key_label_ratio">28%</fraction>
+ <fraction name="key_hint_letter_ratio">23%</fraction>
+ <fraction name="key_hint_label_ratio">28%</fraction>
+ <fraction name="key_uppercase_letter_ratio">24%</fraction>
+ <fraction name="spacebar_text_ratio">24.00%</fraction>
+ <dimen name="key_preview_height">107.1dp</dimen>
+
+ <!-- For 5-row keyboard -->
+ <fraction name="key_bottom_gap_5row">2.65%p</fraction>
+ <fraction name="key_letter_ratio_5row">53%</fraction>
+ <fraction name="key_uppercase_letter_ratio_5row">30%</fraction>
+
+ <dimen name="key_preview_offset_holo">8.0dp</dimen>
+
+ <dimen name="suggestions_strip_padding">252.0dp</dimen>
+ <fraction name="min_more_suggestions_width">50%</fraction>
+
+ <!-- Gesture floating preview text parameters -->
+ <dimen name="gesture_floating_preview_text_size">32dp</dimen>
+ <dimen name="gesture_floating_preview_text_offset">100dp</dimen>
+ <dimen name="gesture_floating_preview_horizontal_padding">32dp</dimen>
+ <dimen name="gesture_floating_preview_vertical_padding">21dp</dimen>
+
+ <!-- Emoji keyboard -->
+ <fraction name="emoji_keyboard_key_width">7.69%p</fraction>
+ <fraction name="emoji_keyboard_row_height">33%p</fraction>
+ <fraction name="emoji_keyboard_key_letter_size">60%p</fraction>
+ <integer name="emoji_keyboard_max_key_count">39</integer>
</resources>
diff --git a/java/res/values-sw768dp-land/dimens.xml b/java/res/values-sw768dp-land/dimens.xml
deleted file mode 100644
index 47c9b15b54a51d67fdc08c090c1cb5490ff0d57f..0000000000000000000000000000000000000000
--- a/java/res/values-sw768dp-land/dimens.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2010, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-** http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<!-- Configurable dimensions for Large Tablet Landscape. -->
-<resources>
- <!-- Preferable keyboard height in absolute scale: 58.0mm -->
- <!-- This keyboardHeight value should match with keyboard-heights.xml -->
- <dimen name="keyboardHeight">365.4dp</dimen>
- <fraction name="minKeyboardHeight">45%p</fraction>
-
- <fraction name="keyboard_top_padding_gb">1.896%p</fraction>
- <fraction name="keyboard_bottom_padding_gb">0.0%p</fraction>
- <fraction name="key_bottom_gap_gb">3.896%p</fraction>
- <fraction name="key_horizontal_gap_gb">1.195%p</fraction>
-
- <fraction name="keyboard_top_padding_holo">1.896%p</fraction>
- <fraction name="keyboard_bottom_padding_holo">0.0%p</fraction>
- <fraction name="key_bottom_gap_holo">3.690%p</fraction>
- <fraction name="key_horizontal_gap_holo">1.030%p</fraction>
-
- <dimen name="popup_key_height">81.9dp</dimen>
-
- <!-- left or right padding of label alignment -->
- <dimen name="key_label_horizontal_padding">18dp</dimen>
-
- <fraction name="key_letter_ratio">43%</fraction>
- <fraction name="key_large_letter_ratio">42%</fraction>
- <fraction name="key_label_ratio">28%</fraction>
- <fraction name="key_hint_letter_ratio">23%</fraction>
- <fraction name="key_hint_label_ratio">28%</fraction>
- <fraction name="key_uppercase_letter_ratio">24%</fraction>
- <fraction name="spacebar_text_ratio">24.00%</fraction>
- <dimen name="key_preview_height">107.1dp</dimen>
-
- <!-- For 5-row keyboard -->
- <fraction name="key_bottom_gap_5row">2.65%p</fraction>
- <fraction name="key_letter_ratio_5row">53%</fraction>
- <fraction name="key_uppercase_letter_ratio_5row">30%</fraction>
-
- <dimen name="key_preview_offset_holo">8.0dp</dimen>
-
- <dimen name="suggestions_strip_padding">252.0dp</dimen>
- <fraction name="min_more_suggestions_width">50%</fraction>
-
- <!-- Gesture floating preview text parameters -->
- <dimen name="gesture_floating_preview_text_size">32dp</dimen>
- <dimen name="gesture_floating_preview_text_offset">100dp</dimen>
- <dimen name="gesture_floating_preview_horizontal_padding">32dp</dimen>
- <dimen name="gesture_floating_preview_vertical_padding">21dp</dimen>
-
- <!-- Emoji keyboard -->
- <fraction name="emoji_keyboard_key_width">7.69%p</fraction>
- <fraction name="emoji_keyboard_row_height">33%p</fraction>
- <fraction name="emoji_keyboard_key_letter_size">60%p</fraction>
- <integer name="emoji_keyboard_max_key_count">39</integer>
-
-</resources>
diff --git a/java/res/values-sw768dp/config.xml b/java/res/values-sw768dp/config.xml
index c11ee809ab03fe6c1b59072b0fbdbfefe863f777..f76e76f2e715555e86d2fb79b0dea17e26bb4f1c 100644
--- a/java/res/values-sw768dp/config.xml
+++ b/java/res/values-sw768dp/config.xml
@@ -33,4 +33,80 @@
<!-- 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">true</bool>
+
+ <!-- TODO: Add config_ prefix to the following resources that have been merged from dimens.xml -->
+
+ <!-- Preferable keyboard height in absolute scale: 48.0mm -->
+ <!-- This keyboardHeight value should match with keyboard-heights.xml -->
+ <dimen name="keyboardHeight">302.4dp</dimen>
+ <fraction name="maxKeyboardHeight">46%p</fraction>
+ <fraction name="minKeyboardHeight">-35.0%p</fraction>
+
+ <fraction name="keyboard_top_padding_gb">2.291%p</fraction>
+ <fraction name="keyboard_bottom_padding_gb">0.0%p</fraction>
+ <fraction name="key_bottom_gap_gb">4.687%p</fraction>
+ <fraction name="key_horizontal_gap_gb">1.272%p</fraction>
+
+ <fraction name="keyboard_top_padding_holo">2.335%p</fraction>
+ <fraction name="keyboard_bottom_padding_holo">0.0%p</fraction>
+ <fraction name="key_bottom_gap_holo">3.312%p</fraction>
+ <fraction name="key_horizontal_gap_holo">1.066%p</fraction>
+
+ <dimen name="popup_key_height">63.0dp</dimen>
+
+ <dimen name="more_keys_keyboard_key_horizontal_padding">12dp</dimen>
+ <!-- Amount of allowance for selecting keys in a mini popup keyboard by sliding finger. -->
+ <!-- popup_key_height x 1.2 -->
+ <dimen name="more_keys_keyboard_slide_allowance">98.3dp</dimen>
+ <!-- popup_key_height x -1.0 -->
+ <dimen name="more_keys_keyboard_vertical_correction_gb">-81.9dp</dimen>
+
+ <!-- left or right padding of label alignment -->
+ <dimen name="key_label_horizontal_padding">6dp</dimen>
+ <dimen name="key_hint_letter_padding">3dp</dimen>
+ <dimen name="key_uppercase_letter_padding">3dp</dimen>
+
+ <fraction name="key_letter_ratio">40%</fraction>
+ <fraction name="key_large_letter_ratio">42%</fraction>
+ <fraction name="key_label_ratio">28%</fraction>
+ <fraction name="key_large_label_ratio">28%</fraction>
+ <fraction name="key_hint_letter_ratio">23%</fraction>
+ <fraction name="key_hint_label_ratio">28%</fraction>
+ <fraction name="key_uppercase_letter_ratio">26%</fraction>
+ <fraction name="key_preview_text_ratio">50%</fraction>
+ <fraction name="spacebar_text_ratio">29.03%</fraction>
+ <dimen name="key_preview_height">94.5dp</dimen>
+ <dimen name="key_preview_offset_gb">16.0dp</dimen>
+
+ <!-- For 5-row keyboard -->
+ <fraction name="key_bottom_gap_5row">2.95%p</fraction>
+ <fraction name="key_letter_ratio_5row">51%</fraction>
+ <fraction name="key_uppercase_letter_ratio_5row">33%</fraction>
+
+ <dimen name="key_preview_offset_holo">8.0dp</dimen>
+ <!-- popup_key_height x -0.5 -->
+ <dimen name="more_keys_keyboard_vertical_correction_holo">-31.5dp</dimen>
+
+ <dimen name="suggestions_strip_height">44dp</dimen>
+ <dimen name="more_suggestions_row_height">44dp</dimen>
+ <integer name="max_more_suggestions_row">6</integer>
+ <fraction name="min_more_suggestions_width">90%</fraction>
+ <dimen name="suggestions_strip_padding">94.5dp</dimen>
+ <dimen name="suggestion_min_width">46dp</dimen>
+ <dimen name="suggestion_padding">8dp</dimen>
+ <dimen name="suggestion_text_size">22dp</dimen>
+ <dimen name="more_suggestions_hint_text_size">33dp</dimen>
+
+ <!-- Gesture floating preview text parameters -->
+ <dimen name="gesture_floating_preview_text_size">26dp</dimen>
+ <dimen name="gesture_floating_preview_text_offset">86dp</dimen>
+ <dimen name="gesture_floating_preview_horizontal_padding">26dp</dimen>
+ <dimen name="gesture_floating_preview_vertical_padding">17dp</dimen>
+ <dimen name="gesture_floating_preview_round_radius">3dp</dimen>
+
+ <!-- Emoji keyboard -->
+ <fraction name="emoji_keyboard_key_width">10%p</fraction>
+ <fraction name="emoji_keyboard_row_height">33%p</fraction>
+ <fraction name="emoji_keyboard_key_letter_size">68%p</fraction>
+ <integer name="emoji_keyboard_max_key_count">30</integer>
</resources>
diff --git a/java/res/values-sw768dp/dimens.xml b/java/res/values-sw768dp/dimens.xml
deleted file mode 100644
index 211a890814dc5d82950fb1f506ade015da0d708e..0000000000000000000000000000000000000000
--- a/java/res/values-sw768dp/dimens.xml
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2010, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-** http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<!-- Configurable dimensions for Large Tablet Portrait. -->
-<resources>
- <!-- Preferable keyboard height in absolute scale: 48.0mm -->
- <!-- This keyboardHeight value should match with keyboard-heights.xml -->
- <dimen name="keyboardHeight">302.4dp</dimen>
- <fraction name="maxKeyboardHeight">46%p</fraction>
- <fraction name="minKeyboardHeight">-35.0%p</fraction>
-
- <fraction name="keyboard_top_padding_gb">2.291%p</fraction>
- <fraction name="keyboard_bottom_padding_gb">0.0%p</fraction>
- <fraction name="key_bottom_gap_gb">4.687%p</fraction>
- <fraction name="key_horizontal_gap_gb">1.272%p</fraction>
-
- <fraction name="keyboard_top_padding_holo">2.335%p</fraction>
- <fraction name="keyboard_bottom_padding_holo">0.0%p</fraction>
- <fraction name="key_bottom_gap_holo">3.312%p</fraction>
- <fraction name="key_horizontal_gap_holo">1.066%p</fraction>
-
- <dimen name="popup_key_height">63.0dp</dimen>
-
- <dimen name="more_keys_keyboard_key_horizontal_padding">12dp</dimen>
- <!-- Amount of allowance for selecting keys in a mini popup keyboard by sliding finger. -->
- <!-- popup_key_height x 1.2 -->
- <dimen name="more_keys_keyboard_slide_allowance">98.3dp</dimen>
- <!-- popup_key_height x -1.0 -->
- <dimen name="more_keys_keyboard_vertical_correction_gb">-81.9dp</dimen>
-
- <!-- left or right padding of label alignment -->
- <dimen name="key_label_horizontal_padding">6dp</dimen>
- <dimen name="key_hint_letter_padding">3dp</dimen>
- <dimen name="key_uppercase_letter_padding">3dp</dimen>
-
- <fraction name="key_letter_ratio">40%</fraction>
- <fraction name="key_large_letter_ratio">42%</fraction>
- <fraction name="key_label_ratio">28%</fraction>
- <fraction name="key_large_label_ratio">28%</fraction>
- <fraction name="key_hint_letter_ratio">23%</fraction>
- <fraction name="key_hint_label_ratio">28%</fraction>
- <fraction name="key_uppercase_letter_ratio">26%</fraction>
- <fraction name="key_preview_text_ratio">50%</fraction>
- <fraction name="spacebar_text_ratio">29.03%</fraction>
- <dimen name="key_preview_height">94.5dp</dimen>
- <dimen name="key_preview_offset_gb">16.0dp</dimen>
-
- <!-- For 5-row keyboard -->
- <fraction name="key_bottom_gap_5row">2.95%p</fraction>
- <fraction name="key_letter_ratio_5row">51%</fraction>
- <fraction name="key_uppercase_letter_ratio_5row">33%</fraction>
-
- <dimen name="key_preview_offset_holo">8.0dp</dimen>
- <!-- popup_key_height x -0.5 -->
- <dimen name="more_keys_keyboard_vertical_correction_holo">-31.5dp</dimen>
-
- <dimen name="suggestions_strip_height">44dp</dimen>
- <dimen name="more_suggestions_row_height">44dp</dimen>
- <integer name="max_more_suggestions_row">6</integer>
- <fraction name="min_more_suggestions_width">90%</fraction>
- <dimen name="suggestions_strip_padding">94.5dp</dimen>
- <dimen name="suggestion_min_width">46dp</dimen>
- <dimen name="suggestion_padding">8dp</dimen>
- <dimen name="suggestion_text_size">22dp</dimen>
- <dimen name="more_suggestions_hint_text_size">33dp</dimen>
-
- <!-- Gesture floating preview text parameters -->
- <dimen name="gesture_floating_preview_text_size">26dp</dimen>
- <dimen name="gesture_floating_preview_text_offset">86dp</dimen>
- <dimen name="gesture_floating_preview_horizontal_padding">26dp</dimen>
- <dimen name="gesture_floating_preview_vertical_padding">17dp</dimen>
- <dimen name="gesture_floating_preview_round_radius">3dp</dimen>
-
- <!-- Emoji keyboard -->
- <fraction name="emoji_keyboard_key_width">10%p</fraction>
- <fraction name="emoji_keyboard_row_height">33%p</fraction>
- <fraction name="emoji_keyboard_key_letter_size">68%p</fraction>
- <integer name="emoji_keyboard_max_key_count">30</integer>
-
-</resources>
diff --git a/java/res/values/config.xml b/java/res/values/config.xml
index db84c79d9975a08bed186feffb64a3091dc7d6a8..122bc4ec1a8980ecb5aa5f6fd849ea79365b9000 100644
--- a/java/res/values/config.xml
+++ b/java/res/values/config.xml
@@ -99,4 +99,115 @@
<fraction name="config_gesture_recognition_speed_threshold">550%</fraction>
<!-- Suppress showing key preview duration after batch input in millisecond -->
<integer name="config_suppress_key_preview_after_batch_input_duration">1000</integer>
+
+ <!-- TODO: Add config_ prefix to the following resources that have been merged from dimens.xml -->
+
+ <!-- Preferable keyboard height in absolute scale: 1.285in -->
+ <!-- This keyboardHeight value should match with keyboard-heights.xml -->
+ <dimen name="keyboardHeight">205.6dp</dimen>
+ <fraction name="maxKeyboardHeight">46%p</fraction>
+ <fraction name="minKeyboardHeight">-61.8%p</fraction>
+
+ <dimen name="popup_key_height">52.8dp</dimen>
+
+ <dimen name="more_keys_keyboard_key_horizontal_padding">8dp</dimen>
+
+ <fraction name="keyboard_left_padding">0%p</fraction>
+ <fraction name="keyboard_right_padding">0%p</fraction>
+
+ <fraction name="keyboard_top_padding_gb">1.556%p</fraction>
+ <fraction name="keyboard_bottom_padding_gb">4.669%p</fraction>
+ <fraction name="key_bottom_gap_gb">6.495%p</fraction>
+ <fraction name="key_horizontal_gap_gb">1.971%p</fraction>
+
+ <fraction name="keyboard_top_padding_holo">2.335%p</fraction>
+ <fraction name="keyboard_bottom_padding_holo">4.669%p</fraction>
+ <fraction name="key_bottom_gap_holo">6.127%p</fraction>
+ <fraction name="key_horizontal_gap_holo">1.739%p</fraction>
+
+ <!-- Amount of allowance for selecting keys in a mini popup keyboard by sliding finger. -->
+ <!-- popup_key_height x 1.2 -->
+ <dimen name="more_keys_keyboard_slide_allowance">63.36dp</dimen>
+ <!-- popup_key_height x -1.0 -->
+ <dimen name="more_keys_keyboard_vertical_correction_gb">-52.8dp</dimen>
+ <dimen name="keyboard_vertical_correction">0.0dp</dimen>
+
+ <fraction name="key_letter_ratio">55%</fraction>
+ <fraction name="key_large_letter_ratio">65%</fraction>
+ <fraction name="key_label_ratio">34%</fraction>
+ <fraction name="key_large_label_ratio">40%</fraction>
+ <fraction name="key_hint_letter_ratio">25%</fraction>
+ <fraction name="key_hint_label_ratio">44%</fraction>
+ <fraction name="key_uppercase_letter_ratio">35%</fraction>
+ <fraction name="key_preview_text_ratio">82%</fraction>
+ <fraction name="spacebar_text_ratio">33.735%</fraction>
+ <dimen name="key_preview_height">80dp</dimen>
+ <dimen name="key_preview_offset_gb">-8.0dp</dimen>
+
+ <dimen name="key_label_horizontal_padding">4dp</dimen>
+ <dimen name="key_hint_letter_padding">1dp</dimen>
+ <dimen name="key_popup_hint_letter_padding">2dp</dimen>
+ <dimen name="key_uppercase_letter_padding">2dp</dimen>
+
+ <!-- For 5-row keyboard -->
+ <fraction name="key_bottom_gap_5row">3.20%p</fraction>
+ <fraction name="key_letter_ratio_5row">64%</fraction>
+ <fraction name="key_uppercase_letter_ratio_5row">41%</fraction>
+
+ <dimen name="key_preview_offset_holo">8.0dp</dimen>
+ <!-- popup_key_height x -0.5 -->
+ <dimen name="more_keys_keyboard_vertical_correction_holo">-26.4dp</dimen>
+
+ <dimen name="suggestions_strip_height">40dp</dimen>
+ <dimen name="more_suggestions_key_horizontal_padding">12dp</dimen>
+ <dimen name="more_suggestions_row_height">40dp</dimen>
+ <dimen name="more_suggestions_bottom_gap">6dp</dimen>
+ <dimen name="more_suggestions_modal_tolerance">32.0dp</dimen>
+ <integer name="max_more_suggestions_row">6</integer>
+ <fraction name="min_more_suggestions_width">90%</fraction>
+ <fraction name="more_suggestions_info_ratio">18%</fraction>
+ <dimen name="suggestions_strip_padding">0dp</dimen>
+ <dimen name="suggestion_min_width">44dp</dimen>
+ <dimen name="suggestion_padding">6dp</dimen>
+ <dimen name="suggestion_text_size">18dp</dimen>
+ <dimen name="more_suggestions_hint_text_size">27dp</dimen>
+ <integer name="suggestions_count_in_strip">3</integer>
+ <fraction name="center_suggestion_percentile">36%</fraction>
+
+ <!-- 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_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>
+ <dimen name="gesture_floating_preview_horizontal_padding">24dp</dimen>
+ <dimen name="gesture_floating_preview_vertical_padding">16dp</dimen>
+ <dimen name="gesture_floating_preview_round_radius">2dp</dimen>
+
+ <!-- Emoji keyboard -->
+ <fraction name="emoji_keyboard_key_width">14.2857%p</fraction>
+ <fraction name="emoji_keyboard_row_height">33%p</fraction>
+ <fraction name="emoji_keyboard_key_letter_size">68%p</fraction>
+ <integer name="emoji_keyboard_max_key_count">21</integer>
+ <dimen name="emoji_category_page_id_height">3dp</dimen>
+
+ <!-- Inset used in Accessibility mode to avoid accidental key presses when a finger slides off the screen. -->
+ <dimen name="accessibility_edge_slop">8dp</dimen>
+
+ <integer name="user_dictionary_max_word_length" translatable="false">48</integer>
+
+ <dimen name="language_on_spacebar_horizontal_margin">1dp</dimen>
</resources>
diff --git a/java/res/values/dimens.xml b/java/res/values/dimens.xml
deleted file mode 100644
index 02b1380a3fc33e431b2d35f3727b189f9efa29c2..0000000000000000000000000000000000000000
--- a/java/res/values/dimens.xml
+++ /dev/null
@@ -1,132 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2008, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-** http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<!-- Configurable dimensions for Small Phone Portrait. -->
-<resources>
- <!-- Preferable keyboard height in absolute scale: 1.285in -->
- <!-- This keyboardHeight value should match with keyboard-heights.xml -->
- <dimen name="keyboardHeight">205.6dp</dimen>
- <fraction name="maxKeyboardHeight">46%p</fraction>
- <fraction name="minKeyboardHeight">-61.8%p</fraction>
-
- <dimen name="popup_key_height">52.8dp</dimen>
-
- <dimen name="more_keys_keyboard_key_horizontal_padding">8dp</dimen>
-
- <fraction name="keyboard_left_padding">0%p</fraction>
- <fraction name="keyboard_right_padding">0%p</fraction>
-
- <fraction name="keyboard_top_padding_gb">1.556%p</fraction>
- <fraction name="keyboard_bottom_padding_gb">4.669%p</fraction>
- <fraction name="key_bottom_gap_gb">6.495%p</fraction>
- <fraction name="key_horizontal_gap_gb">1.971%p</fraction>
-
- <fraction name="keyboard_top_padding_holo">2.335%p</fraction>
- <fraction name="keyboard_bottom_padding_holo">4.669%p</fraction>
- <fraction name="key_bottom_gap_holo">6.127%p</fraction>
- <fraction name="key_horizontal_gap_holo">1.739%p</fraction>
-
- <!-- Amount of allowance for selecting keys in a mini popup keyboard by sliding finger. -->
- <!-- popup_key_height x 1.2 -->
- <dimen name="more_keys_keyboard_slide_allowance">63.36dp</dimen>
- <!-- popup_key_height x -1.0 -->
- <dimen name="more_keys_keyboard_vertical_correction_gb">-52.8dp</dimen>
- <dimen name="keyboard_vertical_correction">0.0dp</dimen>
-
- <fraction name="key_letter_ratio">55%</fraction>
- <fraction name="key_large_letter_ratio">65%</fraction>
- <fraction name="key_label_ratio">34%</fraction>
- <fraction name="key_large_label_ratio">40%</fraction>
- <fraction name="key_hint_letter_ratio">25%</fraction>
- <fraction name="key_hint_label_ratio">44%</fraction>
- <fraction name="key_uppercase_letter_ratio">35%</fraction>
- <fraction name="key_preview_text_ratio">82%</fraction>
- <fraction name="spacebar_text_ratio">33.735%</fraction>
- <dimen name="key_preview_height">80dp</dimen>
- <dimen name="key_preview_offset_gb">-8.0dp</dimen>
-
- <dimen name="key_label_horizontal_padding">4dp</dimen>
- <dimen name="key_hint_letter_padding">1dp</dimen>
- <dimen name="key_popup_hint_letter_padding">2dp</dimen>
- <dimen name="key_uppercase_letter_padding">2dp</dimen>
-
- <!-- For 5-row keyboard -->
- <fraction name="key_bottom_gap_5row">3.20%p</fraction>
- <fraction name="key_letter_ratio_5row">64%</fraction>
- <fraction name="key_uppercase_letter_ratio_5row">41%</fraction>
-
- <dimen name="key_preview_offset_holo">8.0dp</dimen>
- <!-- popup_key_height x -0.5 -->
- <dimen name="more_keys_keyboard_vertical_correction_holo">-26.4dp</dimen>
-
- <dimen name="suggestions_strip_height">40dp</dimen>
- <dimen name="more_suggestions_key_horizontal_padding">12dp</dimen>
- <dimen name="more_suggestions_row_height">40dp</dimen>
- <dimen name="more_suggestions_bottom_gap">6dp</dimen>
- <dimen name="more_suggestions_modal_tolerance">32.0dp</dimen>
- <integer name="max_more_suggestions_row">6</integer>
- <fraction name="min_more_suggestions_width">90%</fraction>
- <fraction name="more_suggestions_info_ratio">18%</fraction>
- <dimen name="suggestions_strip_padding">0dp</dimen>
- <dimen name="suggestion_min_width">44dp</dimen>
- <dimen name="suggestion_padding">6dp</dimen>
- <dimen name="suggestion_text_size">18dp</dimen>
- <dimen name="more_suggestions_hint_text_size">27dp</dimen>
- <integer name="suggestions_count_in_strip">3</integer>
- <fraction name="center_suggestion_percentile">36%</fraction>
-
- <!-- 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_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>
- <dimen name="gesture_floating_preview_horizontal_padding">24dp</dimen>
- <dimen name="gesture_floating_preview_vertical_padding">16dp</dimen>
- <dimen name="gesture_floating_preview_round_radius">2dp</dimen>
-
- <!-- Emoji keyboard -->
- <fraction name="emoji_keyboard_key_width">14.2857%p</fraction>
- <fraction name="emoji_keyboard_row_height">33%p</fraction>
- <fraction name="emoji_keyboard_key_letter_size">68%p</fraction>
- <integer name="emoji_keyboard_max_key_count">21</integer>
- <dimen name="emoji_category_page_id_height">3dp</dimen>
-
- <!-- Inset used in Accessibility mode to avoid accidental key presses when a finger slides off the screen. -->
- <dimen name="accessibility_edge_slop">8dp</dimen>
-
- <integer name="user_dictionary_max_word_length" translatable="false">48</integer>
-
- <dimen name="language_on_spacebar_horizontal_margin">1dp</dimen>
-
-</resources>