diff --git a/java/res/values-sw600dp/config-per-form-factor.xml b/java/res/values-sw600dp/config-per-form-factor.xml
index aa9a05482..0872458d8 100644
--- a/java/res/values-sw600dp/config-per-form-factor.xml
+++ b/java/res/values-sw600dp/config-per-form-factor.xml
@@ -20,12 +20,12 @@
 
 <!-- Configuration values for Small Tablet. -->
 <resources>
-    <bool name="config_enable_show_key_preview_popup_option">false</bool>
+    <bool name="config_enable_show_key_preview_popup_option">true</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_key_preview_popup">true</bool>
     <bool name="config_default_sound_enabled">true</bool>
     <bool name="config_enable_show_voice_key_option">false</bool>
-    <bool name="config_key_selection_by_dragging_finger">false</bool>
+    <bool name="config_key_selection_by_dragging_finger">true</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>
diff --git a/java/res/values-sw600dp/keyboard_attributes.xml b/java/res/values-sw600dp/keyboard_attributes.xml
new file mode 100644
index 000000000..1d77517be
--- /dev/null
+++ b/java/res/values-sw600dp/keyboard_attributes.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <fraction name="keyboardHeightMultiplierAddl">80%</fraction>
+    <fraction name="keyboardGapMultiplierAddl">133%</fraction>
+    <dimen name="keyboardSidePaddingAddl">48dp</dimen>
+    <dimen name="keyboardBottomPaddingAddl">4dp</dimen>
+</resources>
\ No newline at end of file
diff --git a/java/res/values-sw768dp/config-per-form-factor.xml b/java/res/values-sw768dp/config-per-form-factor.xml
index b90fbaea5..fe337341e 100644
--- a/java/res/values-sw768dp/config-per-form-factor.xml
+++ b/java/res/values-sw768dp/config-per-form-factor.xml
@@ -20,12 +20,12 @@
 
 <!-- Configuration values for Large Tablet. -->
 <resources>
-    <bool name="config_enable_show_key_preview_popup_option">false</bool>
+    <bool name="config_enable_show_key_preview_popup_option">true</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_key_preview_popup">true</bool>
     <bool name="config_default_sound_enabled">true</bool>
     <bool name="config_enable_show_voice_key_option">false</bool>
-    <bool name="config_key_selection_by_dragging_finger">false</bool>
+    <bool name="config_key_selection_by_dragging_finger">true</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">true</bool>
diff --git a/java/res/values/keyboard_attributes.xml b/java/res/values/keyboard_attributes.xml
new file mode 100644
index 000000000..6a38a75d9
--- /dev/null
+++ b/java/res/values/keyboard_attributes.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <fraction name="keyboardHeightMultiplierAddl">100%</fraction>
+    <fraction name="keyboardGapMultiplierAddl">100%</fraction>
+    <dimen name="keyboardSidePaddingAddl">0dp</dimen>
+    <dimen name="keyboardBottomPaddingAddl">0dp</dimen>
+</resources>
\ No newline at end of file
diff --git a/java/res/xml-sw600dp-land/kbd_more_keys_keyboard_template.xml b/java/res/xml-sw600dp-land/kbd_more_keys_keyboard_template.xml
deleted file mode 100644
index b606dbdf6..000000000
--- a/java/res/xml-sw600dp-land/kbd_more_keys_keyboard_template.xml
+++ /dev/null
@@ -1,26 +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.
-*/
--->
-
-<Keyboard xmlns:latin="http://schemas.android.com/apk/res-auto"
-    latin:keyWidth="5%p"
-    latin:rowHeight="@dimen/config_more_keys_keyboard_key_height"
-    style="?attr/moreKeysKeyboardStyle"
-    >
-</Keyboard>
diff --git a/java/res/xml-sw600dp-land/kbd_number.xml b/java/res/xml-sw600dp-land/kbd_number.xml
deleted file mode 100644
index de02deebc..000000000
--- a/java/res/xml-sw600dp-land/kbd_number.xml
+++ /dev/null
@@ -1,30 +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.
-*/
--->
-
-<Keyboard
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
-    latin:keyboardLeftPadding="10%p"
-    latin:keyboardRightPadding="10%p"
-    latin:keyWidth="18%p"
-    latin:touchPositionCorrectionData="@array/touch_position_correction_data_default"
->
-    <include
-        latin:keyboardLayout="@xml/rows_number" />
-</Keyboard>
diff --git a/java/res/xml-sw600dp-land/kbd_phone.xml b/java/res/xml-sw600dp-land/kbd_phone.xml
deleted file mode 100644
index 6a8acaf35..000000000
--- a/java/res/xml-sw600dp-land/kbd_phone.xml
+++ /dev/null
@@ -1,30 +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.
-*/
--->
-
-<Keyboard
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
-    latin:keyboardLeftPadding="10%p"
-    latin:keyboardRightPadding="10%p"
-    latin:keyWidth="18%p"
-    latin:touchPositionCorrectionData="@array/touch_position_correction_data_default"
->
-    <include
-        latin:keyboardLayout="@xml/rows_phone" />
-</Keyboard>
diff --git a/java/res/xml-sw600dp-land/kbd_phone_symbols.xml b/java/res/xml-sw600dp-land/kbd_phone_symbols.xml
deleted file mode 100644
index 6314c097b..000000000
--- a/java/res/xml-sw600dp-land/kbd_phone_symbols.xml
+++ /dev/null
@@ -1,31 +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.
-*/
--->
-
-<Keyboard
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
-    latin:keyboardLeftPadding="10%p"
-    latin:keyboardRightPadding="10%p"
-    latin:keyWidth="18%p"
-    latin:touchPositionCorrectionData="@array/touch_position_correction_data_default"
->
-    <!-- Tablet doesn't have phone symbols keyboard -->
-    <include
-        latin:keyboardLayout="@xml/rows_phone" />
-</Keyboard>
diff --git a/java/res/xml-sw600dp-land/key_space_3kw.xml b/java/res/xml-sw600dp-land/key_space_3kw.xml
deleted file mode 100644
index 10bea62fd..000000000
--- a/java/res/xml-sw600dp-land/key_space_3kw.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2014, 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.
-*/
--->
-
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
->
-    <!-- TODO: Consolidate the layout specification between protrait and landscape.
-         Ideally just the keyWidth should be different -->
-    <switch>
-        <!-- fa: Perisan
-             kn: Kannada
-             ne: Nepali
-             te: Telugu -->
-        <case
-            latin:languageCode="fa|kn|ne|te"
-            latin:bottomEmojiKeyEnabled="true"
-            latin:mode="text|im"
-        >
-            <Key
-                latin:keyStyle="bottomEmojiKeyStyle" />
-            <Key
-                latin:keyStyle="spaceKeyStyle"
-                latin:keyWidth="7.0%p" />
-            <Key
-                latin:keyStyle="zwnjKeyStyle" />
-        </case>
-        <case
-            latin:languageCode="fa|kn|ne|te"
-            latin:bottomEmojiKeyEnabled="false"
-        >
-            <Key
-                latin:keyStyle="spaceKeyStyle"
-                latin:keyWidth="14.0%p" />
-            <Key
-                latin:keyStyle="zwnjKeyStyle" />
-        </case>
-        <case
-            latin:bottomEmojiKeyEnabled="true"
-            latin:mode="text|im"
-        >
-            <Key
-                latin:keyStyle="bottomEmojiKeyStyle" />
-            <Key
-                latin:keyStyle="spaceKeyStyle"
-                latin:keyWidth="14.0%p" />
-        </case>
-        <!-- bottomEmojiKeyEnabled="false" -->
-        <default>
-            <Key
-                latin:keyStyle="spaceKeyStyle"
-                latin:keyWidth="21.0%p" />
-        </default>
-    </switch>
-</merge>
diff --git a/java/res/xml-sw600dp-land/row_qwerty4.xml b/java/res/xml-sw600dp-land/row_qwerty4.xml
deleted file mode 100644
index 41300c5bc..000000000
--- a/java/res/xml-sw600dp-land/row_qwerty4.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2014, 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.
-*/
--->
-
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
->
-    <switch>
-        <!-- Split the 4th row for split layouts -->
-        <case
-            latin:isSplitLayout="true"
-        >
-            <Row
-                latin:keyWidth="7.0%p"
-                latin:backgroundType="functional"
-            >
-                <Key
-                    latin:keyStyle="toSymbolKeyStyle" />
-                <include
-                    latin:keyboardLayout="@xml/key_comma" />
-                <!-- Space key. -->
-                <include
-                    latin:keyboardLayout="@xml/key_space_3kw"
-                    latin:backgroundType="normal" />
-                <Spacer
-                    latin:keyWidth="28.0%p" />
-                <Key
-                    latin:keyStyle="spaceKeyStyle"
-                    latin:keyWidth="21.0%p" />
-                <include
-                    latin:keyboardLayout="@xml/key_period" />
-                <include
-                    latin:keyboardLayout="@xml/key_emoji" />
-            </Row>
-        </case>
-        <default>
-            <Row
-                latin:keyWidth="9.0%p"
-                latin:backgroundType="functional"
-            >
-                <Key
-                    latin:keyStyle="toSymbolKeyStyle"
-                    latin:keyWidth="10.0%p" />
-                <include
-                    latin:keyboardLayout="@xml/key_comma" />
-                <!-- Space key. -->
-                <include
-                    latin:keyXPos="19.0%p"
-                    latin:keyboardLayout="@xml/key_space_7kw"
-                    latin:backgroundType="normal" />
-                <include
-                    latin:keyboardLayout="@xml/key_period" />
-                <include
-                    latin:keyboardLayout="@xml/key_emoji" />
-            </Row>
-        </default>
-    </switch>
-</merge>
diff --git a/java/res/xml-sw600dp-land/rows_qwerty.xml b/java/res/xml-sw600dp-land/rows_qwerty.xml
deleted file mode 100644
index 27e8ae92e..000000000
--- a/java/res/xml-sw600dp-land/rows_qwerty.xml
+++ /dev/null
@@ -1,146 +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.
-*/
--->
-
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
->
-    <include
-        latin:keyboardLayout="@xml/key_styles_common" />
-    <switch>
-        <case latin:numberRow="true">
-            <Row
-                latin:keyWidth="10%p"
-                >
-                <include
-                    latin:keyboardLayout="@xml/rowkeys_numbers" />
-            </Row>
-        </case>
-        <default>
-
-        </default>
-    </switch>
-    <!-- First row -->
-    <Row>
-        <switch>
-            <!-- Split keyboard layout for the first row -->
-            <case
-                latin:isSplitLayout="true"
-            >
-                <include
-                    latin:keyboardLayout="@xml/rowkeys_qwerty1_left5"
-                    latin:keyWidth="7.0%p" />
-                <Spacer
-                    latin:keyWidth="20.0%p" />
-                <include
-                    latin:keyboardLayout="@xml/rowkeys_qwerty1_right5"
-                    latin:keyWidth="7.0%p" />
-                <Key
-                    latin:keyStyle="deleteKeyStyle"
-                    latin:keyWidth="10.0%p" />
-            </case>
-            <!-- Regular layout for the first row -->
-            <default>
-                <include
-                    latin:keyboardLayout="@xml/rowkeys_qwerty1"
-                    latin:keyWidth="9.0%p" />
-                <Key
-                    latin:keyStyle="deleteKeyStyle"
-                    latin:keyWidth="fillRight" />
-            </default>
-        </switch>
-    </Row>
-    <!-- Second row -->
-    <Row>
-        <switch>
-            <!-- Split keyboard layout for the second row -->
-            <case
-                latin:isSplitLayout="true"
-            >
-                <include
-                    latin:keyboardLayout="@xml/rowkeys_qwerty2_left5"
-                    latin:keyXPos="4.0%p"
-                    latin:keyWidth="7.0%p" />
-                <Spacer
-                    latin:keyWidth="23.0%p" />
-                <include
-                    latin:keyboardLayout="@xml/rowkeys_qwerty2_right4"
-                    latin:keyWidth="7.0%p" />
-                <Key
-                    latin:keyStyle="enterKeyStyle"
-                    latin:keyWidth="10.0%p" />
-            </case>
-            <!-- Regular layout for the second row -->
-            <default>
-                <include
-                    latin:keyboardLayout="@xml/rowkeys_qwerty2"
-                    latin:keyXPos="4.5%p"
-                    latin:keyWidth="9.0%p" />
-                <Key
-                    latin:keyStyle="enterKeyStyle"
-                    latin:keyWidth="fillRight" />
-            </default>
-        </switch>
-    </Row>
-    <!-- Third row -->
-    <Row>
-        <switch>
-            <!-- Split keyboard layout for the third row -->
-            <case
-                latin:isSplitLayout="true"
-            >
-                <Key
-                    latin:keyStyle="shiftKeyStyle"
-                    latin:keyWidth="10.0%p" />
-                <include
-                    latin:keyboardLayout="@xml/rowkeys_qwerty3_left4"
-                    latin:keyWidth="7.0%p" />
-                <Spacer
-                    latin:keyWidth="17.0%p" />
-                <include
-                    latin:keyboardLayout="@xml/rowkeys_qwerty3_right3"
-                    latin:keyWidth="7.0%p" />
-                <include
-                    latin:keyboardLayout="@xml/keys_exclamation_question"
-                    latin:keyWidth="7.0%p" />
-                <Key
-                    latin:keyStyle="shiftKeyStyle"
-                    latin:keyWidth="10.0%p" />
-            </case>
-            <!-- Regular layout for the third row -->
-            <default>
-                <Key
-                    latin:keyStyle="shiftKeyStyle"
-                    latin:keyWidth="10.0%p" />
-                <include
-                    latin:keyboardLayout="@xml/rowkeys_qwerty3"
-                    latin:keyWidth="9.0%p" />
-                <include
-                    latin:keyboardLayout="@xml/keys_exclamation_question"
-                    latin:keyWidth="9.0%p" />
-                <Key
-                    latin:keyStyle="shiftKeyStyle"
-                    latin:keyWidth="fillRight" />
-            </default>
-        </switch>
-    </Row>
-    <!-- Fourth row -->
-    <include
-        latin:keyboardLayout="@xml/row_qwerty4" />
-</merge>
diff --git a/java/res/xml-sw600dp/kbd_more_keys_keyboard_template.xml b/java/res/xml-sw600dp/kbd_more_keys_keyboard_template.xml
deleted file mode 100644
index cbed0e010..000000000
--- a/java/res/xml-sw600dp/kbd_more_keys_keyboard_template.xml
+++ /dev/null
@@ -1,26 +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.
-*/
--->
-
-<Keyboard xmlns:latin="http://schemas.android.com/apk/res-auto"
-    latin:keyWidth="8%p"
-    latin:rowHeight="@dimen/config_more_keys_keyboard_key_height"
-    style="?attr/moreKeysKeyboardStyle"
-    >
-</Keyboard>
diff --git a/java/res/xml-sw600dp/kbd_number.xml b/java/res/xml-sw600dp/kbd_number.xml
deleted file mode 100644
index d46a575ef..000000000
--- a/java/res/xml-sw600dp/kbd_number.xml
+++ /dev/null
@@ -1,28 +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.
-*/
--->
-
-<Keyboard
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
-    latin:keyWidth="18%p"
-    latin:touchPositionCorrectionData="@array/touch_position_correction_data_default"
->
-    <include
-        latin:keyboardLayout="@xml/rows_number" />
-</Keyboard>
diff --git a/java/res/xml-sw600dp/kbd_phone.xml b/java/res/xml-sw600dp/kbd_phone.xml
deleted file mode 100644
index dcfa1af1a..000000000
--- a/java/res/xml-sw600dp/kbd_phone.xml
+++ /dev/null
@@ -1,28 +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.
-*/
--->
-
-<Keyboard
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
-    latin:keyWidth="18%p"
-    latin:touchPositionCorrectionData="@array/touch_position_correction_data_default"
->
-    <include
-        latin:keyboardLayout="@xml/rows_phone" />
-</Keyboard>
diff --git a/java/res/xml-sw600dp/kbd_phone_symbols.xml b/java/res/xml-sw600dp/kbd_phone_symbols.xml
deleted file mode 100644
index 9af3c8aec..000000000
--- a/java/res/xml-sw600dp/kbd_phone_symbols.xml
+++ /dev/null
@@ -1,29 +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.
-*/
--->
-
-<Keyboard
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
-    latin:keyWidth="18%p"
-    latin:touchPositionCorrectionData="@array/touch_position_correction_data_default"
->
-    <!-- Tablet doesn't have phone symbols keyboard -->
-    <include
-        latin:keyboardLayout="@xml/rows_phone" />
-</Keyboard>
diff --git a/java/res/xml-sw600dp/key_comma.xml b/java/res/xml-sw600dp/key_comma.xml
deleted file mode 100644
index 84ac7f981..000000000
--- a/java/res/xml-sw600dp/key_comma.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2012, 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.
-*/
--->
-
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
->
-    <switch>
-        <case
-            latin:mode="url"
-        >
-            <Key
-                latin:keySpec="/"
-                latin:keyStyle="settingsMoreKeysStyle" />
-        </case>
-        <case
-            latin:mode="email"
-        >
-            <Key
-                latin:keySpec="\@"
-                latin:keyStyle="settingsMoreKeysStyle" />
-        </case>
-        <case
-            latin:keyboardLayoutSet="dvorak"
-        >
-            <Key
-                latin:keySpec="!"
-                latin:moreKeys="!text/morekeys_exclamation,%"
-                latin:keyStyle="settingsMoreKeysStyle" />
-        </case>
-        <default>
-            <Key
-                latin:keySpec="!text/keyspec_tablet_comma"
-                latin:moreKeys="!text/morekeys_tablet_comma,%"
-                latin:keyHintLabel="!text/keyhintlabel_tablet_comma"
-                latin:keyLabelFlags="hasPopupHint"
-                latin:keyStyle="settingsMoreKeysStyle" />
-        </default>
-    </switch>
-</merge>
diff --git a/java/res/xml-sw600dp/key_period.xml b/java/res/xml-sw600dp/key_period.xml
deleted file mode 100644
index 554f7ab07..000000000
--- a/java/res/xml-sw600dp/key_period.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2014, 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.
-*/
--->
-
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
->
-    <!-- The table period key which may have different label depending on locale -->
-    <!-- Kept as a separate file for cleaner overriding by an overlay.  -->
-    <switch>
-        <case
-            latin:keyboardLayoutSet="dvorak"
-        >
-            <Key
-                latin:keySpec="\?"
-                latin:moreKeys="!text/morekeys_tablet_period,!text/morekeys_question" />
-        </case>
-        <default>
-            <Key
-                latin:keySpec="!text/keyspec_tablet_period"
-                latin:keyHintLabel="!text/keyhintlabel_tablet_period"
-                latin:keyLabelFlags="hasPopupHint"
-                latin:moreKeys="!text/morekeys_tablet_period"
-                latin:backgroundType="functional"
-                latin:keyStyle="hasShiftedLetterHintStyle" />
-        </default>
-    </switch>
-</merge>
diff --git a/java/res/xml-sw600dp/key_settings.xml b/java/res/xml-sw600dp/key_settings.xml
deleted file mode 100644
index a11efe1a5..000000000
--- a/java/res/xml-sw600dp/key_settings.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2014, 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.
-*/
--->
-
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
->
-    <switch>
-        <case
-            latin:clobberSettingsKey="false"
-        >
-            <Key
-                latin:keyStyle="settingsKeyStyle" />
-        </case>
-        <!-- clobberSettingsKey="true" -->
-        <default>
-            <Spacer />
-        </default>
-    </switch>
-</merge>
diff --git a/java/res/xml-sw600dp/key_space_3kw.xml b/java/res/xml-sw600dp/key_space_3kw.xml
deleted file mode 100644
index 0a4b75445..000000000
--- a/java/res/xml-sw600dp/key_space_3kw.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2014, 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.
-*/
--->
-
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
->
-    <switch>
-        <case
-            latin:keyboardLayoutSet="bengali_akkhor|farsi|kannada|nepali_romanized|nepali_traditional|telugu"
-            latin:bottomEmojiKeyEnabled="true"
-            latin:mode="text|im"
-        >
-            <Key
-                latin:keyStyle="bottomEmojiKeyStyle" />
-            <Key
-                latin:keyStyle="spaceKeyStyle"
-                latin:keyWidth="8.0%p" />
-            <Key
-                latin:keyStyle="zwnjKeyStyle" />
-        </case>
-        <case
-            latin:keyboardLayoutSet="bengali_akkhor|farsi|kannada|nepali_romanized|nepali_traditional|telugu"
-            latin:bottomEmojiKeyEnabled="false"
-        >
-            <Key
-                latin:keyStyle="spaceKeyStyle"
-                latin:keyWidth="16.0%p" />
-            <Key
-                latin:keyStyle="zwnjKeyStyle" />
-        </case>
-        <case
-            latin:bottomEmojiKeyEnabled="true"
-            latin:mode="text|im"
-        >
-            <Key
-                latin:keyStyle="bottomEmojiKeyStyle" />
-            <Key
-                latin:keyStyle="spaceKeyStyle"
-                latin:keyWidth="16.0%p" />
-        </case>
-        <!-- bottomEmojiKeyEnabled="false" -->
-        <default>
-            <Key
-                latin:keyStyle="spaceKeyStyle"
-                latin:keyWidth="24.0%p" />
-        </default>
-    </switch>
-</merge>
diff --git a/java/res/xml-sw600dp/key_space_7kw.xml b/java/res/xml-sw600dp/key_space_7kw.xml
deleted file mode 100644
index a88d2ffb4..000000000
--- a/java/res/xml-sw600dp/key_space_7kw.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2012, 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.
-*/
--->
-
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
->
-    <switch>
-        <case
-            latin:keyboardLayoutSet="bengali_akkhor|farsi|kannada|nepali_romanized|nepali_traditional|telugu"
-            latin:bottomEmojiKeyEnabled="true"
-            latin:mode="text|im"
-        >
-            <Key
-                latin:keyStyle="bottomEmojiKeyStyle" />
-            <Key
-                latin:keyStyle="spaceKeyStyle"
-                latin:keyWidth="45.0%p" />
-            <Key
-                latin:keyStyle="zwnjKeyStyle" />
-        </case>
-        <case
-            latin:keyboardLayoutSet="bengali_akkhor|farsi|kannada|nepali_romanized|nepali_traditional|telugu"
-            latin:bottomEmojiKeyEnabled="false"
-        >
-            <Key
-                latin:keyStyle="spaceKeyStyle"
-                latin:keyWidth="54.0%p" />
-            <Key
-                latin:keyStyle="zwnjKeyStyle" />
-        </case>
-        <case
-            latin:bottomEmojiKeyEnabled="true"
-            latin:mode="text|im"
-        >
-            <Key
-                latin:keyStyle="bottomEmojiKeyStyle" />
-            <Key
-                latin:keyStyle="spaceKeyStyle"
-                latin:keyWidth="54.0%p" />
-        </case>
-        <!-- bottomEmojiKeyEnabled="false" -->
-        <default>
-            <Key
-                latin:keyStyle="spaceKeyStyle"
-                latin:keyWidth="63.0%p" />
-        </default>
-    </switch>
-</merge>
diff --git a/java/res/xml-sw600dp/key_space_symbols.xml b/java/res/xml-sw600dp/key_space_symbols.xml
deleted file mode 100644
index 43270970b..000000000
--- a/java/res/xml-sw600dp/key_space_symbols.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2012, 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.
-*/
--->
-
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
->
-    <Key
-        latin:keyStyle="spaceKeyStyle"
-        latin:keyWidth="45.0%p" />
-</merge>
diff --git a/java/res/xml-sw600dp/key_styles_common.xml b/java/res/xml-sw600dp/key_styles_common.xml
deleted file mode 100644
index 448be74e6..000000000
--- a/java/res/xml-sw600dp/key_styles_common.xml
+++ /dev/null
@@ -1,167 +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.
-*/
--->
-
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
->
-    <switch>
-        <case
-            latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLockShifted"
-        >
-            <key-style
-                latin:styleName="hasShiftedLetterHintStyle"
-                latin:keyLabelFlags="hasShiftedLetterHint|shiftedLetterActivated" />
-        </case>
-        <default>
-            <key-style
-                latin:styleName="hasShiftedLetterHintStyle"
-                latin:keyLabelFlags="hasShiftedLetterHint" />
-        </default>
-    </switch>
-    <include
-        latin:keyboardLayout="@xml/key_styles_settings" />
-    <!-- Functional key styles -->
-    <!-- Base style for shift key. A single space is used for base label in moreKeys. -->
-    <key-style
-        latin:styleName="baseForShiftKeyStyle"
-        latin:keyActionFlags="noKeyPreview"
-        latin:keyLabelFlags="preserveCase"
-        latin:moreKeys="!noPanelAutoMoreKey!, |!code/key_capslock" />
-    <switch>
-        <case
-            latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetAutomaticShifted"
-        >
-            <key-style
-                latin:styleName="shiftKeyStyle"
-                latin:keySpec="!icon/shift_key_shifted|!code/key_shift"
-                latin:backgroundType="stickyOff"
-                latin:parentStyle="baseForShiftKeyStyle" />
-        </case>
-        <case
-            latin:keyboardLayoutSetElement="alphabetShiftLocked|alphabetShiftLockShifted"
-        >
-            <key-style
-                latin:styleName="shiftKeyStyle"
-                latin:keySpec="!icon/shift_key_shifted|!code/key_shift"
-                latin:backgroundType="stickyOn"
-                latin:parentStyle="baseForShiftKeyStyle" />
-        </case>
-        <default>
-            <key-style
-                latin:styleName="shiftKeyStyle"
-                latin:keySpec="!icon/shift_key|!code/key_shift"
-                latin:backgroundType="stickyOff"
-                latin:parentStyle="baseForShiftKeyStyle" />
-        </default>
-    </switch>
-    <key-style
-        latin:styleName="deleteKeyStyle"
-        latin:keySpec="!icon/delete_key|!code/key_delete"
-        latin:keyActionFlags="isRepeatable|noKeyPreview"
-        latin:backgroundType="functional" />
-    <include
-        latin:keyboardLayout="@xml/key_styles_enter" />
-    <!-- TODO: Currently there is no way to specify icon alignment per theme. -->
-    <key-style
-        latin:styleName="spaceKeyStyle"
-        latin:keySpec="!icon/space_key|!code/key_space"
-        latin:backgroundType="spacebar"
-        latin:keyActionFlags="noKeyPreview|enableLongPress" />
-    <!-- U+200C: ZERO WIDTH NON-JOINER
-         U+200D: ZERO WIDTH JOINER -->
-    <key-style
-        latin:styleName="zwnjKeyStyle"
-        latin:keySpec="!icon/zwnj_key|&#x200C;"
-        latin:moreKeys="!icon/zwj_key|&#x200D;"
-        latin:keyLabelFlags="hasPopupHint"
-        latin:keyActionFlags="noKeyPreview" />
-    <key-style
-        latin:styleName="shortcutKeyStyle"
-        latin:keySpec="!icon/shortcut_key|!code/key_shortcut"
-        latin:keyIconDisabled="!icon/shortcut_key_disabled"
-        latin:keyActionFlags="noKeyPreview"
-        latin:backgroundType="functional" />
-    <key-style
-        latin:styleName="bottomEmojiKeyStyle"
-        latin:keySpec="!icon/emoji_normal_key|!code/key_emoji"
-        latin:keyActionFlags="noKeyPreview" />
-    <key-style
-        latin:styleName="emojiKeyStyle"
-        latin:keySpec="!icon/emoji_normal_key|!code/key_emoji"
-        latin:keyActionFlags="noKeyPreview"
-        latin:backgroundType="functional" />
-    <key-style
-        latin:styleName="settingsKeyStyle"
-        latin:keySpec="!icon/settings_key|!code/key_settings"
-        latin:keyActionFlags="noKeyPreview"
-        latin:backgroundType="functional" />
-    <switch>
-        <case
-            latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLockShifted"
-            latin:navigatePrevious="true"
-        >
-            <key-style
-                latin:styleName="tabKeyStyle"
-                latin:keySpec="!icon/tab_key|!code/key_action_previous"
-                latin:backgroundType="functional" />
-        </case>
-        <case
-            latin:keyboardLayoutSetElement="alphabet|alphabetAutomaticShifted|alphabetShiftLocked"
-            latin:navigateNext="true"
-        >
-            <key-style
-                latin:styleName="tabKeyStyle"
-                latin:keySpec="!icon/tab_key|!code/key_action_next"
-                latin:backgroundType="functional" />
-        </case>
-        <default>
-            <key-style
-                latin:styleName="tabKeyStyle"
-                latin:keySpec="!icon/tab_key|!code/key_tab"
-                latin:backgroundType="functional" />
-        </default>
-    </switch>
-    <key-style
-        latin:styleName="baseForLayoutSwitchKeyStyle"
-        latin:keyLabelFlags="preserveCase|followFunctionalTextColor"
-        latin:keyActionFlags="noKeyPreview"
-        latin:backgroundType="functional" />
-    <key-style
-        latin:styleName="toSymbolKeyStyle"
-        latin:keySpec="!text/keylabel_to_symbol|!code/key_switch_alpha_symbol"
-        latin:parentStyle="baseForLayoutSwitchKeyStyle" />
-    <key-style
-        latin:styleName="toAlphaKeyStyle"
-        latin:keySpec="!text/keylabel_to_alpha|!code/key_switch_alpha_symbol"
-        latin:parentStyle="baseForLayoutSwitchKeyStyle" />
-    <key-style
-        latin:styleName="toMoreSymbolKeyStyle"
-        latin:keySpec="!text/keylabel_tablet_to_more_symbol|!code/key_shift"
-        latin:parentStyle="baseForLayoutSwitchKeyStyle" />
-    <key-style
-        latin:styleName="backFromMoreSymbolKeyStyle"
-        latin:keySpec="!text/keylabel_to_symbol|!code/key_shift"
-        latin:parentStyle="baseForLayoutSwitchKeyStyle" />
-    <key-style
-        latin:styleName="comKeyStyle"
-        latin:keySpec="!text/keyspec_popular_domain"
-        latin:keyLabelFlags="autoXScale|fontNormal|hasPopupHint|preserveCase"
-        latin:moreKeys="!text/morekeys_popular_domain" />
-</merge>
diff --git a/java/res/xml-sw600dp/key_styles_enter.xml b/java/res/xml-sw600dp/key_styles_enter.xml
deleted file mode 100644
index ac7ff77a4..000000000
--- a/java/res/xml-sw600dp/key_styles_enter.xml
+++ /dev/null
@@ -1,172 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2013, 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.
-*/
--->
-
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
->
-    <!-- Navigate more keys style -->
-    <include latin:keyboardLayout="@xml/key_styles_navigate_more_keys" />
-    <switch>
-        <case
-            latin:imeAction="actionNext"
-            latin:navigatePrevious="true"
-        >
-            <key-style
-                latin:styleName="navigateMoreKeysStyle"
-                latin:parentStyle="navigatePreviousMoreKeysStyle" />
-        </case>
-        <case
-            latin:imeAction="actionNext"
-        >
-            <key-style
-                latin:styleName="navigateMoreKeysStyle" />
-        </case>
-        <case
-            latin:imeAction="actionPrevious"
-            latin:navigateNext="true"
-        >
-            <key-style
-                latin:styleName="navigateMoreKeysStyle"
-                latin:parentStyle="navigateNextMoreKeysStyle" />
-        </case>
-        <case
-            latin:imeAction="actionPrevious"
-        >
-            <key-style
-                latin:styleName="navigateMoreKeysStyle" />
-        </case>
-        <case
-            latin:navigateNext="true"
-            latin:navigatePrevious="true"
-        >
-            <key-style
-                latin:styleName="navigateMoreKeysStyle"
-                latin:parentStyle="navigatePreviousNextMoreKeysStyle" />
-        </case>
-        <case
-            latin:navigateNext="true"
-        >
-            <key-style
-                latin:styleName="navigateMoreKeysStyle"
-                latin:parentStyle="navigateNextMoreKeysStyle" />
-        </case>
-        <case
-            latin:navigatePrevious="true"
-        >
-            <key-style
-                latin:styleName="navigateMoreKeysStyle"
-                latin:parentStyle="navigatePreviousMoreKeysStyle" />
-        </case>
-        <default>
-            <key-style
-                latin:styleName="navigateMoreKeysStyle" />
-        </default>
-    </switch>
-    <!-- Enter key style -->
-    <switch>
-        <case latin:keyboardTheme="ICS|KLP">
-            <key-style
-                latin:styleName="defaultEnterKeyStyle"
-                latin:keySpec="!icon/enter_key|!code/key_enter"
-                latin:keyLabelFlags="preserveCase|autoXScale|followKeyLabelRatio|followFunctionalTextColor"
-                latin:keyActionFlags="noKeyPreview"
-                latin:backgroundType="action"
-                latin:parentStyle="navigateMoreKeysStyle" />
-        </case>
-        <!-- keyboardTheme="LXXLight|LXXDark" -->
-        <default>
-            <key-style
-                latin:styleName="defaultEnterKeyStyle"
-                latin:keySpec="!icon/enter_key|!code/key_enter"
-                latin:keyLabelFlags="preserveCase|autoXScale|followKeyLabelRatio|followFunctionalTextColor"
-                latin:keyActionFlags="noKeyPreview"
-                latin:backgroundType="action"
-                latin:parentStyle="navigateMoreKeysStyle" />
-        </default>
-    </switch>
-    <include latin:keyboardLayout="@xml/key_styles_actions" />
-    <switch>
-        <!-- Shift + Enter in textMultiLine field. -->
-        <case
-            latin:isMultiLine="true"
-            latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLockShifted"
-        >
-            <key-style
-                latin:styleName="enterKeyStyle"
-                latin:keySpec="!icon/enter_key|!code/key_shift_enter"
-                latin:parentStyle="defaultEnterKeyStyle" />
-        </case>
-        <case
-            latin:imeAction="actionGo"
-        >
-            <key-style
-                latin:styleName="enterKeyStyle"
-                latin:parentStyle="goActionKeyStyle" />
-        </case>
-        <case
-            latin:imeAction="actionNext"
-        >
-            <key-style
-                latin:styleName="enterKeyStyle"
-                latin:parentStyle="nextActionKeyStyle" />
-        </case>
-        <case
-            latin:imeAction="actionPrevious"
-        >
-            <key-style
-                latin:styleName="enterKeyStyle"
-                latin:parentStyle="previousActionKeyStyle" />
-        </case>
-        <case
-            latin:imeAction="actionDone"
-        >
-            <key-style
-                latin:styleName="enterKeyStyle"
-                latin:parentStyle="doneActionKeyStyle" />
-        </case>
-        <case
-            latin:imeAction="actionSend"
-        >
-            <key-style
-                latin:styleName="enterKeyStyle"
-                latin:parentStyle="sendActionKeyStyle" />
-        </case>
-        <case
-            latin:imeAction="actionSearch"
-        >
-            <key-style
-                latin:styleName="enterKeyStyle"
-                latin:parentStyle="searchActionKeyStyle" />
-        </case>
-        <case
-            latin:imeAction="actionCustomLabel"
-        >
-            <key-style
-                latin:styleName="enterKeyStyle"
-                latin:parentStyle="customLabelActionKeyStyle" />
-        </case>
-        <!-- imeAction is either actionNone or actionUnspecified. -->
-        <default>
-            <key-style
-                latin:styleName="enterKeyStyle"
-                latin:parentStyle="defaultEnterKeyStyle" />
-        </default>
-    </switch>
-</merge>
diff --git a/java/res/xml-sw600dp/keys_arabic3_left.xml b/java/res/xml-sw600dp/keys_arabic3_left.xml
deleted file mode 100644
index baeb98044..000000000
--- a/java/res/xml-sw600dp/keys_arabic3_left.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2013, 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.
-*/
--->
-
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
->
-    <!-- U+0630: "ذ" ARABIC LETTER THAL -->
-    <Key
-        latin:keySpec="&#x0630;" />
-    <!-- U+0626: "ئ" ARABIC LETTER YEH WITH HAMZA ABOVE -->
-    <Key
-        latin:keySpec="&#x0626;" />
-</merge>
diff --git a/java/res/xml-sw600dp/keys_dvorak_123.xml b/java/res/xml-sw600dp/keys_dvorak_123.xml
deleted file mode 100644
index 11842f8b6..000000000
--- a/java/res/xml-sw600dp/keys_dvorak_123.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2012, 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.
-*/
--->
-
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
->
-    <switch>
-        <case
-            latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted"
-        >
-            <Key
-                latin:keySpec="&quot;"
-                latin:keyHintLabel="1"
-                latin:additionalMoreKeys="1" />
-            <Key
-                latin:keySpec="&lt;"
-                latin:keyHintLabel="2"
-                latin:additionalMoreKeys="2" />
-            <Key
-                latin:keySpec="&gt;"
-                latin:keyHintLabel="3"
-                latin:additionalMoreKeys="3" />
-        </case>
-        <default>
-            <Key
-                latin:keySpec="\'"
-                latin:keyHintLabel="1"
-                latin:additionalMoreKeys="1"
-                latin:moreKeys="!,&quot;" />
-            <Key
-                latin:keySpec=","
-                latin:keyHintLabel="2"
-                latin:additionalMoreKeys="2"
-                latin:moreKeys="\?,&lt;" />
-            <Key
-                latin:keySpec="."
-                latin:keyHintLabel="3"
-                latin:additionalMoreKeys="3"
-                latin:moreKeys="&gt;" />
-        </default>
-    </switch>
-</merge>
diff --git a/java/res/xml-sw600dp/keys_exclamation_question.xml b/java/res/xml-sw600dp/keys_exclamation_question.xml
deleted file mode 100644
index 3651fddfe..000000000
--- a/java/res/xml-sw600dp/keys_exclamation_question.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2013, 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.
-*/
--->
-
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
->
-    <Key
-        latin:keySpec="!"
-        latin:moreKeys="!text/morekeys_exclamation"
-        latin:keyLabelFlags="fontDefault" />
-    <Key
-        latin:keySpec="\?"
-        latin:moreKeys="!text/morekeys_question"
-        latin:keyLabelFlags="fontDefault" />
-</merge>
diff --git a/java/res/xml-sw600dp/keys_farsi3_right.xml b/java/res/xml-sw600dp/keys_farsi3_right.xml
deleted file mode 100644
index 396a4be26..000000000
--- a/java/res/xml-sw600dp/keys_farsi3_right.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2013, 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.
-*/
--->
-
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
->
-    <!-- U+0622: "آ" ARABIC LETTER ALEF WITH MADDA ABOVE -->
-    <Key
-        latin:keySpec="&#x0622;" />
-    <!-- U+0686: "چ" ARABIC LETTER TCHEH -->
-    <Key
-        latin:keySpec="&#x0686;" />
-</merge>
diff --git a/java/res/xml-sw600dp/keys_pcqwerty2_right3.xml b/java/res/xml-sw600dp/keys_pcqwerty2_right3.xml
deleted file mode 100644
index 02e8a971d..000000000
--- a/java/res/xml-sw600dp/keys_pcqwerty2_right3.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2012, 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.
-*/
--->
-
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
->
-    <switch>
-        <case
-            latin:keyboardLayoutSetElement="alphabet|alphabetAutomaticShifted|alphabetShiftLocked"
-        >
-            <Key
-                latin:keySpec="["
-                latin:keyHintLabel="{"
-                latin:additionalMoreKeys="{"
-                latin:keyStyle="hasShiftedLetterHintStyle" />
-            <Key
-                latin:keySpec="]"
-                latin:keyHintLabel="}"
-                latin:additionalMoreKeys="}"
-                latin:keyStyle="hasShiftedLetterHintStyle" />
-            <Key
-                latin:keySpec="\\"
-                latin:keyHintLabel="|"
-                latin:additionalMoreKeys="\\|"
-                latin:keyStyle="hasShiftedLetterHintStyle" />
-        </case>
-        <!-- keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted" -->
-        <default>
-            <Key
-                latin:keySpec="{" />
-            <Key
-                latin:keySpec="}" />
-            <Key
-                latin:keySpec="|" />
-        </default>
-    </switch>
-</merge>
\ No newline at end of file
diff --git a/java/res/xml-sw600dp/keys_pcqwerty3_right2.xml b/java/res/xml-sw600dp/keys_pcqwerty3_right2.xml
deleted file mode 100644
index a0ad182a9..000000000
--- a/java/res/xml-sw600dp/keys_pcqwerty3_right2.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2012, 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.
-*/
--->
-
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
->
-    <switch>
-        <case
-            latin:keyboardLayoutSetElement="alphabet|alphabetAutomaticShifted|alphabetShiftLocked"
-        >
-            <Key
-                latin:keySpec=";"
-                latin:keyHintLabel=":"
-                latin:additionalMoreKeys=":"
-                latin:keyStyle="hasShiftedLetterHintStyle" />
-            <Key
-                latin:keySpec="\'"
-                latin:keyHintLabel="&quot;"
-                latin:additionalMoreKeys="&quot;"
-                latin:keyStyle="hasShiftedLetterHintStyle"
-                latin:moreKeys="!fixedColumnOrder!4,!text/double_quotes,%,!text/single_quotes" />
-        </case>
-        <!-- keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted" -->
-        <default>
-            <Key
-                latin:keySpec=":" />
-            <Key
-                latin:keySpec="&quot;"
-                latin:moreKeys="!fixedColumnOrder!3,!text/double_quotes,!text/single_quotes" />
-        </default>
-    </switch>
-</merge>
diff --git a/java/res/xml-sw600dp/keys_pcqwerty4_right3.xml b/java/res/xml-sw600dp/keys_pcqwerty4_right3.xml
deleted file mode 100644
index 05f03f9df..000000000
--- a/java/res/xml-sw600dp/keys_pcqwerty4_right3.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2012, 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.
-*/
--->
-
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
->
-    <switch>
-        <case
-            latin:keyboardLayoutSetElement="alphabet|alphabetAutomaticShifted|alphabetShiftLocked"
-        >
-            <Key
-                latin:keySpec=","
-                latin:keyHintLabel="&lt;"
-                latin:additionalMoreKeys="&lt;"
-                latin:keyStyle="hasShiftedLetterHintStyle" />
-            <Key
-                latin:keySpec="."
-                latin:keyHintLabel="&gt;"
-                latin:additionalMoreKeys="&gt;"
-                latin:keyStyle="hasShiftedLetterHintStyle" />
-            <Key
-                latin:keySpec="/"
-                latin:keyHintLabel="\?"
-                latin:additionalMoreKeys="\?"
-                latin:keyStyle="hasShiftedLetterHintStyle"
-                latin:moreKeys="!text/morekeys_question" />
-        </case>
-        <!-- keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted" -->
-        <default>
-            <!-- U+2039: "‹" SINGLE LEFT-POINTING ANGLE QUOTATION MARK
-                 U+203A: "›" SINGLE RIGHT-POINTING ANGLE QUOTATION MARK
-                 U+2264: "≤" LESS-THAN OR EQUAL TO
-                 U+2265: "≥" GREATER-THAN EQUAL TO
-                 U+00AB: "«" LEFT-POINTING DOUBLE ANGLE QUOTATION MARK
-                 U+00BB: "»" RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK -->
-            <Key
-                latin:keySpec="&lt;"
-                latin:moreKeys="!fixedColumnOrder!3,&#x2039;,&#x2264;,&#x00AB;" />
-            <Key
-                latin:keySpec="&gt;"
-                latin:moreKeys="!fixedColumnOrder!3,&#x203A;,&#x2265;,&#x00BB;" />
-            <Key
-                latin:keySpec="\?"
-                latin:moreKeys="!text/morekeys_question" />
-        </default>
-    </switch>
-</merge>
diff --git a/java/res/xml-sw600dp/row_pcqwerty5.xml b/java/res/xml-sw600dp/row_pcqwerty5.xml
deleted file mode 100644
index d0ee90802..000000000
--- a/java/res/xml-sw600dp/row_pcqwerty5.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2012, 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.
-*/
--->
-
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
->
-    <Row
-        latin:keyWidth="7.0%p"
-    >
-        <include
-            latin:keyWidth="9.0%p"
-            latin:keyboardLayout="@xml/key_settings" />
-        <switch>
-            <case
-                latin:bottomEmojiKeyEnabled="true"
-                latin:mode="text|im"
-            >
-                <Key
-                    latin:keyStyle="bottomEmojiKeyStyle"
-                    latin:keyXPos="22.0%p"
-                    latin:keyWidth="9.0%p" />
-                <Key
-                    latin:keyStyle="spaceKeyStyle"
-                    latin:keyWidth="40.0%p" />
-            </case>
-            <default>
-                <Key
-                    latin:keyStyle="spaceKeyStyle"
-                    latin:keyXPos="29.0%p"
-                    latin:keyWidth="42.0%p" />
-            </default>
-        </switch>
-        <include
-            latin:keyXPos="-9.0%p"
-            latin:keyWidth="9.0%p"
-            latin:backgroundType="functional"
-            latin:keyboardLayout="@xml/key_emoji" />
-    </Row>
-</merge>
diff --git a/java/res/xml-sw600dp/row_qwerty4.xml b/java/res/xml-sw600dp/row_qwerty4.xml
deleted file mode 100644
index 7eb6da8a9..000000000
--- a/java/res/xml-sw600dp/row_qwerty4.xml
+++ /dev/null
@@ -1,74 +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.
-*/
--->
-
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
->
-    <switch>
-        <!-- Split the 4th row for split layouts -->
-        <case
-            latin:isSplitLayout="true"
-        >
-            <Row
-                latin:keyWidth="8.0%p"
-                latin:backgroundType="functional"
-            >
-                <Key
-                    latin:keyStyle="toSymbolKeyStyle" />
-                <include
-                    latin:keyboardLayout="@xml/key_comma" />
-                <!-- Space key. -->
-                <include
-                    latin:keyboardLayout="@xml/key_space_3kw"
-                    latin:backgroundType="normal" />
-                <Spacer
-                    latin:keyWidth="20.0%p" />
-                <Key
-                    latin:keyStyle="spaceKeyStyle"
-                    latin:keyWidth="24.0%p" />
-                <include
-                    latin:keyboardLayout="@xml/key_period" />
-                <include
-                    latin:keyboardLayout="@xml/key_emoji" />
-            </Row>
-        </case>
-        <default>
-            <Row
-                latin:keyWidth="9.0%p"
-                latin:backgroundType="functional"
-            >
-                <Key
-                    latin:keyStyle="toSymbolKeyStyle"
-                    latin:keyWidth="10.0%p" />
-                <include
-                    latin:keyboardLayout="@xml/key_comma" />
-                <!-- Space key. -->
-                <include
-                    latin:keyXPos="19.0%p"
-                    latin:keyboardLayout="@xml/key_space_7kw"
-                    latin:backgroundType="normal" />
-                <include
-                    latin:keyboardLayout="@xml/key_period" />
-                <include
-                    latin:keyboardLayout="@xml/key_emoji" />
-            </Row>
-        </default>
-    </switch>
-</merge>
diff --git a/java/res/xml-sw600dp/rowkeys_dvorak3.xml b/java/res/xml-sw600dp/rowkeys_dvorak3.xml
deleted file mode 100644
index ce98a9733..000000000
--- a/java/res/xml-sw600dp/rowkeys_dvorak3.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2012, 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.
-*/
--->
-
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
->
-    <Key
-        latin:keySpec="q" />
-    <Key
-        latin:keySpec="j"
-        latin:moreKeys="!text/morekeys_j" />
-    <Key
-        latin:keySpec="k"
-        latin:moreKeys="!text/morekeys_k" />
-    <Key
-        latin:keySpec="x" />
-    <Key
-        latin:keySpec="b" />
-    <Key
-        latin:keySpec="m" />
-    <Key
-        latin:keySpec="w"
-        latin:moreKeys="!text/morekeys_w" />
-    <Key
-        latin:keySpec="v"
-        latin:moreKeys="!text/morekeys_v" />
-    <Key
-        latin:keySpec="z"
-        latin:moreKeys="!text/morekeys_z" />
-</merge>
diff --git a/java/res/xml-sw600dp/rowkeys_pcqwerty1.xml b/java/res/xml-sw600dp/rowkeys_pcqwerty1.xml
deleted file mode 100644
index 094d1c6ab..000000000
--- a/java/res/xml-sw600dp/rowkeys_pcqwerty1.xml
+++ /dev/null
@@ -1,118 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2012, 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.
-*/
--->
-
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
->
-    <switch>
-        <case
-            latin:keyboardLayoutSetElement="alphabet|alphabetAutomaticShifted|alphabetShiftLocked"
-        >
-            <Key
-                latin:keySpec="`"
-                latin:keyHintLabel="~"
-                latin:additionalMoreKeys="~"
-                latin:keyStyle="hasShiftedLetterHintStyle" />
-            <Key
-                latin:keySpec="1"
-                latin:keyHintLabel="!"
-                latin:additionalMoreKeys="!"
-                latin:keyStyle="hasShiftedLetterHintStyle"
-                latin:moreKeys="!text/morekeys_exclamation,!text/morekeys_symbols_1" />
-            <Key
-                latin:keySpec="2"
-                latin:keyHintLabel="\@"
-                latin:additionalMoreKeys="\@"
-                latin:keyStyle="hasShiftedLetterHintStyle"
-                latin:moreKeys="!text/morekeys_symbols_2" />
-            <Key
-                latin:keySpec="3"
-                latin:keyHintLabel="\#"
-                latin:additionalMoreKeys="\#"
-                latin:keyStyle="hasShiftedLetterHintStyle"
-                latin:moreKeys="!text/morekeys_symbols_3" />
-            <Key
-                latin:keySpec="4"
-                latin:keyHintLabel="$"
-                latin:additionalMoreKeys="$"
-                latin:keyStyle="hasShiftedLetterHintStyle"
-                latin:moreKeys="!text/morekeys_symbols_4" />
-            <Key
-                latin:keySpec="5"
-                latin:keyHintLabel="%"
-                latin:additionalMoreKeys="\\%"
-                latin:keyStyle="hasShiftedLetterHintStyle"
-                latin:moreKeys="!text/morekeys_symbols_5" />
-            <Key
-                latin:keySpec="6"
-                latin:keyHintLabel="^"
-                latin:additionalMoreKeys="^"
-                latin:keyStyle="hasShiftedLetterHintStyle"
-                latin:moreKeys="!text/morekeys_symbols_6" />
-            <Key
-                latin:keySpec="7"
-                latin:keyHintLabel="&amp;"
-                latin:additionalMoreKeys="&amp;"
-                latin:keyStyle="hasShiftedLetterHintStyle"
-                latin:moreKeys="!text/morekeys_symbols_7" />
-            <Key
-                latin:keySpec="8"
-                latin:keyHintLabel="*"
-                latin:additionalMoreKeys="*"
-                latin:keyStyle="hasShiftedLetterHintStyle"
-                latin:moreKeys="!text/morekeys_symbols_8" />
-            <Key
-                latin:keySpec="9"
-                latin:keyHintLabel="("
-                latin:additionalMoreKeys="("
-                latin:keyStyle="hasShiftedLetterHintStyle"
-                latin:moreKeys="!text/morekeys_symbols_9" />
-            <Key
-                latin:keySpec="0"
-                latin:keyHintLabel=")"
-                latin:additionalMoreKeys=")"
-                latin:keyStyle="hasShiftedLetterHintStyle"
-                latin:moreKeys="!text/morekeys_symbols_0" />
-            <!-- U+2013: "–" EN DASH
-                 U+2014: "—" EM DASH
-                 U+00B7: "·" MIDDLE DOT -->
-            <Key
-                latin:keySpec="-"
-                latin:keyHintLabel="_"
-                latin:additionalMoreKeys="_"
-                latin:keyStyle="hasShiftedLetterHintStyle"
-                latin:moreKeys="&#x2013;,&#x2014;,&#x00B7;" />
-            <!-- U+221E: "∞" INFINITY
-                 U+2260: "≠" NOT EQUAL TO
-                 U+2248: "≈" ALMOST EQUAL TO -->
-            <Key
-                latin:keySpec="="
-                latin:keyHintLabel="+"
-                latin:additionalMoreKeys="+"
-                latin:keyStyle="hasShiftedLetterHintStyle"
-                latin:moreKeys="&#x221E;,&#x2260;,&#x2248;" />
-        </case>
-        <!-- keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLockShifted" -->
-        <default>
-            <include
-                 latin:keyboardLayout="@xml/rowkeys_pcqwerty1_shift" />
-        </default>
-    </switch>
-</merge>
diff --git a/java/res/xml-sw600dp/rows_arabic.xml b/java/res/xml-sw600dp/rows_arabic.xml
deleted file mode 100644
index df2b1891f..000000000
--- a/java/res/xml-sw600dp/rows_arabic.xml
+++ /dev/null
@@ -1,48 +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.
-*/
--->
-
-<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
-    <include latin:keyboardLayout="@xml/key_styles_common" />
-    <Row
-        latin:keyWidth="8.182%p"
-        latin:keyLabelFlags="fontNormal"
-    >
-        <include latin:keyboardLayout="@xml/rowkeys_arabic1" />
-        <Key
-            latin:keyStyle="deleteKeyStyle"
-            latin:keyWidth="fillRight" />
-    </Row>
-    <Row
-        latin:keyWidth="8.182%p"
-        latin:keyLabelFlags="fontNormal"
-    >
-        <include latin:keyboardLayout="@xml/rowkeys_arabic2" />
-        <Key
-            latin:keyStyle="enterKeyStyle"
-            latin:keyWidth="fillRight" />
-    </Row>
-    <Row
-        latin:keyWidth="8.182%p"
-        latin:keyLabelFlags="fontNormal"
-    >
-        <include latin:keyboardLayout="@xml/rowkeys_arabic3" />
-    </Row>
-    <include latin:keyboardLayout="@xml/row_qwerty4" />
-</merge>
diff --git a/java/res/xml-sw600dp/rows_armenian_phonetic.xml b/java/res/xml-sw600dp/rows_armenian_phonetic.xml
deleted file mode 100644
index 188c841a1..000000000
--- a/java/res/xml-sw600dp/rows_armenian_phonetic.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2013, 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.
-*/
--->
-
-<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
-    <include latin:keyboardLayout="@xml/key_styles_common" />
-    <Row
-        latin:keyWidth="9.0%p"
-        latin:keyLabelFlags="fontNormal"
-    >
-        <include latin:keyboardLayout="@xml/rowkeys_armenian_phonetic1" />
-        <Key
-            latin:keyStyle="deleteKeyStyle"
-            latin:keyWidth="fillRight" />
-    </Row>
-    <Row
-        latin:keyWidth="9.0%p"
-        latin:keyLabelFlags="fontNormal"
-    >
-        <include latin:keyboardLayout="@xml/rowkeys_armenian_phonetic2" />
-        <include latin:keyboardLayout="@xml/key_armenian_xeh" />
-    </Row>
-    <Row
-        latin:keyWidth="9.0%p"
-        latin:keyLabelFlags="fontNormal"
-    >
-        <include latin:keyboardLayout="@xml/rowkeys_armenian_phonetic3" />
-        <include latin:keyboardLayout="@xml/key_armenian_sha" />
-        <Key
-            latin:keyStyle="enterKeyStyle"
-            latin:keyWidth="fillRight" />
-    </Row>
-    <Row
-        latin:keyWidth="8.8889%p"
-        latin:keyLabelFlags="fontNormal"
-    >
-        <Key
-            latin:keyStyle="shiftKeyStyle"
-            latin:keyWidth="10.0%p" />
-        <include latin:keyboardLayout="@xml/rowkeys_armenian_phonetic4" />
-        <include latin:keyboardLayout="@xml/keys_exclamation_question" />
-        <Key
-            latin:keyStyle="shiftKeyStyle"
-            latin:keyWidth="fillRight" />
-    </Row>
-    <include latin:keyboardLayout="@xml/row_qwerty4" />
-</merge>
diff --git a/java/res/xml-sw600dp/rows_azerty.xml b/java/res/xml-sw600dp/rows_azerty.xml
deleted file mode 100644
index d047c729f..000000000
--- a/java/res/xml-sw600dp/rows_azerty.xml
+++ /dev/null
@@ -1,60 +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.
-*/
--->
-
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
->
-    <include
-        latin:keyboardLayout="@xml/key_styles_common" />
-    <Row
-        latin:keyWidth="9.0%p"
-    >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_azerty1" />
-        <Key
-            latin:keyStyle="deleteKeyStyle"
-            latin:keyWidth="fillRight" />
-    </Row>
-    <Row
-        latin:keyWidth="9.0%p"
-    >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_azerty2" />
-        <Key
-            latin:keyStyle="enterKeyStyle"
-            latin:keyWidth="fillRight" />
-    </Row>
-    <Row
-        latin:keyWidth="9.0%p"
-    >
-        <Key
-            latin:keyStyle="shiftKeyStyle"
-            latin:keyWidth="10.0%p" />
-        <include
-            latin:keyboardLayout="@xml/rowkeys_azerty3" />
-        <include
-            latin:keyboardLayout="@xml/keys_exclamation_question" />
-        <Key
-            latin:keyStyle="shiftKeyStyle"
-            latin:keyWidth="fillRight" />
-    </Row>
-    <include
-        latin:keyboardLayout="@xml/row_qwerty4" />
-</merge>
diff --git a/java/res/xml-sw600dp/rows_bengali.xml b/java/res/xml-sw600dp/rows_bengali.xml
deleted file mode 100644
index 9dfe32139..000000000
--- a/java/res/xml-sw600dp/rows_bengali.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2014, 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.
-*/
--->
-
-<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
-    <include latin:keyboardLayout="@xml/key_styles_common" />
-    <Row
-        latin:keyWidth="8.182%p"
-        latin:keyLabelFlags="fontNormal"
-    >
-        <include latin:keyboardLayout="@xml/rowkeys_bengali1" />
-        <Key
-            latin:keyStyle="deleteKeyStyle"
-            latin:keyWidth="fillRight" />
-    </Row>
-    <Row
-        latin:keyWidth="8.182%p"
-        latin:keyLabelFlags="fontNormal"
-    >
-        <include latin:keyboardLayout="@xml/rowkeys_bengali2" />
-        <Key
-            latin:keyStyle="enterKeyStyle"
-            latin:keyWidth="fillRight" />
-    </Row>
-    <Row
-        latin:keyWidth="8.182%p"
-        latin:keyLabelFlags="fontNormal"
-    >
-        <include latin:keyboardLayout="@xml/rowkeys_bengali3" />
-        <include latin:keyboardLayout="@xml/keys_exclamation_question" />
-    </Row>
-    <include latin:keyboardLayout="@xml/row_qwerty4" />
-</merge>
diff --git a/java/res/xml-sw600dp/rows_bengali_akkhor.xml b/java/res/xml-sw600dp/rows_bengali_akkhor.xml
deleted file mode 100644
index d51cbb296..000000000
--- a/java/res/xml-sw600dp/rows_bengali_akkhor.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2014, 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.
-*/
--->
-
-<merge xmlns:latin="http://schemas.android.com/apk/res-auto" >
-    <include latin:keyboardLayout="@xml/key_styles_common" />
-    <Row
-        latin:keyLabelFlags="fontNormal"
-        latin:keyWidth="8.182%p" >
-        <include latin:keyboardLayout="@xml/rowkeys_bengali_akkhor1" />
-        <Key
-            latin:keyStyle="deleteKeyStyle"
-            latin:keyWidth="fillRight" />
-    </Row>
-    <Row
-        latin:keyLabelFlags="fontNormal"
-        latin:keyWidth="8.182%p" >
-        <include latin:keyboardLayout="@xml/rowkeys_bengali_akkhor2" />
-        <Key
-            latin:keyStyle="enterKeyStyle"
-            latin:keyWidth="fillRight" />
-    </Row>
-    <Row
-        latin:keyLabelFlags="fontNormal"
-        latin:keyWidth="8.182%p" >
-        <Key
-            latin:keyStyle="shiftKeyStyle"
-            latin:keyWidth="10.0%p" />
-
-        <include latin:keyboardLayout="@xml/rowkeys_bengali_akkhor3" />
-        <include latin:keyboardLayout="@xml/keys_exclamation_question" />
-    </Row>
-    <include latin:keyboardLayout="@xml/row_qwerty4" />
-</merge>
diff --git a/java/res/xml-sw600dp/rows_bulgarian.xml b/java/res/xml-sw600dp/rows_bulgarian.xml
deleted file mode 100644
index e575ead56..000000000
--- a/java/res/xml-sw600dp/rows_bulgarian.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2012, 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.
-*/
--->
-
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
->
-    <include
-        latin:keyboardLayout="@xml/key_styles_common" />
-    <Row
-        latin:keyWidth="8.182%p"
-    >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_bulgarian1" />
-        <Key
-            latin:keyStyle="deleteKeyStyle"
-            latin:keyWidth="fillRight" />
-    </Row>
-    <Row
-        latin:keyWidth="8.182%p"
-    >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_bulgarian2" />
-        <Key
-            latin:keyStyle="enterKeyStyle"
-            latin:keyWidth="fillRight" />
-    </Row>
-    <Row
-        latin:keyWidth="8.182%p"
-    >
-        <Key
-            latin:keyStyle="shiftKeyStyle"
-            latin:keyWidth="10.0%p" />
-        <include
-            latin:keyboardLayout="@xml/rowkeys_bulgarian3" />
-        <include
-            latin:keyboardLayout="@xml/keys_exclamation_question" />
-        <Key
-            latin:keyStyle="shiftKeyStyle"
-            latin:keyWidth="fillRight" />
-    </Row>
-    <include
-        latin:keyboardLayout="@xml/row_qwerty4" />
-</merge>
diff --git a/java/res/xml-sw600dp/rows_bulgarian_bds.xml b/java/res/xml-sw600dp/rows_bulgarian_bds.xml
deleted file mode 100644
index e290a8c18..000000000
--- a/java/res/xml-sw600dp/rows_bulgarian_bds.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2012, 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.
-*/
--->
-
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
->
-    <include
-        latin:keyboardLayout="@xml/key_styles_common" />
-    <Row
-        latin:keyWidth="8.182%p"
-    >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_bulgarian_bds1" />
-        <Key
-            latin:keyStyle="deleteKeyStyle"
-            latin:keyWidth="fillRight" />
-    </Row>
-    <Row
-        latin:keyWidth="8.182%p"
-    >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_bulgarian_bds2" />
-        <Key
-            latin:keyStyle="enterKeyStyle"
-            latin:keyWidth="fillRight" />
-    </Row>
-    <Row
-        latin:keyWidth="8.182%p"
-    >
-        <Key
-            latin:keyStyle="shiftKeyStyle"
-            latin:keyWidth="10.0%p" />
-        <include
-            latin:keyboardLayout="@xml/rowkeys_bulgarian_bds3" />
-        <include
-            latin:keyboardLayout="@xml/keys_exclamation_question" />
-    </Row>
-    <include
-        latin:keyboardLayout="@xml/row_qwerty4" />
-</merge>
diff --git a/java/res/xml-sw600dp/rows_colemak.xml b/java/res/xml-sw600dp/rows_colemak.xml
deleted file mode 100644
index f3f32d159..000000000
--- a/java/res/xml-sw600dp/rows_colemak.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2012, 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.
-*/
--->
-
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
->
-    <include
-        latin:keyboardLayout="@xml/key_styles_common" />
-    <Row
-        latin:keyWidth="9.0%p"
-    >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_colemak1" />
-        <Key
-            latin:keyStyle="deleteKeyStyle"
-            latin:keyWidth="fillRight" />
-    </Row>
-    <Row
-        latin:keyWidth="9.0%p"
-    >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_colemak2" />
-        <Key
-            latin:keyStyle="enterKeyStyle"
-            latin:keyWidth="fillRight" />
-    </Row>
-    <Row
-        latin:keyWidth="9.0%p"
-    >
-        <Key
-            latin:keyStyle="shiftKeyStyle"
-            latin:keyWidth="10.0%p" />
-        <include
-            latin:keyboardLayout="@xml/rowkeys_colemak3" />
-        <include
-            latin:keyboardLayout="@xml/keys_exclamation_question" />
-        <Key
-            latin:keyStyle="shiftKeyStyle"
-            latin:keyWidth="fillRight" />
-    </Row>
-    <include
-        latin:keyboardLayout="@xml/row_qwerty4" />
-</merge>
diff --git a/java/res/xml-sw600dp/rows_dvorak.xml b/java/res/xml-sw600dp/rows_dvorak.xml
deleted file mode 100644
index 9fb3e649d..000000000
--- a/java/res/xml-sw600dp/rows_dvorak.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2012, 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.
-*/
--->
-
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
->
-    <include
-        latin:keyboardLayout="@xml/key_styles_common" />
-    <Row
-        latin:keyWidth="9.0%p"
-    >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_dvorak1" />
-        <Key
-            latin:keyStyle="deleteKeyStyle"
-            latin:keyWidth="fillRight" />
-    </Row>
-    <Row
-        latin:keyWidth="9.0%p"
-    >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_dvorak2" />
-        <Key
-            latin:keyStyle="enterKeyStyle"
-            latin:keyWidth="fillRight" />
-    </Row>
-    <Row
-        latin:keyWidth="9.0%p"
-    >
-        <Key
-            latin:keyStyle="shiftKeyStyle"
-            latin:keyWidth="10.0%p" />
-        <include
-            latin:keyboardLayout="@xml/rowkeys_dvorak3" />
-        <Key
-            latin:keyStyle="shiftKeyStyle"
-            latin:keyWidth="fillRight" />
-    </Row>
-    <!-- Dvorak layout shares almost the same row with Qwerty layout.
-         The difference is defined in xml-sw600dp/row_qwerty4.xml. -->
-    <include
-        latin:keyboardLayout="@xml/row_qwerty4" />
-</merge>
diff --git a/java/res/xml-sw600dp/rows_east_slavic.xml b/java/res/xml-sw600dp/rows_east_slavic.xml
deleted file mode 100644
index 8c08bbff6..000000000
--- a/java/res/xml-sw600dp/rows_east_slavic.xml
+++ /dev/null
@@ -1,57 +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.
-*/
--->
-
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
->
-    <include
-        latin:keyboardLayout="@xml/key_styles_common" />
-    <Row
-        latin:keyWidth="8.182%p"
-    >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_east_slavic1" />
-        <Key
-            latin:keyStyle="deleteKeyStyle"
-            latin:keyWidth="fillRight" />
-    </Row>
-    <Row
-        latin:keyWidth="8.182%p"
-    >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_east_slavic2" />
-        <Key
-            latin:keyStyle="enterKeyStyle"
-            latin:keyWidth="fillRight" />
-    </Row>
-    <Row
-        latin:keyWidth="8.182%p"
-    >
-        <Key
-            latin:keyStyle="shiftKeyStyle"
-            latin:keyWidth="10.0%p" />
-        <include
-            latin:keyboardLayout="@xml/rowkeys_east_slavic3" />
-        <include
-            latin:keyboardLayout="@xml/keys_exclamation_question" />
-    </Row>
-    <include
-        latin:keyboardLayout="@xml/row_qwerty4" />
-</merge>
diff --git a/java/res/xml-sw600dp/rows_farsi.xml b/java/res/xml-sw600dp/rows_farsi.xml
deleted file mode 100644
index 2849df58a..000000000
--- a/java/res/xml-sw600dp/rows_farsi.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2012, 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.
-*/
--->
-
-<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
-    <include latin:keyboardLayout="@xml/key_styles_common" />
-    <Row
-        latin:keyWidth="8.182%p"
-        latin:keyLabelFlags="fontNormal"
-    >
-        <include latin:keyboardLayout="@xml/rowkeys_farsi1" />
-        <Key
-            latin:keyStyle="deleteKeyStyle"
-            latin:keyWidth="fillRight" />
-    </Row>
-    <Row
-        latin:keyWidth="8.182%p"
-        latin:keyLabelFlags="fontNormal"
-    >
-        <include latin:keyboardLayout="@xml/rowkeys_farsi2" />
-        <Key
-            latin:keyStyle="enterKeyStyle"
-            latin:keyWidth="fillRight" />
-    </Row>
-    <Row
-        latin:keyWidth="8.182%p"
-        latin:keyLabelFlags="fontNormal"
-    >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_farsi3"
-            latin:keyXPos="4.091%p" />
-    </Row>
-    <include latin:keyboardLayout="@xml/row_qwerty4" />
-</merge>
diff --git a/java/res/xml-sw600dp/rows_georgian.xml b/java/res/xml-sw600dp/rows_georgian.xml
deleted file mode 100644
index 7874c7531..000000000
--- a/java/res/xml-sw600dp/rows_georgian.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2012, 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.
-*/
--->
-
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
->
-    <include
-        latin:keyboardLayout="@xml/key_styles_common" />
-    <Row
-        latin:keyWidth="9.0%p"
-    >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_georgian1" />
-        <Key
-            latin:keyStyle="deleteKeyStyle"
-            latin:keyWidth="fillRight" />
-    </Row>
-    <Row
-        latin:keyWidth="9.0%p"
-    >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_georgian2"
-            latin:keyXPos="4.5%p" />
-        <Key
-            latin:keyStyle="enterKeyStyle"
-            latin:keyWidth="fillRight" />
-    </Row>
-    <Row
-        latin:keyWidth="9.0%p"
-    >
-        <Key
-            latin:keyStyle="shiftKeyStyle"
-            latin:keyWidth="10.0%p" />
-        <include
-            latin:keyboardLayout="@xml/rowkeys_georgian3" />
-        <include
-            latin:keyboardLayout="@xml/keys_exclamation_question" />
-        <Key
-            latin:keyStyle="shiftKeyStyle"
-            latin:keyWidth="fillRight" />
-    </Row>
-    <include
-        latin:keyboardLayout="@xml/row_qwerty4" />
-</merge>
diff --git a/java/res/xml-sw600dp/rows_greek.xml b/java/res/xml-sw600dp/rows_greek.xml
deleted file mode 100644
index b2ed3e3a2..000000000
--- a/java/res/xml-sw600dp/rows_greek.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2012, 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.
-*/
--->
-
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
->
-    <include
-        latin:keyboardLayout="@xml/key_styles_common" />
-    <Row
-        latin:keyWidth="9.0%p"
-    >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_greek1" />
-        <Key
-            latin:keyStyle="deleteKeyStyle"
-            latin:keyWidth="fillRight" />
-    </Row>
-    <Row
-        latin:keyWidth="9.0%p"
-    >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_greek2"
-            latin:keyXPos="4.5%p" />
-        <Key
-            latin:keyStyle="enterKeyStyle"
-            latin:keyWidth="fillRight" />
-    </Row>
-    <Row
-        latin:keyWidth="9.0%p"
-    >
-        <Key
-            latin:keyStyle="shiftKeyStyle"
-            latin:keyWidth="10.0%p" />
-        <include
-            latin:keyboardLayout="@xml/rowkeys_greek3" />
-        <include
-            latin:keyboardLayout="@xml/keys_exclamation_question" />
-        <Key
-            latin:keyStyle="shiftKeyStyle"
-            latin:keyWidth="fillRight" />
-    </Row>
-    <include
-        latin:keyboardLayout="@xml/row_qwerty4" />
-</merge>
diff --git a/java/res/xml-sw600dp/rows_hebrew.xml b/java/res/xml-sw600dp/rows_hebrew.xml
deleted file mode 100644
index fe582aff6..000000000
--- a/java/res/xml-sw600dp/rows_hebrew.xml
+++ /dev/null
@@ -1,55 +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.
-*/
--->
-
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
->
-    <include
-        latin:keyboardLayout="@xml/key_styles_common" />
-    <Row
-        latin:keyWidth="9.0%p"
-    >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_hebrew1" />
-        <Key
-            latin:keyStyle="deleteKeyStyle"
-            latin:keyWidth="fillRight" />
-    </Row>
-    <Row
-        latin:keyWidth="9.0%p"
-    >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_hebrew2" />
-        <Key
-            latin:keyStyle="enterKeyStyle"
-            latin:keyWidth="fillRight" />
-    </Row>
-    <Row
-        latin:keyWidth="9.0%p"
-    >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_hebrew3" />
-        <include
-            latin:keyboardLayout="@xml/keys_exclamation_question"
-            latin:keyWidth="9.5%p" />
-    </Row>
-    <include
-        latin:keyboardLayout="@xml/row_qwerty4" />
-</merge>
diff --git a/java/res/xml-sw600dp/rows_hindi.xml b/java/res/xml-sw600dp/rows_hindi.xml
deleted file mode 100644
index 7608acf7a..000000000
--- a/java/res/xml-sw600dp/rows_hindi.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2012, 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.
-*/
--->
-
-<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
-    <include latin:keyboardLayout="@xml/key_styles_common" />
-    <Row
-        latin:keyWidth="8.182%p"
-        latin:keyLabelFlags="fontNormal"
-    >
-        <include latin:keyboardLayout="@xml/rowkeys_hindi1" />
-        <Key
-            latin:keyStyle="deleteKeyStyle"
-            latin:keyWidth="fillRight" />
-    </Row>
-    <Row
-        latin:keyWidth="8.182%p"
-        latin:keyLabelFlags="fontNormal"
-    >
-        <include latin:keyboardLayout="@xml/rowkeys_hindi2" />
-        <Key
-            latin:keyStyle="enterKeyStyle"
-            latin:keyWidth="fillRight" />
-    </Row>
-    <Row
-        latin:keyWidth="8.182%p"
-        latin:keyLabelFlags="fontNormal"
-    >
-        <Key
-            latin:keyStyle="shiftKeyStyle"
-            latin:keyWidth="10.0%p" />
-        <include latin:keyboardLayout="@xml/rowkeys_hindi3" />
-        <include latin:keyboardLayout="@xml/keys_exclamation_question" />
-    </Row>
-    <include latin:keyboardLayout="@xml/row_qwerty4" />
-</merge>
diff --git a/java/res/xml-sw600dp/rows_hindi_compact.xml b/java/res/xml-sw600dp/rows_hindi_compact.xml
deleted file mode 100644
index d4a247e4e..000000000
--- a/java/res/xml-sw600dp/rows_hindi_compact.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2014, 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.
-*/
--->
-
-<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
-    <include latin:keyboardLayout="@xml/key_styles_common" />
-    <Row
-        latin:keyWidth="8.182%p"
-        latin:keyLabelFlags="fontNormal"
-    >
-        <include latin:keyboardLayout="@xml/rowkeys_hindi_compact1" />
-        <Key
-            latin:keyStyle="deleteKeyStyle"
-            latin:keyWidth="fillRight" />
-    </Row>
-    <Row
-        latin:keyWidth="8.182%p"
-        latin:keyLabelFlags="fontNormal"
-    >
-        <include latin:keyboardLayout="@xml/rowkeys_hindi_compact2" />
-        <Key
-            latin:keyStyle="enterKeyStyle"
-            latin:keyWidth="fillRight" />
-    </Row>
-    <Row
-        latin:keyWidth="8.182%p"
-        latin:keyLabelFlags="fontNormal"
-    >
-        <include latin:keyboardLayout="@xml/rowkeys_hindi_compact3" />
-        <include latin:keyboardLayout="@xml/keys_exclamation_question" />
-    </Row>
-    <include latin:keyboardLayout="@xml/row_qwerty4" />
-</merge>
diff --git a/java/res/xml-sw600dp/rows_kannada.xml b/java/res/xml-sw600dp/rows_kannada.xml
deleted file mode 100644
index dc755a14c..000000000
--- a/java/res/xml-sw600dp/rows_kannada.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2014, 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.
-*/
--->
-
-<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
-    <include latin:keyboardLayout="@xml/key_styles_common" />
-    <Row
-        latin:keyWidth="8.182%p"
-        latin:keyLabelFlags="fontNormal|autoXScale"
-    >
-        <include latin:keyboardLayout="@xml/rowkeys_kannada1" />
-        <Key
-            latin:keyStyle="deleteKeyStyle"
-            latin:keyWidth="fillRight" />
-    </Row>
-    <Row
-        latin:keyWidth="8.182%p"
-        latin:keyLabelFlags="fontNormal|autoXScale"
-    >
-        <include latin:keyboardLayout="@xml/rowkeys_kannada2" />
-        <Key
-            latin:keyStyle="enterKeyStyle"
-            latin:keyWidth="fillRight" />
-    </Row>
-    <Row
-        latin:keyWidth="8.182%p"
-        latin:keyLabelFlags="fontNormal|autoXScale"
-    >
-        <include latin:keyboardLayout="@xml/rowkeys_kannada3" />
-        <include latin:keyboardLayout="@xml/keys_exclamation_question" />
-    </Row>
-    <include latin:keyboardLayout="@xml/row_qwerty4" />
-</merge>
diff --git a/java/res/xml-sw600dp/rows_khmer.xml b/java/res/xml-sw600dp/rows_khmer.xml
deleted file mode 100644
index 3af0b2077..000000000
--- a/java/res/xml-sw600dp/rows_khmer.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2013, 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.
-*/
--->
-
-<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
-    <include latin:keyboardLayout="@xml/key_styles_common" />
-    <Row
-        latin:keyWidth="7.5%p"
-        latin:keyLabelFlags="fontNormal|autoXScale"
-    >
-        <include latin:keyboardLayout="@xml/rowkeys_khmer1" />
-        <Key
-            latin:keyStyle="deleteKeyStyle"
-            latin:keyWidth="fillRight" />
-    </Row>
-    <Row
-        latin:keyWidth="7.5%p"
-        latin:keyLabelFlags="fontNormal|autoXScale"
-    >
-        <include latin:keyboardLayout="@xml/rowkeys_khmer2" />
-    </Row>
-    <Row
-        latin:keyWidth="7.5%p"
-        latin:keyLabelFlags="fontNormal|autoXScale"
-    >
-        <include latin:keyboardLayout="@xml/rowkeys_khmer3" />
-        <Key
-            latin:keyStyle="enterKeyStyle"
-            latin:keyWidth="fillRight" />
-    </Row>
-    <Row
-        latin:keyWidth="7.5%p"
-        latin:keyLabelFlags="fontNormal|autoXScale"
-    >
-        <Key
-            latin:keyStyle="shiftKeyStyle"
-            latin:keyWidth="10.0%p" />
-        <include latin:keyboardLayout="@xml/rowkeys_khmer4" />
-        <switch>
-            <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted">
-                <Spacer />
-            </case>
-            <default>
-                <include latin:keyboardLayout="@xml/keys_exclamation_question" />
-            </default>
-        </switch>
-    </Row>
-    <include latin:keyboardLayout="@xml/row_qwerty4" />
-</merge>
diff --git a/java/res/xml-sw600dp/rows_lao.xml b/java/res/xml-sw600dp/rows_lao.xml
deleted file mode 100644
index 77a12c264..000000000
--- a/java/res/xml-sw600dp/rows_lao.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2013, 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.
-*/
--->
-
-<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
-    <include latin:keyboardLayout="@xml/key_styles_common" />
-    <Row
-        latin:keyWidth="7.5%p"
-        latin:keyLabelFlags="fontNormal"
-    >
-        <include latin:keyboardLayout="@xml/rowkeys_lao1" />
-        <Key
-            latin:keyStyle="deleteKeyStyle"
-            latin:keyWidth="fillRight" />
-    </Row>
-    <Row
-        latin:keyWidth="7.5%p"
-        latin:keyLabelFlags="fontNormal"
-    >
-        <include latin:keyboardLayout="@xml/rowkeys_lao2" />
-    </Row>
-    <Row
-        latin:keyWidth="7.5%p"
-        latin:keyLabelFlags="fontNormal"
-    >
-        <include latin:keyboardLayout="@xml/rowkeys_lao3" />
-        <Key
-            latin:keyStyle="enterKeyStyle"
-            latin:keyWidth="fillRight" />
-    </Row>
-    <Row
-        latin:keyWidth="7.5%p"
-        latin:keyLabelFlags="fontNormal"
-    >
-        <Key
-            latin:keyStyle="shiftKeyStyle"
-            latin:keyWidth="10.0%p" />
-        <include latin:keyboardLayout="@xml/rowkeys_lao4" />
-        <switch>
-            <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted">
-                <Spacer />
-            </case>
-            <default>
-                <include latin:keyboardLayout="@xml/keys_exclamation_question" />
-            </default>
-        </switch>
-    </Row>
-    <include latin:keyboardLayout="@xml/row_qwerty4" />
-</merge>
diff --git a/java/res/xml-sw600dp/rows_malayalam.xml b/java/res/xml-sw600dp/rows_malayalam.xml
deleted file mode 100644
index f7f425f20..000000000
--- a/java/res/xml-sw600dp/rows_malayalam.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2014, 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.
-*/
--->
-
-<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
-    <include latin:keyboardLayout="@xml/key_styles_common" />
-    <Row
-        latin:keyWidth="8.182%p"
-        latin:keyLabelFlags="fontNormal|autoXScale"
-    >
-        <include latin:keyboardLayout="@xml/rowkeys_malayalam1" />
-        <Key
-            latin:keyStyle="deleteKeyStyle"
-            latin:keyWidth="fillRight" />
-    </Row>
-    <Row
-        latin:keyWidth="8.182%p"
-        latin:keyLabelFlags="fontNormal|autoXScale"
-    >
-        <include latin:keyboardLayout="@xml/rowkeys_malayalam2" />
-        <Key
-            latin:keyStyle="enterKeyStyle"
-            latin:keyWidth="fillRight" />
-    </Row>
-    <Row
-        latin:keyWidth="8.182%p"
-        latin:keyLabelFlags="fontNormal|autoXScale"
-    >
-        <include latin:keyboardLayout="@xml/rowkeys_malayalam3" />
-        <include latin:keyboardLayout="@xml/keys_exclamation_question" />
-    </Row>
-    <include latin:keyboardLayout="@xml/row_qwerty4" />
-</merge>
diff --git a/java/res/xml-sw600dp/rows_marathi.xml b/java/res/xml-sw600dp/rows_marathi.xml
deleted file mode 100644
index f127e1a86..000000000
--- a/java/res/xml-sw600dp/rows_marathi.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2014, 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.
-*/
--->
-
-<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
-    <include latin:keyboardLayout="@xml/key_styles_common" />
-    <Row
-        latin:keyWidth="8.182%p"
-        latin:keyLabelFlags="fontNormal"
-    >
-        <include latin:keyboardLayout="@xml/rowkeys_marathi1" />
-        <Key
-            latin:keyStyle="deleteKeyStyle"
-            latin:keyWidth="fillRight" />
-    </Row>
-    <Row
-        latin:keyWidth="8.182%p"
-        latin:keyLabelFlags="fontNormal"
-    >
-        <include latin:keyboardLayout="@xml/rowkeys_marathi2" />
-        <Key
-            latin:keyStyle="enterKeyStyle"
-            latin:keyWidth="fillRight" />
-    </Row>
-    <Row
-        latin:keyWidth="8.182%p"
-        latin:keyLabelFlags="fontNormal"
-    >
-        <include latin:keyboardLayout="@xml/rowkeys_marathi3" />
-        <include latin:keyboardLayout="@xml/keys_exclamation_question" />
-    </Row>
-    <include latin:keyboardLayout="@xml/row_qwerty4" />
-</merge>
diff --git a/java/res/xml-sw600dp/rows_mongolian.xml b/java/res/xml-sw600dp/rows_mongolian.xml
deleted file mode 100644
index 39e67eb0f..000000000
--- a/java/res/xml-sw600dp/rows_mongolian.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2012, 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.
-*/
--->
-
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
->
-    <include
-        latin:keyboardLayout="@xml/key_styles_common" />
-    <Row
-        latin:keyWidth="8.182%p"
-    >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_mongolian1" />
-        <Key
-            latin:keyStyle="deleteKeyStyle"
-            latin:keyWidth="fillRight" />
-    </Row>
-    <Row
-        latin:keyWidth="8.182%p"
-    >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_mongolian2" />
-        <Key
-            latin:keyStyle="enterKeyStyle"
-            latin:keyWidth="fillRight" />
-    </Row>
-    <Row
-        latin:keyWidth="8.182%p"
-    >
-        <Key
-            latin:keyStyle="shiftKeyStyle"
-            latin:keyWidth="10.0%p" />
-        <include
-            latin:keyboardLayout="@xml/rowkeys_mongolian3" />
-        <include
-            latin:keyboardLayout="@xml/keys_exclamation_question" />
-    </Row>
-    <include
-        latin:keyboardLayout="@xml/row_qwerty4" />
-</merge>
diff --git a/java/res/xml-sw600dp/rows_nepali_romanized.xml b/java/res/xml-sw600dp/rows_nepali_romanized.xml
deleted file mode 100644
index 1f4eb5a35..000000000
--- a/java/res/xml-sw600dp/rows_nepali_romanized.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2013, 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.
-*/
--->
-
-<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
-    <include latin:keyboardLayout="@xml/key_styles_common" />
-    <Row
-        latin:keyWidth="8.182%p"
-        latin:keyLabelFlags="fontNormal"
-    >
-        <include latin:keyboardLayout="@xml/rowkeys_nepali_romanized1" />
-        <Key
-            latin:keyStyle="deleteKeyStyle"
-            latin:keyWidth="fillRight" />
-    </Row>
-    <Row
-        latin:keyWidth="8.182%p"
-        latin:keyLabelFlags="fontNormal"
-    >
-        <include latin:keyboardLayout="@xml/rowkeys_nepali_romanized2" />
-        <Key
-            latin:keyStyle="enterKeyStyle"
-            latin:keyWidth="fillRight" />
-    </Row>
-    <Row
-        latin:keyWidth="8.0%p"
-        latin:keyLabelFlags="fontNormal"
-    >
-        <Key
-            latin:keyStyle="shiftKeyStyle"
-            latin:keyWidth="10.0%p" />
-        <include latin:keyboardLayout="@xml/rowkeys_nepali_romanized3" />
-        <include latin:keyboardLayout="@xml/keys_exclamation_question" />
-        <Key
-            latin:keyStyle="shiftKeyStyle"
-            latin:keyWidth="fillRight" />
-    </Row>
-    <include latin:keyboardLayout="@xml/row_qwerty4" />
-</merge>
diff --git a/java/res/xml-sw600dp/rows_nepali_traditional.xml b/java/res/xml-sw600dp/rows_nepali_traditional.xml
deleted file mode 100644
index 7b0678bf2..000000000
--- a/java/res/xml-sw600dp/rows_nepali_traditional.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2013, 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.
-*/
--->
-
-<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
-    <include latin:keyboardLayout="@xml/key_styles_common" />
-    <Row
-        latin:keyWidth="8.182%p"
-        latin:keyLabelFlags="fontNormal"
-    >
-        <include latin:keyboardLayout="@xml/rowkeys_nepali_traditional1" />
-        <Key
-            latin:keyStyle="deleteKeyStyle"
-            latin:keyWidth="fillRight" />
-    </Row>
-    <Row
-        latin:keyWidth="8.182%p"
-        latin:keyLabelFlags="fontNormal"
-    >
-        <include latin:keyboardLayout="@xml/rowkeys_nepali_traditional2" />
-        <Key
-            latin:keyStyle="enterKeyStyle"
-            latin:keyWidth="fillRight" />
-    </Row>
-    <Row
-        latin:keyWidth="8.182%p"
-        latin:keyLabelFlags="fontNormal"
-    >
-        <Key
-            latin:keyStyle="shiftKeyStyle"
-            latin:keyWidth="10.0%p" />
-        <include latin:keyboardLayout="@xml/rowkeys_nepali_traditional3" />
-        <include latin:keyboardLayout="@xml/keys_exclamation_question" />
-        </Row>
-    <include latin:keyboardLayout="@xml/row_qwerty4" />
-</merge>
diff --git a/java/res/xml-sw600dp/rows_nordic.xml b/java/res/xml-sw600dp/rows_nordic.xml
deleted file mode 100644
index f2242dd95..000000000
--- a/java/res/xml-sw600dp/rows_nordic.xml
+++ /dev/null
@@ -1,63 +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.
-*/
--->
-
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
->
-    <include
-        latin:keyboardLayout="@xml/key_styles_common" />
-    <Row
-        latin:keyWidth="8.182%p"
-    >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_nordic1" />
-        <Key
-            latin:keyStyle="deleteKeyStyle"
-            latin:keyWidth="fillRight" />
-    </Row>
-    <Row
-        latin:keyWidth="8.182%p"
-    >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_nordic2" />
-        <Key
-            latin:keyStyle="enterKeyStyle"
-            latin:keyWidth="fillRight" />
-    </Row>
-    <Row
-        latin:keyWidth="8.182%p"
-    >
-        <Key
-            latin:keyStyle="shiftKeyStyle"
-            latin:keyWidth="10.0%p" />
-        <Spacer
-            latin:keyWidth="3.181%p" />
-        <include
-            latin:keyboardLayout="@xml/rowkeys_qwerty3" />
-        <include
-            latin:keyboardLayout="@xml/keys_exclamation_question" />
-        <Key
-            latin:keyStyle="shiftKeyStyle"
-            latin:keyXPos="-10.0%p"
-            latin:keyWidth="fillRight" />
-    </Row>
-    <include
-        latin:keyboardLayout="@xml/row_qwerty4" />
-</merge>
diff --git a/java/res/xml-sw600dp/rows_number_normal.xml b/java/res/xml-sw600dp/rows_number_normal.xml
deleted file mode 100644
index c364a33c6..000000000
--- a/java/res/xml-sw600dp/rows_number_normal.xml
+++ /dev/null
@@ -1,163 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2012, 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.
-*/
--->
-
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
->
-    <Row>
-        <Key
-            latin:keySpec="-"
-            latin:keyStyle="numSymbolKeyStyle"
-            latin:keyWidth="10%p"
-            latin:backgroundType="functional" />
-        <Key
-            latin:keySpec="+"
-            latin:keyStyle="numSymbolKeyStyle"
-            latin:keyWidth="10%p"
-            latin:backgroundType="functional" />
-        <Key
-            latin:keySpec="."
-            latin:keyStyle="numSymbolKeyStyle"
-            latin:keyWidth="10%p"
-            latin:backgroundType="functional" />
-        <Key
-            latin:keySpec="1"
-            latin:keyStyle="numKeyStyle"
-            latin:keyXPos="31%p" />
-        <Key
-            latin:keySpec="2"
-            latin:keyStyle="numKeyStyle" />
-        <Key
-            latin:keySpec="3"
-            latin:keyStyle="numKeyStyle" />
-        <Key
-            latin:keyStyle="deleteKeyStyle"
-            latin:keyXPos="-14%p"
-            latin:keyWidth="fillRight" />
-    </Row>
-    <Row>
-        <!-- U+FF0A: "＊" FULLWIDTH ASTERISK -->
-        <Key
-            latin:keySpec="&#xFF0A;|*"
-            latin:keyStyle="numSymbolKeyStyle"
-            latin:keyWidth="10%p"
-            latin:backgroundType="functional" />
-        <Key
-            latin:keySpec="/"
-            latin:keyStyle="numSymbolKeyStyle"
-            latin:keyWidth="10%p"
-            latin:backgroundType="functional" />
-        <switch>
-            <case
-                latin:mode="time|datetime"
-            >
-                <Key
-                    latin:keySpec=","
-                    latin:keyLabelFlags="hasPopupHint"
-                    latin:moreKeys="!text/morekeys_am_pm"
-                    latin:keyStyle="numSymbolKeyStyle"
-                    latin:keyWidth="10%p"
-                    latin:backgroundType="functional" />
-            </case>
-            <default>
-                <Key
-                    latin:keySpec=","
-                    latin:keyStyle="numSymbolKeyStyle"
-                    latin:keyWidth="10%p"
-                    latin:backgroundType="functional" />
-            </default>
-        </switch>
-        <Key
-            latin:keySpec="4"
-            latin:keyStyle="numKeyStyle"
-            latin:keyXPos="31%p" />
-        <Key
-            latin:keySpec="5"
-            latin:keyStyle="numKeyStyle" />
-        <Key
-            latin:keySpec="6"
-            latin:keyStyle="numKeyStyle" />
-        <Key
-            latin:keyStyle="enterKeyStyle"
-            latin:keyXPos="-14%p"
-            latin:keyWidth="fillRight" />
-    </Row>
-    <Row>
-        <Key
-            latin:keySpec="("
-            latin:keyStyle="numSymbolKeyStyle"
-            latin:keyWidth="10%p"
-            latin:backgroundType="functional" />
-        <Key
-            latin:keySpec=")"
-            latin:keyStyle="numSymbolKeyStyle"
-            latin:keyWidth="10%p"
-            latin:backgroundType="functional" />
-        <switch>
-            <case
-                latin:mode="time|datetime"
-            >
-                <Key
-                    latin:keySpec=":"
-                    latin:keyStyle="numSymbolKeyStyle"
-                    latin:keyWidth="10%p"
-                    latin:backgroundType="functional" />
-            </case>
-            <default>
-                <Key
-                    latin:keySpec="="
-                    latin:keyStyle="numSymbolKeyStyle"
-                    latin:keyWidth="10%p"
-                    latin:backgroundType="functional" />
-            </default>
-        </switch>
-        <Key
-            latin:keySpec="7"
-            latin:keyStyle="numKeyStyle"
-            latin:keyXPos="31%p" />
-        <Key
-            latin:keySpec="8"
-            latin:keyStyle="numKeyStyle" />
-        <Key
-            latin:keySpec="9"
-            latin:keyStyle="numKeyStyle" />
-        <!-- Note: This Spacer prevents the above key from being marked as a right edge key. -->
-        <Spacer />
-    </Row>
-    <Row>
-        <Key
-            latin:keyStyle="tabletNumSpaceKeyStyle"
-            latin:keyWidth="30%p" />
-        <!-- U+FF0A: "＊" FULLWIDTH ASTERISK -->
-        <Key
-            latin:keySpec="&#xFF0A;|*"
-            latin:keyStyle="numSymbolKeyStyle"
-            latin:keyXPos="31%p" />
-        <Key
-            latin:keySpec="0"
-            latin:keyStyle="numKeyStyle" />
-        <Key
-            latin:keySpec="\#"
-            latin:keyStyle="numKeyStyle" />
-        <!-- Note: This Spacer prevents the above key from being marked as a right edge key. -->
-        <Spacer
-            latin:keyWidth="fillRight" />
-    </Row>
-</merge>
diff --git a/java/res/xml-sw600dp/rows_number_password.xml b/java/res/xml-sw600dp/rows_number_password.xml
deleted file mode 100644
index 543cf7d77..000000000
--- a/java/res/xml-sw600dp/rows_number_password.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2012, 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.
-*/
--->
-
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
->
-    <Row>
-        <!-- Note: This Spacer prevents the below key from being marked as a left edge key. -->
-        <Spacer
-            latin:keyWidth="23%p" />
-        <Key
-            latin:keyStyle="num1KeyStyle" />
-        <Key
-            latin:keyStyle="num2KeyStyle" />
-        <Key
-            latin:keyStyle="num3KeyStyle" />
-        <!-- Note: This Spacer prevents the above key from being marked as a right edge key. -->
-        <Spacer
-            latin:keyWidth="fillRight" />
-    </Row>
-    <Row>
-        <!-- Note: This Spacer prevents the below key from being marked as a left edge key. -->
-        <Spacer
-            latin:keyWidth="23%p" />
-        <Key
-            latin:keyStyle="num4KeyStyle" />
-        <Key
-            latin:keyStyle="num5KeyStyle" />
-        <Key
-            latin:keyStyle="num6KeyStyle" />
-        <!-- Note: This Spacer prevents the above key from being marked as a right edge key. -->
-        <Spacer
-            latin:keyWidth="fillRight" />
-    </Row>
-    <Row>
-        <!-- Note: This Spacer prevents the below key from being marked as a left edge key. -->
-        <Spacer
-            latin:keyWidth="23%p" />
-        <Key
-            latin:keyStyle="num7KeyStyle" />
-        <Key
-            latin:keyStyle="num8KeyStyle" />
-        <Key
-            latin:keyStyle="num9KeyStyle" />
-        <!-- Note: This Spacer prevents the above key from being marked as a right edge key. -->
-        <Spacer
-            latin:keyWidth="fillRight" />
-    </Row>
-    <Row>
-        <!-- Note: This Spacer prevents the below key from being marked as a left edge key. -->
-        <Spacer
-            latin:keyWidth="23%p" />
-        <Key
-            latin:keyStyle="deleteKeyStyle" />
-        <Key
-            latin:keyStyle="num0KeyStyle"
-            latin:keyHintLabel="+" />
-        <Key
-            latin:keyStyle="enterKeyStyle" />
-        <!-- Note: This Spacer prevents the above key from being marked as a right edge key. -->
-        <Spacer
-            latin:keyWidth="fillRight" />
-    </Row>
-</merge>
diff --git a/java/res/xml-sw600dp/rows_pcqwerty.xml b/java/res/xml-sw600dp/rows_pcqwerty.xml
deleted file mode 100644
index 2075c62c0..000000000
--- a/java/res/xml-sw600dp/rows_pcqwerty.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2012, 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.
-*/
--->
-
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
->
-    <include
-        latin:keyboardLayout="@xml/key_styles_common" />
-    <Row
-        latin:keyWidth="7.0%p"
-    >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_pcqwerty1" />
-        <Key
-            latin:keyStyle="deleteKeyStyle"
-            latin:keyWidth="fillRight" />
-    </Row>
-    <Row
-        latin:keyWidth="7.0%p"
-    >
-        <Key
-            latin:keyStyle="tabKeyStyle"
-            latin:keyWidth="9.0%p" />
-        <include
-            latin:keyboardLayout="@xml/rowkeys_pcqwerty2" />
-    </Row>
-    <Row
-        latin:keyWidth="7.0%p"
-    >
-        <Spacer
-            latin:keyWidth="10.0%p" />
-        <include
-            latin:keyboardLayout="@xml/rowkeys_pcqwerty3" />
-        <Key
-            latin:keyStyle="enterKeyStyle"
-            latin:keyWidth="fillRight" />
-    </Row>
-    <Row
-        latin:keyWidth="7.0%p"
-    >
-        <Key
-            latin:keyStyle="shiftKeyStyle"
-            latin:keyWidth="15.0%p" />
-        <include
-            latin:keyboardLayout="@xml/rowkeys_pcqwerty4" />
-        <Key
-            latin:keyStyle="shiftKeyStyle"
-            latin:keyXPos="-15.0%p"
-            latin:keyWidth="fillRight" />
-    </Row>
-    <include
-        latin:keyboardLayout="@xml/row_pcqwerty5" />
-</merge>
diff --git a/java/res/xml-sw600dp/rows_phone.xml b/java/res/xml-sw600dp/rows_phone.xml
deleted file mode 100644
index 9a9c9b9a2..000000000
--- a/java/res/xml-sw600dp/rows_phone.xml
+++ /dev/null
@@ -1,128 +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.
-*/
--->
-
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
->
-    <include
-        latin:keyboardLayout="@xml/key_styles_common" />
-    <include
-        latin:keyboardLayout="@xml/key_styles_number" />
-    <Row>
-        <Key
-            latin:keySpec="-"
-            latin:keyStyle="numSymbolKeyStyle"
-            latin:keyWidth="10%p"
-            latin:backgroundType="functional" />
-        <Key
-            latin:keySpec="+"
-            latin:keyStyle="numSymbolKeyStyle"
-            latin:keyWidth="10%p"
-            latin:backgroundType="functional" />
-        <Key
-            latin:keySpec="!string/label_pause_key|,"
-            latin:keyLabelFlags="followKeyLabelRatio|autoXScale"
-            latin:keyStyle="numSymbolKeyStyle"
-            latin:keyWidth="10%p"
-            latin:backgroundType="functional" />
-        <Key
-            latin:keyStyle="num1KeyStyle"
-            latin:keyXPos="31%p" />
-        <Key
-            latin:keyStyle="num2KeyStyle" />
-        <Key
-            latin:keyStyle="num3KeyStyle" />
-        <Key
-            latin:keyStyle="deleteKeyStyle"
-            latin:keyXPos="-14%p"
-            latin:keyWidth="fillRight" />
-    </Row>
-    <Row>
-        <Key
-            latin:keySpec=","
-            latin:keyStyle="numSymbolKeyStyle"
-            latin:keyWidth="10%p"
-            latin:backgroundType="functional" />
-        <Key
-            latin:keySpec="."
-            latin:keyStyle="numSymbolKeyStyle"
-            latin:keyWidth="10%p"
-            latin:backgroundType="functional" />
-        <Key
-            latin:keySpec="!string/label_wait_key|;"
-            latin:keyLabelFlags="followKeyLabelRatio|autoXScale"
-            latin:keyStyle="numSymbolKeyStyle"
-            latin:keyWidth="10%p"
-            latin:backgroundType="functional" />
-        <Key
-            latin:keyStyle="num4KeyStyle"
-            latin:keyXPos="31%p" />
-        <Key
-            latin:keyStyle="num5KeyStyle" />
-        <Key
-            latin:keyStyle="num6KeyStyle" />
-        <Key
-            latin:keyStyle="enterKeyStyle"
-            latin:keyXPos="-14%p"
-            latin:keyWidth="fillRight" />
-    </Row>
-    <Row>
-        <Key
-            latin:keySpec="("
-            latin:keyStyle="numSymbolKeyStyle"
-            latin:keyWidth="10%p"
-            latin:backgroundType="functional" />
-        <Key
-            latin:keySpec=")"
-            latin:keyStyle="numSymbolKeyStyle"
-            latin:keyWidth="10%p"
-            latin:backgroundType="functional" />
-        <Key
-            latin:keySpec="N"
-            latin:keyStyle="numSymbolKeyStyle"
-            latin:keyWidth="10%p"
-            latin:backgroundType="functional" />
-        <Key
-            latin:keyStyle="num7KeyStyle"
-            latin:keyXPos="31%p" />
-        <Key
-            latin:keyStyle="num8KeyStyle" />
-        <Key
-            latin:keyStyle="num9KeyStyle" />
-        <!-- Note: This Spacer prevents the above key from being marked as a right edge key. -->
-        <Spacer />
-    </Row>
-    <Row>
-        <Key
-            latin:keyStyle="tabletNumSpaceKeyStyle"
-            latin:keyWidth="30%p" />
-        <!-- U+FF0A: "＊" FULLWIDTH ASTERISK -->
-        <Key
-            latin:keySpec="&#xFF0A;|*"
-            latin:keyStyle="numSymbolKeyStyle"
-            latin:keyXPos="31%p" />
-        <Key
-            latin:keyStyle="num0KeyStyle"
-            latin:keyHintLabel="+" />
-        <Key
-            latin:keySpec="\#"
-            latin:keyStyle="numSymbolKeyStyle" />
-    </Row>
-</merge>
diff --git a/java/res/xml-sw600dp/rows_qwerty.xml b/java/res/xml-sw600dp/rows_qwerty.xml
deleted file mode 100644
index 53ac2887a..000000000
--- a/java/res/xml-sw600dp/rows_qwerty.xml
+++ /dev/null
@@ -1,149 +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.
-*/
--->
-
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
->
-    <include
-        latin:keyboardLayout="@xml/key_styles_common" />
-    <switch>
-        <case latin:numberRow="true">
-            <Row
-                latin:keyWidth="10%p"
-                >
-                <include
-                    latin:keyboardLayout="@xml/rowkeys_numbers" />
-            </Row>
-        </case>
-        <default>
-
-        </default>
-    </switch>
-    <!-- TODO: Consolidate the layout specification between protrait and landscape.
-         Ideally just the keyWidth should be different and the spacer should adjust to fill
-         the available space. -->
-    <!-- First row -->
-    <Row>
-        <switch>
-            <!-- Split keyboard layout for the first row -->
-            <case
-                latin:isSplitLayout="true"
-            >
-                <include
-                    latin:keyboardLayout="@xml/rowkeys_qwerty1_left5"
-                    latin:keyWidth="8.0%p" />
-                <Spacer
-                    latin:keyWidth="10.0%p" />
-                <include
-                    latin:keyboardLayout="@xml/rowkeys_qwerty1_right5"
-                    latin:keyWidth="8.0%p" />
-                <Key
-                    latin:keyStyle="deleteKeyStyle"
-                    latin:keyWidth="10.0%p" />
-            </case>
-            <!-- Regular layout for the first row -->
-            <default>
-                <include
-                    latin:keyboardLayout="@xml/rowkeys_qwerty1"
-                    latin:keyWidth="9.0%p" />
-                <Key
-                    latin:keyStyle="deleteKeyStyle"
-                    latin:keyWidth="fillRight" />
-            </default>
-        </switch>
-    </Row>
-    <!-- Second row -->
-    <Row>
-        <switch>
-            <!-- Split keyboard layout for the second row -->
-            <case
-                latin:isSplitLayout="true"
-            >
-                <include
-                    latin:keyboardLayout="@xml/rowkeys_qwerty2_left5"
-                    latin:keyXPos="4.0%p"
-                    latin:keyWidth="8.0%p" />
-                <Spacer
-                    latin:keyWidth="14.0%p" />
-                <include
-                    latin:keyboardLayout="@xml/rowkeys_qwerty2_right4"
-                    latin:keyWidth="8.0%p" />
-                <Key
-                    latin:keyStyle="enterKeyStyle"
-                    latin:keyWidth="10.0%p" />
-            </case>
-            <!-- Regular layout for the second row -->
-            <default>
-                <include
-                    latin:keyboardLayout="@xml/rowkeys_qwerty2"
-                    latin:keyXPos="4.5%p"
-                    latin:keyWidth="9.0%p" />
-                <Key
-                    latin:keyStyle="enterKeyStyle"
-                    latin:keyWidth="fillRight" />
-            </default>
-        </switch>
-    </Row>
-    <!-- Third row -->
-    <Row>
-        <switch>
-            <!-- Split keyboard layout for the third row -->
-            <case
-                latin:isSplitLayout="true"
-            >
-                <Key
-                    latin:keyStyle="shiftKeyStyle"
-                    latin:keyWidth="10.0%p" />
-                <include
-                    latin:keyboardLayout="@xml/rowkeys_qwerty3_left4"
-                    latin:keyWidth="8.0%p" />
-                <Spacer
-                    latin:keyWidth="8.0%p" />
-                <include
-                    latin:keyboardLayout="@xml/rowkeys_qwerty3_right3"
-                    latin:keyWidth="8.0%p" />
-                <include
-                    latin:keyboardLayout="@xml/keys_exclamation_question"
-                    latin:keyWidth="8.0%p" />
-                <Key
-                    latin:keyStyle="shiftKeyStyle"
-                    latin:keyWidth="10.0%p" />
-            </case>
-            <!-- Regular layout for the third row -->
-            <default>
-                <Key
-                    latin:keyStyle="shiftKeyStyle"
-                    latin:keyWidth="10.0%p" />
-                <include
-                    latin:keyboardLayout="@xml/rowkeys_qwerty3"
-                    latin:keyWidth="9.0%p" />
-                <include
-                    latin:keyboardLayout="@xml/keys_exclamation_question"
-                    latin:keyWidth="9.0%p" />
-                <Key
-                    latin:keyStyle="shiftKeyStyle"
-                    latin:keyWidth="fillRight" />
-            </default>
-        </switch>
-    </Row>
-    <!-- Fourth row -->
-    <include
-        latin:keyboardLayout="@xml/row_qwerty4" />
-</merge>
diff --git a/java/res/xml-sw600dp/rows_qwertz.xml b/java/res/xml-sw600dp/rows_qwertz.xml
deleted file mode 100644
index efd534bb5..000000000
--- a/java/res/xml-sw600dp/rows_qwertz.xml
+++ /dev/null
@@ -1,61 +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.
-*/
--->
-
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
->
-    <include
-        latin:keyboardLayout="@xml/key_styles_common" />
-    <Row
-        latin:keyWidth="9.0%p"
-    >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_qwertz1" />
-        <Key
-            latin:keyStyle="deleteKeyStyle"
-            latin:keyWidth="fillRight" />
-    </Row>
-    <Row
-        latin:keyWidth="9.0%p"
-    >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_qwerty2"
-            latin:keyXPos="4.5%p" />
-        <Key
-            latin:keyStyle="enterKeyStyle"
-            latin:keyWidth="fillRight" />
-    </Row>
-    <Row
-        latin:keyWidth="9.0%p"
-    >
-        <Key
-            latin:keyStyle="shiftKeyStyle"
-            latin:keyWidth="10.0%p" />
-        <include
-            latin:keyboardLayout="@xml/rowkeys_qwertz3" />
-        <include
-            latin:keyboardLayout="@xml/keys_exclamation_question" />
-        <Key
-            latin:keyStyle="shiftKeyStyle"
-            latin:keyWidth="fillRight" />
-    </Row>
-    <include
-        latin:keyboardLayout="@xml/row_qwerty4" />
-</merge>
diff --git a/java/res/xml-sw600dp/rows_serbian_qwertz.xml b/java/res/xml-sw600dp/rows_serbian_qwertz.xml
deleted file mode 100644
index 5fd48c617..000000000
--- a/java/res/xml-sw600dp/rows_serbian_qwertz.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2014, 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.
-*/
--->
-
-<merge xmlns:latin="http://schemas.android.com/apk/res-auto" >
-    <include latin:keyboardLayout="@xml/key_styles_common" />
-    <Row latin:keyWidth="8.182%p" >
-        <include latin:keyboardLayout="@xml/rowkeys_serbian_qwertz1" />
-        <Key
-            latin:keyStyle="deleteKeyStyle"
-            latin:keyWidth="fillRight" />
-    </Row>
-    <Row latin:keyWidth="8.182%p" >
-        <include latin:keyboardLayout="@xml/rowkeys_serbian_qwertz2" />
-        <Key
-            latin:keyStyle="enterKeyStyle"
-            latin:keyWidth="fillRight" />
-    </Row>
-    <Row latin:keyWidth="8.182%p" >
-        <Key
-            latin:keyStyle="shiftKeyStyle"
-            latin:keyWidth="10.0%p" />
-        <include latin:keyboardLayout="@xml/rowkeys_serbian_qwertz3" />
-        <include latin:keyboardLayout="@xml/keys_exclamation_question" />
-    </Row>
-    <include latin:keyboardLayout="@xml/row_qwerty4" />
-</merge>
diff --git a/java/res/xml-sw600dp/rows_sinhala.xml b/java/res/xml-sw600dp/rows_sinhala.xml
deleted file mode 100644
index 2fe89792e..000000000
--- a/java/res/xml-sw600dp/rows_sinhala.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2014, 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.
-*/
--->
-
-<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
-    <include latin:keyboardLayout="@xml/key_styles_common" />
-    <Row
-        latin:keyWidth="8.182%p"
-        latin:keyLabelFlags="fontNormal|autoXScale"
-    >
-        <include latin:keyboardLayout="@xml/rowkeys_sinhala1" />
-        <Key
-            latin:keyStyle="deleteKeyStyle"
-            latin:keyWidth="fillRight" />
-    </Row>
-    <Row
-        latin:keyWidth="8.182%p"
-        latin:keyLabelFlags="fontNormal|autoXScale"
-    >
-        <include latin:keyboardLayout="@xml/rowkeys_sinhala2" />
-        <Key
-            latin:keyStyle="enterKeyStyle"
-            latin:keyWidth="fillRight" />
-    </Row>
-    <Row
-        latin:keyWidth="8.182%p"
-        latin:keyLabelFlags="fontNormal|autoXScale"
-    >
-        <Key
-            latin:keyStyle="shiftKeyStyle"
-            latin:keyWidth="10.0%p" />
-        <include latin:keyboardLayout="@xml/rowkeys_sinhala3" />
-        <include latin:keyboardLayout="@xml/keys_exclamation_question" />
-    </Row>
-    <include latin:keyboardLayout="@xml/row_qwerty4" />
-</merge>
diff --git a/java/res/xml-sw600dp/rows_south_slavic.xml b/java/res/xml-sw600dp/rows_south_slavic.xml
deleted file mode 100644
index cfe5c5757..000000000
--- a/java/res/xml-sw600dp/rows_south_slavic.xml
+++ /dev/null
@@ -1,57 +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.
-*/
--->
-
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
->
-    <include
-        latin:keyboardLayout="@xml/key_styles_common" />
-    <Row
-        latin:keyWidth="8.182%p"
-    >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_south_slavic1" />
-        <Key
-            latin:keyStyle="deleteKeyStyle"
-            latin:keyWidth="fillRight" />
-    </Row>
-    <Row
-        latin:keyWidth="8.182%p"
-    >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_south_slavic2" />
-        <Key
-            latin:keyStyle="enterKeyStyle"
-            latin:keyWidth="fillRight" />
-    </Row>
-    <Row
-        latin:keyWidth="8.182%p"
-    >
-        <Key
-            latin:keyStyle="shiftKeyStyle"
-            latin:keyWidth="10.0%p" />
-        <include
-            latin:keyboardLayout="@xml/rowkeys_south_slavic3" />
-        <include
-            latin:keyboardLayout="@xml/keys_exclamation_question" />
-    </Row>
-    <include
-        latin:keyboardLayout="@xml/row_qwerty4" />
-</merge>
diff --git a/java/res/xml-sw600dp/rows_spanish.xml b/java/res/xml-sw600dp/rows_spanish.xml
deleted file mode 100644
index 27be76c9d..000000000
--- a/java/res/xml-sw600dp/rows_spanish.xml
+++ /dev/null
@@ -1,60 +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.
-*/
--->
-
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
->
-    <include
-        latin:keyboardLayout="@xml/key_styles_common" />
-    <Row
-        latin:keyWidth="9.0%p"
-    >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_qwerty1" />
-        <Key
-            latin:keyStyle="deleteKeyStyle"
-            latin:keyWidth="fillRight" />
-    </Row>
-    <Row
-        latin:keyWidth="9.0%p"
-    >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_spanish2" />
-        <Key
-            latin:keyStyle="enterKeyStyle"
-            latin:keyWidth="fillRight" />
-    </Row>
-    <Row
-        latin:keyWidth="9.0%p"
-    >
-        <Key
-            latin:keyStyle="shiftKeyStyle"
-            latin:keyWidth="10.0%p" />
-        <include
-            latin:keyboardLayout="@xml/rowkeys_qwerty3" />
-        <include
-            latin:keyboardLayout="@xml/keys_exclamation_question" />
-        <Key
-            latin:keyStyle="shiftKeyStyle"
-            latin:keyWidth="fillRight" />
-    </Row>
-    <include
-        latin:keyboardLayout="@xml/row_qwerty4" />
-</merge>
diff --git a/java/res/xml-sw600dp/rows_swiss.xml b/java/res/xml-sw600dp/rows_swiss.xml
deleted file mode 100644
index e057f5fba..000000000
--- a/java/res/xml-sw600dp/rows_swiss.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2013, 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.
-*/
--->
-
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
->
-    <include
-        latin:keyboardLayout="@xml/key_styles_common" />
-    <Row
-        latin:keyWidth="8.182%p"
-    >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_swiss1" />
-        <Key
-            latin:keyStyle="deleteKeyStyle"
-            latin:keyWidth="fillRight" />
-    </Row>
-    <Row
-        latin:keyWidth="8.182%p"
-    >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_swiss2" />
-        <Key
-            latin:keyStyle="enterKeyStyle"
-            latin:keyWidth="fillRight" />
-    </Row>
-    <Row
-        latin:keyWidth="8.182%p"
-    >
-        <Key
-            latin:keyStyle="shiftKeyStyle"
-            latin:keyWidth="10.0%p" />
-        <Spacer
-            latin:keyWidth="3.181%p" />
-        <include
-            latin:keyboardLayout="@xml/rowkeys_qwertz3" />
-        <include
-            latin:keyboardLayout="@xml/keys_exclamation_question" />
-        <Key
-            latin:keyStyle="shiftKeyStyle"
-            latin:keyXPos="-10.0%p"
-            latin:keyWidth="fillRight" />
-    </Row>
-    <include
-        latin:keyboardLayout="@xml/row_qwerty4" />
-</merge>
diff --git a/java/res/xml-sw600dp/rows_symbols.xml b/java/res/xml-sw600dp/rows_symbols.xml
deleted file mode 100644
index 664a87e91..000000000
--- a/java/res/xml-sw600dp/rows_symbols.xml
+++ /dev/null
@@ -1,75 +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.
-*/
--->
-
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
->
-    <include
-        latin:keyboardLayout="@xml/key_styles_common" />
-    <include
-        latin:keyboardLayout="@xml/key_styles_currency" />
-    <Row
-        latin:keyWidth="9.0%p"
-    >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_symbols1" />
-        <Key
-            latin:keyStyle="deleteKeyStyle"
-            latin:keyWidth="fillRight" />
-    </Row>
-    <Row
-        latin:keyWidth="9.0%p"
-    >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_symbols2"
-            latin:keyXPos="4.5%p" />
-        <Key
-            latin:keyStyle="enterKeyStyle"
-            latin:keyWidth="fillRight" />
-    </Row>
-        <Row
-        latin:keyWidth="9.0%p"
-    >
-        <Key
-            latin:keyStyle="toMoreSymbolKeyStyle"
-            latin:keyWidth="10.0%p" />
-        <Key
-            latin:keySpec="\\" />
-        <Key
-            latin:keySpec="=" />
-        <include
-            latin:keyboardLayout="@xml/rowkeys_symbols3" />
-        <Key
-            latin:keyStyle="toMoreSymbolKeyStyle"
-            latin:keyWidth="fillRight" />
-    </Row>
-    <Row
-        latin:keyWidth="9.0%p"
-        latin:backgroundType="functional"
-    >
-        <Key
-            latin:keyStyle="toAlphaKeyStyle"
-            latin:keyWidth="10.0%p" />
-        <include
-            latin:keyboardLayout="@xml/row_symbols4" />
-        <include
-            latin:keyboardLayout="@xml/key_emoji" />
-    </Row>
-</merge>
diff --git a/java/res/xml-sw600dp/rows_symbols_shift.xml b/java/res/xml-sw600dp/rows_symbols_shift.xml
deleted file mode 100644
index ac9ca2eec..000000000
--- a/java/res/xml-sw600dp/rows_symbols_shift.xml
+++ /dev/null
@@ -1,77 +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.
-*/
--->
-
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
->
-    <include
-        latin:keyboardLayout="@xml/key_styles_common" />
-    <include
-        latin:keyboardLayout="@xml/key_styles_currency" />
-    <Row
-        latin:keyWidth="9.0%p"
-    >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_symbols_shift1" />
-        <Key
-            latin:keyStyle="deleteKeyStyle"
-            latin:keyWidth="fillRight" />
-    </Row>
-    <Row
-        latin:keyWidth="9.0%p"
-    >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_symbols_shift2"
-            latin:keyXPos="4.5%p" />
-        <Key
-            latin:keyStyle="enterKeyStyle"
-            latin:keyWidth="fillRight" />
-    </Row>
-    <Row
-        latin:keyWidth="9.0%p"
-    >
-        <Key
-            latin:keyStyle="backFromMoreSymbolKeyStyle"
-            latin:keyWidth="10.0%p" />
-        <include
-            latin:keyboardLayout="@xml/rowkeys_symbols_shift3" />
-        <!-- U+00A1: "¡" INVERTED EXCLAMATION MARK -->
-        <Key
-            latin:keySpec="&#x00A1;" />
-        <!-- U+00BF: "¿" INVERTED QUESTION MARK -->
-        <Key
-            latin:keySpec="&#x00BF;" />
-        <Key
-            latin:keyStyle="backFromMoreSymbolKeyStyle"
-            latin:keyWidth="fillRight" />
-    </Row>
-    <Row
-        latin:keyWidth="9.0%p"
-        latin:backgroundType="functional"
-    >
-        <Key
-            latin:keyStyle="toAlphaKeyStyle"
-            latin:keyWidth="10%p" />
-        <include
-            latin:keyboardLayout="@xml/row_symbols_shift4" />
-        <include
-            latin:keyboardLayout="@xml/key_emoji" />
-    </Row>
-</merge>
diff --git a/java/res/xml-sw600dp/rows_tamil.xml b/java/res/xml-sw600dp/rows_tamil.xml
deleted file mode 100644
index 569a634c3..000000000
--- a/java/res/xml-sw600dp/rows_tamil.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2014, 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.
-*/
--->
-
-<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
-    <include latin:keyboardLayout="@xml/key_styles_common" />
-    <Row
-        latin:keyWidth="8.182%p"
-        latin:keyLabelFlags="fontNormal|autoXScale"
-    >
-        <include latin:keyboardLayout="@xml/rowkeys_tamil1" />
-        <Key
-            latin:keyStyle="deleteKeyStyle"
-            latin:keyWidth="fillRight" />
-    </Row>
-    <Row
-        latin:keyWidth="8.182%p"
-        latin:keyLabelFlags="fontNormal|autoXScale"
-    >
-        <include latin:keyboardLayout="@xml/rowkeys_tamil2" />
-        <Key
-            latin:keyStyle="enterKeyStyle"
-            latin:keyWidth="fillRight" />
-    </Row>
-    <Row
-        latin:keyWidth="8.182%p"
-        latin:keyLabelFlags="fontNormal|autoXScale"
-    >
-        <include latin:keyboardLayout="@xml/rowkeys_tamil3" />
-        <include latin:keyboardLayout="@xml/keys_exclamation_question" />
-    </Row>
-    <include latin:keyboardLayout="@xml/row_qwerty4" />
-</merge>
diff --git a/java/res/xml-sw600dp/rows_telugu.xml b/java/res/xml-sw600dp/rows_telugu.xml
deleted file mode 100644
index c782969f8..000000000
--- a/java/res/xml-sw600dp/rows_telugu.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2014, 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.
-*/
--->
-
-<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
-    <include latin:keyboardLayout="@xml/key_styles_common" />
-    <Row
-        latin:keyWidth="8.182%p"
-        latin:keyLabelFlags="fontNormal|autoXScale"
-    >
-        <include latin:keyboardLayout="@xml/rowkeys_telugu1" />
-        <Key
-            latin:keyStyle="deleteKeyStyle"
-            latin:keyWidth="fillRight" />
-    </Row>
-    <Row
-        latin:keyWidth="8.182%p"
-        latin:keyLabelFlags="fontNormal|autoXScale"
-    >
-        <include latin:keyboardLayout="@xml/rowkeys_telugu2" />
-        <Key
-            latin:keyStyle="enterKeyStyle"
-            latin:keyWidth="fillRight" />
-    </Row>
-    <Row
-        latin:keyWidth="8.182%p"
-        latin:keyLabelFlags="fontNormal|autoXScale"
-    >
-        <include latin:keyboardLayout="@xml/rowkeys_telugu3" />
-        <include latin:keyboardLayout="@xml/keys_exclamation_question" />
-    </Row>
-    <include latin:keyboardLayout="@xml/row_qwerty4" />
-</merge>
diff --git a/java/res/xml-sw600dp/rows_thai.xml b/java/res/xml-sw600dp/rows_thai.xml
deleted file mode 100644
index df3cca7b0..000000000
--- a/java/res/xml-sw600dp/rows_thai.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2012, 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.
-*/
--->
-
-<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
-    <include latin:keyboardLayout="@xml/key_styles_common" />
-    <Row
-        latin:keyWidth="7.5%p"
-        latin:keyLabelFlags="fontNormal"
-    >
-        <include latin:keyboardLayout="@xml/rowkeys_thai1" />
-        <Key
-            latin:keyStyle="deleteKeyStyle"
-            latin:keyWidth="fillRight" />
-    </Row>
-    <Row
-        latin:keyWidth="7.5%p"
-        latin:keyLabelFlags="fontNormal"
-    >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_thai2"
-            latin:keyXPos="2.5%p" />
-        <include latin:keyboardLayout="@xml/key_thai_kho_khuat" />
-    </Row>
-    <Row
-        latin:keyWidth="7.5%p"
-        latin:keyLabelFlags="fontNormal"
-    >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_thai3"
-            latin:keyXPos="5.0%p" />
-        <Key
-            latin:keyStyle="enterKeyStyle"
-            latin:keyWidth="fillRight" />
-    </Row>
-    <Row
-        latin:keyWidth="7.5%p"
-        latin:keyLabelFlags="fontNormal"
-    >
-        <Key
-            latin:keyStyle="shiftKeyStyle"
-            latin:keyWidth="10.0%p" />
-        <include latin:keyboardLayout="@xml/rowkeys_thai4" />
-        <switch>
-            <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted">
-                <Spacer />
-            </case>
-            <default>
-                <include latin:keyboardLayout="@xml/keys_exclamation_question" />
-            </default>
-        </switch>
-    </Row>
-    <include latin:keyboardLayout="@xml/row_qwerty4" />
-</merge>
diff --git a/java/res/xml-sw600dp/rows_uzbek.xml b/java/res/xml-sw600dp/rows_uzbek.xml
deleted file mode 100644
index 06e51a00d..000000000
--- a/java/res/xml-sw600dp/rows_uzbek.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2014, 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.
-*/
--->
-
-<merge xmlns:latin="http://schemas.android.com/apk/res-auto" >
-    <include latin:keyboardLayout="@xml/key_styles_common" />
-    <Row latin:keyWidth="8.182%p" >
-        <include latin:keyboardLayout="@xml/rowkeys_uzbek1" />
-        <Key
-            latin:keyStyle="deleteKeyStyle"
-            latin:keyWidth="fillRight" />
-    </Row>
-    <Row latin:keyWidth="8.182%p" >
-        <include latin:keyboardLayout="@xml/rowkeys_uzbek2" />
-        <Key
-            latin:keyStyle="enterKeyStyle"
-            latin:keyWidth="fillRight" />
-    </Row>
-    <Row latin:keyWidth="8.182%p" >
-        <Key
-            latin:keyStyle="shiftKeyStyle"
-            latin:keyWidth="10.0%p" />
-        <Spacer latin:keyWidth="3.181%p" />
-        <include latin:keyboardLayout="@xml/rowkeys_qwerty3" />
-        <include latin:keyboardLayout="@xml/keys_exclamation_question" />
-        <Key
-            latin:keyStyle="shiftKeyStyle"
-            latin:keyWidth="fillRight"
-            latin:keyXPos="-10.0%p" />
-    </Row>
-    <include latin:keyboardLayout="@xml/row_qwerty4" />
-</merge>
\ No newline at end of file
diff --git a/java/src/org/futo/inputmethod/keyboard/MoreKeysKeyboard.java b/java/src/org/futo/inputmethod/keyboard/MoreKeysKeyboard.java
index 60557474c..ee44fbbad 100644
--- a/java/src/org/futo/inputmethod/keyboard/MoreKeysKeyboard.java
+++ b/java/src/org/futo/inputmethod/keyboard/MoreKeysKeyboard.java
@@ -55,6 +55,7 @@ public final class MoreKeysKeyboard extends Keyboard {
 
         public MoreKeysKeyboardParams() {
             super();
+            mIsMainKeyboard = false;
         }
 
         /**
diff --git a/java/src/org/futo/inputmethod/keyboard/PointerTracker.java b/java/src/org/futo/inputmethod/keyboard/PointerTracker.java
index b29ee8d15..6ef15300e 100644
--- a/java/src/org/futo/inputmethod/keyboard/PointerTracker.java
+++ b/java/src/org/futo/inputmethod/keyboard/PointerTracker.java
@@ -696,6 +696,8 @@ public final class PointerTracker implements PointerTrackerQueue.Element,
                 key = onDownKey(x, y, eventTime);
             }
 
+            if(key == null) return;
+
             startRepeatKey(key);
             startLongPressTimer(key);
             setPressedKeyGraphics(key, eventTime);
diff --git a/java/src/org/futo/inputmethod/keyboard/internal/KeyboardBuilder.java b/java/src/org/futo/inputmethod/keyboard/internal/KeyboardBuilder.java
index 0b28d7c17..65125cbdf 100644
--- a/java/src/org/futo/inputmethod/keyboard/internal/KeyboardBuilder.java
+++ b/java/src/org/futo/inputmethod/keyboard/internal/KeyboardBuilder.java
@@ -256,7 +256,18 @@ public class KeyboardBuilder<KP extends KeyboardParams> {
         try {
             final KeyboardParams params = mParams;
 
-            final int height = (int) (params.mId.mHeight * mProvider.getKeyboardHeightMultiplier());
+            int extraSidePadding = 0;
+            int extraBottomPadding = 0;
+            float heightMultiplier = 1.0f;
+            float gapMultiplier = 1.0f;
+            if(params.mIsMainKeyboard) {
+                extraSidePadding = mResources.getDimensionPixelSize(R.dimen.keyboardSidePaddingAddl);
+                extraBottomPadding = mResources.getDimensionPixelSize(R.dimen.keyboardBottomPaddingAddl);
+                heightMultiplier = mProvider.getKeyboardHeightMultiplier() * mResources.getFraction(R.fraction.keyboardHeightMultiplierAddl, 1, 1);
+                gapMultiplier = mResources.getFraction(R.fraction.keyboardGapMultiplierAddl, 1, 1);
+            }
+
+            final int height = (int) (params.mId.mHeight * heightMultiplier);
             final int width = params.mId.mWidth;
             params.mOccupiedHeight = height;
             params.mOccupiedWidth = width;
@@ -264,24 +275,25 @@ public class KeyboardBuilder<KP extends KeyboardParams> {
                     R.styleable.Keyboard_keyboardTopPadding, height, height, 0);
             params.mBottomPadding = (int)(keyboardAttr.getFraction(
                     R.styleable.Keyboard_keyboardBottomPadding, height, height, 0)
-            );
+            ) + extraBottomPadding;
+
             params.mLeftPadding = (int)keyboardAttr.getFraction(
-                    R.styleable.Keyboard_keyboardLeftPadding, width, width, 0);
+                    R.styleable.Keyboard_keyboardLeftPadding, width, width, 0) + extraSidePadding;
             params.mRightPadding = (int)keyboardAttr.getFraction(
-                    R.styleable.Keyboard_keyboardRightPadding, width, width, 0);
+                    R.styleable.Keyboard_keyboardRightPadding, width, width, 0) + extraSidePadding;
 
             final int baseWidth =
                     params.mOccupiedWidth - params.mLeftPadding - params.mRightPadding;
             params.mBaseWidth = baseWidth;
             params.mDefaultKeyWidth = (int)keyAttr.getFraction(R.styleable.Keyboard_Key_keyWidth,
                     baseWidth, baseWidth, baseWidth / DEFAULT_KEYBOARD_COLUMNS);
-            params.mHorizontalGap = (int)keyboardAttr.getFraction(
-                    R.styleable.Keyboard_horizontalGap, baseWidth, baseWidth, 0);
+            params.mHorizontalGap = (int)(keyboardAttr.getFraction(
+                    R.styleable.Keyboard_horizontalGap, baseWidth, baseWidth, 0) * gapMultiplier);
             // TODO: Fix keyboard geometry calculation clearer. Historically vertical gap between
             // rows are determined based on the entire keyboard height including top and bottom
             // paddings.
-            params.mVerticalGap = (int)keyboardAttr.getFraction(
-                    R.styleable.Keyboard_verticalGap, height, height, 0);
+            params.mVerticalGap = (int)(keyboardAttr.getFraction(
+                    R.styleable.Keyboard_verticalGap, height, height, 0) * gapMultiplier);
             final int baseHeight = params.mOccupiedHeight - params.mTopPadding
                     - params.mBottomPadding + params.mVerticalGap;
             params.mBaseHeight = baseHeight;
diff --git a/java/src/org/futo/inputmethod/keyboard/internal/KeyboardParams.java b/java/src/org/futo/inputmethod/keyboard/internal/KeyboardParams.java
index b160928bb..87de4c760 100644
--- a/java/src/org/futo/inputmethod/keyboard/internal/KeyboardParams.java
+++ b/java/src/org/futo/inputmethod/keyboard/internal/KeyboardParams.java
@@ -34,6 +34,8 @@ public class KeyboardParams {
     public KeyboardId mId;
     public int mThemeId;
 
+    public boolean mIsMainKeyboard = true;
+
     /** Total height and width of the keyboard, including the paddings and keys */
     public int mOccupiedHeight;
     public int mOccupiedWidth;
diff --git a/native/jni/src/suggest/policyimpl/gesture/swipe_weighting.h b/native/jni/src/suggest/policyimpl/gesture/swipe_weighting.h
index 765bf499a..f97447211 100644
--- a/native/jni/src/suggest/policyimpl/gesture/swipe_weighting.h
+++ b/native/jni/src/suggest/policyimpl/gesture/swipe_weighting.h
@@ -6,6 +6,8 @@
 #include "suggest/core/policy/weighting.h"
 #include "suggest/policyimpl/typing/scoring_params.h"
 
+#define DEBUG_SWIPE false
+
 namespace util {
     static AK_FORCE_INLINE int getDistanceBetweenPoints(const latinime::DicTraverseSession *const traverseSession, int codePoint, int index) {
         auto proximityInfoState = traverseSession->getProximityInfoState(0);
@@ -14,8 +16,8 @@ namespace util {
         int py = proximityInfoState->getInputY(index);
 
         int keyIdx = proximityInfo->getKeyIndexOf(latinime::CharUtils::toBaseLowerCase(codePoint));
-        int kx = proximityInfo->getSweetSpotCenterXAt(keyIdx);
-        int ky = proximityInfo->getSweetSpotCenterYAt(keyIdx);
+        int kx = proximityInfo->getKeyCenterXOfKeyIdG(keyIdx, NOT_A_COORDINATE, false);
+        int ky = proximityInfo->getKeyCenterYOfKeyIdG(keyIdx, NOT_A_COORDINATE, false);
 
         return sqrtf(latinime::GeometryUtils::getDistanceSq(px, py, kx, ky));
     }
@@ -54,8 +56,8 @@ namespace util {
         int l1y = proximityInfoState->getInputY(index1);
 
         int keyIdx = proximityInfo->getKeyIndexOf(latinime::CharUtils::toBaseLowerCase(codePoint));
-        int px = proximityInfo->getSweetSpotCenterXAt(keyIdx);
-        int py = proximityInfo->getSweetSpotCenterYAt(keyIdx);
+        int px = proximityInfo->getKeyCenterXOfKeyIdG(keyIdx, NOT_A_COORDINATE, false);
+        int py = proximityInfo->getKeyCenterYOfKeyIdG(keyIdx, NOT_A_COORDINATE, false);
 
         return findMinimumPointDistance(px, py, l0x, l0y, l1x, l1y);
     }
@@ -68,10 +70,10 @@ namespace util {
 
         int keyIdx0 = proximityInfo->getKeyIndexOf(latinime::CharUtils::toBaseLowerCase(codePoint0));
         int keyIdx1 = proximityInfo->getKeyIndexOf(latinime::CharUtils::toBaseLowerCase(codePoint1));
-        int l0x = proximityInfo->getSweetSpotCenterXAt(keyIdx0);
-        int l0y = proximityInfo->getSweetSpotCenterYAt(keyIdx0);
-        int l1x = proximityInfo->getSweetSpotCenterXAt(keyIdx1);
-        int l1y = proximityInfo->getSweetSpotCenterYAt(keyIdx1);
+        int l0x = proximityInfo->getKeyCenterXOfKeyIdG(keyIdx0, NOT_A_COORDINATE, false);
+        int l0y = proximityInfo->getKeyCenterYOfKeyIdG(keyIdx0, NOT_A_COORDINATE, false);
+        int l1x = proximityInfo->getKeyCenterXOfKeyIdG(keyIdx1, NOT_A_COORDINATE, false);
+        int l1y = proximityInfo->getKeyCenterYOfKeyIdG(keyIdx1, NOT_A_COORDINATE, false);
 
         return findMinimumPointDistance(px, py, l0x, l0y, l1x, l1y);
     }
@@ -91,11 +93,11 @@ namespace util {
         const int ki_0 = traverseSession->getProximityInfo()->getKeyIndexOf(latinime::CharUtils::toBaseLowerCase(codePoint0));
         const int ki_1 = traverseSession->getProximityInfo()->getKeyIndexOf(latinime::CharUtils::toBaseLowerCase(codePoint1));
 
-        const float l0x = traverseSession->getProximityInfo()->getSweetSpotCenterXAt(ki_0);
-        const float l0y = traverseSession->getProximityInfo()->getSweetSpotCenterYAt(ki_0);
+        const float l0x = traverseSession->getProximityInfo()->getKeyCenterXOfKeyIdG(ki_0, NOT_A_COORDINATE, false);
+        const float l0y = traverseSession->getProximityInfo()->getKeyCenterYOfKeyIdG(ki_0, NOT_A_COORDINATE, false);
 
-        const float l1x = traverseSession->getProximityInfo()->getSweetSpotCenterXAt(ki_1);
-        const float l1y = traverseSession->getProximityInfo()->getSweetSpotCenterYAt(ki_1);
+        const float l1x = traverseSession->getProximityInfo()->getKeyCenterXOfKeyIdG(ki_1, NOT_A_COORDINATE, false);
+        const float l1y = traverseSession->getProximityInfo()->getKeyCenterYOfKeyIdG(ki_1, NOT_A_COORDINATE, false);
 
         for(int j = lowerLimit; j < upperLimit; j++) {
             const float distance = getDistanceCodePointLine(traverseSession, codePoint0, codePoint1, j);
@@ -159,9 +161,10 @@ public:
                 traverseSession->getInputSize() - 1);
 
         if(distance > (distanceThreshold * 128.0f)) {
-            //AKLOGI("Terminal spatial for %c:%c fails due to exceeding distance", (parentDicNode != nullptr) ? (char)(parentDicNode->getNodeCodePoint()) : '?', (char)codePoint);
-            //dicNode->dump("TERMINAL");
-
+#if(DEBUG_SWIPE)
+            AKLOGI("Terminal spatial for %c:%c fails due to exceeding distance", (parentDicNode != nullptr) ? (char)(parentDicNode->getNodeCodePoint()) : '?', (char)codePoint);
+            dicNode->dump("TERMINAL");
+#endif
             return MAX_VALUE_FOR_WEIGHTING;
         }
 
@@ -188,12 +191,18 @@ public:
                         traverseSession, codePoint0, codePoint1, lowerLimit, upperLimit, threshold);
 
                 totalDistance += pow(extraDistance, 1.8f) * 0.1f;
+#if(DEBUG_SWIPE)
+                AKLOGI("Terminal spatial for %c:%c - %d:%d : extra %.2f %.2f", (char)codePoint0, (char)codePoint1, lowerLimit, upperLimit, distance, extraDistance);
+                dicNode->dump("TERMINAL");
+#endif
             } else {
+#if(DEBUG_SWIPE)
+                AKLOGI("Terminal spatial is max due to NOT_A_CODE_POINT");
+                dicNode->dump("TERMINAL");
+#endif
                 totalDistance += MAX_VALUE_FOR_WEIGHTING;
             }
 
-            //AKLOGI("Terminal spatial for %c:%c - %d:%d : extra %.2f %.2f", (char)codePoint0, (char)codePoint1, lowerLimit, upperLimit, distance, extraDistance);
-            //dicNode->dump("TERMINAL");
 
             return totalDistance;
         } else {
@@ -234,6 +243,10 @@ public:
 
                 return distance;
             } else {
+#if(DEBUG_SWIPE)
+                AKLOGI("Culled %c too large first letter distance %.2f, over threshold %.2f", (char)codePoint, distance, distanceThreshold);
+                dicNode->dump("CULLED");
+#endif
                 return MAX_VALUE_FOR_WEIGHTING;
             }
         } else if(parentDicNode != nullptr && parentDicNode->getNodeCodePoint() == codePoint) {
@@ -266,13 +279,17 @@ public:
 
             const float keyThreshold = (80.0f * distanceThreshold);
 
-            //AKLOGI("commence search for %c", (char)codePoint);
+#if(DEBUG_SWIPE)
+            AKLOGI("commence search for %c", (char)codePoint);
+#endif
             for (int i = inputIndex; i < swipeLength; i++) {
                 if (i == 0) continue;
 
                 const float distance = util::getDistanceLine(traverseSession, codePoint, i - 1, i);
 
-                //AKLOGI("[%c:%d] distance %.2f, min %.2f. thresh %.2f", (char)codePoint, i, distance, minEdgeDistance, keyThreshold);
+#if(DEBUG_SWIPE)
+                AKLOGI("[%c:%d] distance %.2f, min %.2f. thresh %.2f", (char)codePoint, i, distance, minEdgeDistance, keyThreshold);
+#endif
                 if (distance < minEdgeDistance) {
                     if(minEdgeIndex != -1) headedTowardsCharacterYet = true;
                     minEdgeDistance = distance;
@@ -280,7 +297,10 @@ public:
                 }
 
                 if (((distance > minEdgeDistance) || (i >= (swipeLength - 1))) && (minEdgeDistance < keyThreshold) && headedTowardsCharacterYet) {
-                    //AKLOGI("found!");
+#if(DEBUG_SWIPE)
+                    AKLOGI("found!");
+#endif
+
                     found = true;
                     break;
                 }
@@ -309,8 +329,10 @@ public:
                             threshold);
 
                     if (punishment >= MAX_VALUE_FOR_WEIGHTING) {
-                        //AKLOGI("Culled due to too large distance (%.2f, %.2f)", totalDistance, punishment);
-                        //dicNode->dump("CULLED");
+#if(DEBUG_SWIPE)
+                        AKLOGI("Culled due to too large distance (%.2f, %.2f)", totalDistance, punishment);
+                        dicNode->dump("CULLED");
+#endif
                         return MAX_VALUE_FOR_WEIGHTING;
                     }
 
@@ -324,8 +346,10 @@ public:
 
                 return totalDistance;
             } else {
-                //AKLOGI("Culled due to not found or nullptr parent %p %d %.2f. inputIndex is %d and swipeLength is %d", parentDicNode, found, minEdgeDistance, inputIndex, swipeLength);
-                //dicNode->dump("CULLED");
+#if(DEBUG_SWIPE)
+                AKLOGI("Culled due to not found or nullptr parent %p %d %.2f. inputIndex is %d and swipeLength is %d", parentDicNode, found, minEdgeDistance, inputIndex, swipeLength);
+                dicNode->dump("CULLED");
+#endif
             }
 
             if(parentDicNode == nullptr) {