diff --git a/java/res/drawable-hdpi/sym_bkeyboard_globe.png b/java/res/drawable-hdpi/sym_bkeyboard_globe.png
deleted file mode 100644
index f5dbe0cd1b3f9db7c836480592e24e93d695532b..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-hdpi/sym_bkeyboard_globe.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_globe.png b/java/res/drawable-hdpi/sym_keyboard_globe.png
deleted file mode 100644
index fa747642d9d91642bf56f769150e095fa372b542..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-hdpi/sym_keyboard_globe.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_language_arrows_left.png b/java/res/drawable-hdpi/sym_keyboard_language_arrows_left.png
index 65ccfda875c0c4f1ff33d4572678ddf15cca1abe..dcc4bd59b51bfc92bde81ce215563feccd5e81bc 100644
Binary files a/java/res/drawable-hdpi/sym_keyboard_language_arrows_left.png and b/java/res/drawable-hdpi/sym_keyboard_language_arrows_left.png differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_language_arrows_right.png b/java/res/drawable-hdpi/sym_keyboard_language_arrows_right.png
index 0d01bc224322f14f91828d248e9c81cc637a59f3..310952383efa63d251bf615ffdc514aafd27fd6e 100644
Binary files a/java/res/drawable-hdpi/sym_keyboard_language_arrows_right.png and b/java/res/drawable-hdpi/sym_keyboard_language_arrows_right.png differ
diff --git a/java/res/drawable-mdpi/sym_bkeyboard_globe.png b/java/res/drawable-mdpi/sym_bkeyboard_globe.png
deleted file mode 100644
index c6595cf623b8f87ac4a769f707582ad55eb0785b..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-mdpi/sym_bkeyboard_globe.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/sym_keyboard_globe.png b/java/res/drawable-mdpi/sym_keyboard_globe.png
deleted file mode 100644
index f30c1b640ab60b07865cec8340143a7b1d9303ff..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-mdpi/sym_keyboard_globe.png and /dev/null differ
diff --git a/java/res/xml-da/kbd_qwerty.xml b/java/res/xml-da/kbd_qwerty.xml
index 0457395cd3db1cd40c3c3bd3495293c667c4f87d..fb8d062ee9c130a7c21bea13f1b210d3cfb67bf6 100644
--- a/java/res/xml-da/kbd_qwerty.xml
+++ b/java/res/xml-da/kbd_qwerty.xml
@@ -112,92 +112,99 @@
<Key android:codes="-5" android:keyIcon="@drawable/sym_keyboard_delete"
android:keyWidth="15%p" android:keyEdgeFlags="right"
android:iconPreview="@drawable/sym_keyboard_feedback_delete"
- android:isRepeatable="true"/>
+ android:isRepeatable="true" android:isModifier="true"/>
</Row>
<Row android:keyboardMode="@+id/mode_normal" android:rowEdgeFlags="bottom">
<Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
- android:keyWidth="20%p" android:keyEdgeFlags="left"/>
+ android:keyWidth="15%p" android:keyEdgeFlags="left" android:isModifier="true"/>
+ <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings"
+ android:iconPreview="@drawable/sym_keyboard_feedback_settings"
+ android:keyWidth="10%p" android:isModifier="true"/>
<Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_keyboard_mic"
android:iconPreview="@drawable/sym_keyboard_feedback_mic"
- android:keyWidth="10%p"/>
+ android:keyWidth="10%p" android:isModifier="true"/>
<Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space"
android:iconPreview="@drawable/sym_keyboard_feedback_space"
- android:keyWidth="40%p" android:isRepeatable="true"/>
+ android:keyWidth="30%p" android:isRepeatable="true" android:isModifier="true"/>
<Key android:codes="46" android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"
- android:keyWidth="10%p"/>
+ android:keyWidth="10%p" android:isModifier="true"/>
<Key android:codes="10" android:keyIcon="@drawable/sym_keyboard_return"
android:iconPreview="@drawable/sym_keyboard_feedback_return"
- android:keyWidth="20%p" android:keyEdgeFlags="right"/>
+ android:keyWidth="25%p" android:keyEdgeFlags="right" android:isModifier="true"/>
</Row>
<Row android:keyboardMode="@+id/mode_url" android:rowEdgeFlags="bottom">
<Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
- android:keyWidth="20%p" android:keyEdgeFlags="left"/>
+ android:keyWidth="15%p" android:keyEdgeFlags="left" android:isModifier="true"/>
+ <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings"
+ android:iconPreview="@drawable/sym_keyboard_feedback_settings"
+ android:keyWidth="10%p" android:isModifier="true"/>
<Key android:keyLabel="/" android:keyWidth="10%p"/>
<Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space"
android:iconPreview="@drawable/sym_keyboard_feedback_space"
- android:keyWidth="40%p" android:isRepeatable="true"/>
- <!--Key android:keyLabel="@string/popular_domain_0"
- android:keyOutputText="@string/popular_domain_0"
- android:popupKeyboard="@xml/popup_domains"
- android:keyWidth="20%p"/-->
+ android:keyWidth="30%p" android:isRepeatable="true" android:isModifier="true"/>
<Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"
- android:keyWidth="10%p"/>
+ android:keyWidth="10%p" android:isModifier="true"/>
<Key android:codes="10" android:keyIcon="@drawable/sym_keyboard_return"
android:iconPreview="@drawable/sym_keyboard_feedback_return"
- android:keyWidth="20%p" android:keyEdgeFlags="right"/>
+ android:keyWidth="25%p" android:keyEdgeFlags="right" android:isModifier="true"/>
</Row>
<Row android:keyboardMode="@+id/mode_email" android:rowEdgeFlags="bottom">
<Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
- android:keyWidth="20%p" android:keyEdgeFlags="left"/>
+ android:keyWidth="15%p" android:keyEdgeFlags="left" android:isModifier="true"/>
+ <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings"
+ android:iconPreview="@drawable/sym_keyboard_feedback_settings"
+ android:keyWidth="10%p" android:isModifier="true"/>
<Key android:keyLabel="\@"/>
<Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space"
android:iconPreview="@drawable/sym_keyboard_feedback_space"
- android:keyWidth="40%p" android:isRepeatable="true"/>
- <!--Key android:keyLabel="@string/popular_domain_0"
- android:keyOutputText="@string/popular_domain_0"
- android:popupKeyboard="@xml/popup_domains"
- android:keyWidth="20%p"/-->
+ android:keyWidth="30%p" android:isRepeatable="true" android:isModifier="true"/>
<Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"/>
<Key android:codes="10" android:keyIcon="@drawable/sym_keyboard_return"
android:iconPreview="@drawable/sym_keyboard_feedback_return"
- android:keyWidth="20%p" android:keyEdgeFlags="right"/>
+ android:keyWidth="25%p" android:keyEdgeFlags="right" android:isModifier="true"/>
</Row>
<Row android:keyboardMode="@+id/mode_im" android:rowEdgeFlags="bottom">
<Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
- android:keyWidth="20%p" android:keyEdgeFlags="left"/>
+ android:keyWidth="15%p" android:keyEdgeFlags="left" android:isModifier="true"/>
+ <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings"
+ android:iconPreview="@drawable/sym_keyboard_feedback_settings"
+ android:keyWidth="10%p" android:isModifier="true"/>
<Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_keyboard_mic"
android:iconPreview="@drawable/sym_keyboard_feedback_mic"
- android:keyWidth="10%p"/>
+ android:keyWidth="10%p" android:isModifier="true"/>
<Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space"
android:iconPreview="@drawable/sym_keyboard_feedback_space"
- android:keyWidth="40%p" android:isRepeatable="true"/>
+ android:keyWidth="30%p" android:isRepeatable="true" android:isModifier="true"/>
<Key android:codes="46" android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"
- android:keyWidth="10%p"/>
+ android:keyWidth="10%p" android:isModifier="true"/>
<Key android:keyLabel=":-)" android:keyOutputText=":-) "
android:popupKeyboard="@xml/popup_smileys"
- android:keyWidth="20%p" android:keyEdgeFlags="right"/>
+ android:keyWidth="25%p" android:keyEdgeFlags="right" android:isModifier="true"/>
</Row>
<Row android:keyboardMode="@+id/mode_webentry" android:rowEdgeFlags="bottom">
<Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
- android:keyWidth="20%p" android:keyEdgeFlags="left"/>
+ android:keyWidth="10%p" android:keyEdgeFlags="left" android:isModifier="true"/>
+ <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings"
+ android:iconPreview="@drawable/sym_keyboard_feedback_settings"
+ android:keyWidth="10%p" android:isModifier="true"/>
<Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_keyboard_mic"
android:iconPreview="@drawable/sym_keyboard_feedback_mic"
- android:keyWidth="10%p"/>
+ android:keyWidth="10%p" android:isModifier="true"/>
<Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space"
android:iconPreview="@drawable/sym_keyboard_feedback_space"
- android:keyWidth="20%p" android:isRepeatable="true"/>
+ android:keyWidth="20%p" android:isRepeatable="true" android:isModifier="true"/>
<Key android:codes="9" android:keyIcon="@drawable/sym_keyboard_tab"
android:iconPreview="@drawable/sym_keyboard_feedback_tab"
- android:keyWidth="20%p"/>
- <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"/>
+ android:keyWidth="15%p" android:isModifier="true"/>
+ <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"
+ android:keyWidth="10%p" android:isModifier="true"/>
<Key android:codes="10" android:keyIcon="@drawable/sym_keyboard_return"
android:iconPreview="@drawable/sym_keyboard_feedback_return"
- android:keyWidth="20%p" android:keyEdgeFlags="right"/>
+ android:keyWidth="15%p" android:keyEdgeFlags="right" android:isModifier="true"/>
</Row>
-
</Keyboard>
diff --git a/java/res/xml-da/kbd_qwerty_black.xml b/java/res/xml-da/kbd_qwerty_black.xml
index 575f0fa49d0614120db20e9afe74694930af94db..b9d1d1796231ef7ea56e6c5ca10427906f0d5133 100644
--- a/java/res/xml-da/kbd_qwerty_black.xml
+++ b/java/res/xml-da/kbd_qwerty_black.xml
@@ -114,77 +114,83 @@
android:iconPreview="@drawable/sym_keyboard_feedback_delete"
android:isRepeatable="true"/>
</Row>
-
<Row android:keyboardMode="@+id/mode_normal" android:rowEdgeFlags="bottom">
<Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
- android:keyWidth="20%p" android:keyEdgeFlags="left"/>
+ android:keyWidth="15%p" android:keyEdgeFlags="left"/>
+ <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings"
+ android:iconPreview="@drawable/sym_keyboard_feedback_settings"
+ android:keyWidth="10%p"/>
<Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_bkeyboard_mic"
android:iconPreview="@drawable/sym_keyboard_feedback_mic"
android:keyWidth="10%p"/>
<Key android:codes="32" android:keyIcon="@drawable/sym_bkeyboard_space"
android:iconPreview="@drawable/sym_keyboard_feedback_space"
- android:keyWidth="40%p" android:isRepeatable="true"/>
+ android:keyWidth="30%p" android:isRepeatable="true"/>
<Key android:codes="46" android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"
android:keyWidth="10%p"/>
<Key android:codes="10" android:keyIcon="@drawable/sym_bkeyboard_return"
android:iconPreview="@drawable/sym_keyboard_feedback_return"
- android:keyWidth="20%p" android:keyEdgeFlags="right"/>
+ android:keyWidth="25%p" android:keyEdgeFlags="right"/>
</Row>
<Row android:keyboardMode="@+id/mode_url" android:rowEdgeFlags="bottom">
<Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
- android:keyWidth="20%p" android:keyEdgeFlags="left"/>
+ android:keyWidth="15%p" android:keyEdgeFlags="left"/>
+ <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings"
+ android:iconPreview="@drawable/sym_keyboard_feedback_settings"
+ android:keyWidth="10%p"/>
<Key android:keyLabel="/" android:keyWidth="10%p"/>
<Key android:codes="32" android:keyIcon="@drawable/sym_bkeyboard_space"
android:iconPreview="@drawable/sym_keyboard_feedback_space"
- android:keyWidth="40%p" android:isRepeatable="true"/>
- <!--Key android:keyLabel="@string/popular_domain_0"
- android:keyOutputText="@string/popular_domain_0"
- android:popupKeyboard="@xml/popup_domains"
- android:keyWidth="20%p"/-->
+ android:keyWidth="30%p" android:isRepeatable="true"/>
<Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"
android:keyWidth="10%p"/>
<Key android:codes="10" android:keyIcon="@drawable/sym_bkeyboard_return"
android:iconPreview="@drawable/sym_keyboard_feedback_return"
- android:keyWidth="20%p" android:keyEdgeFlags="right"/>
+ android:keyWidth="25%p" android:keyEdgeFlags="right"/>
</Row>
<Row android:keyboardMode="@+id/mode_email" android:rowEdgeFlags="bottom">
<Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
- android:keyWidth="20%p" android:keyEdgeFlags="left"/>
+ android:keyWidth="15%p" android:keyEdgeFlags="left"/>
+ <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings"
+ android:iconPreview="@drawable/sym_keyboard_feedback_settings"
+ android:keyWidth="10%p"/>
<Key android:keyLabel="\@"/>
<Key android:codes="32" android:keyIcon="@drawable/sym_bkeyboard_space"
android:iconPreview="@drawable/sym_keyboard_feedback_space"
- android:keyWidth="40%p" android:isRepeatable="true"/>
- <!--Key android:keyLabel="@string/popular_domain_0"
- android:keyOutputText="@string/popular_domain_0"
- android:popupKeyboard="@xml/popup_domains"
- android:keyWidth="20%p"/-->
+ android:keyWidth="30%p" android:isRepeatable="true"/>
<Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"/>
<Key android:codes="10" android:keyIcon="@drawable/sym_bkeyboard_return"
android:iconPreview="@drawable/sym_keyboard_feedback_return"
- android:keyWidth="20%p" android:keyEdgeFlags="right"/>
+ android:keyWidth="25%p" android:keyEdgeFlags="right"/>
</Row>
<Row android:keyboardMode="@+id/mode_im" android:rowEdgeFlags="bottom">
<Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
- android:keyWidth="20%p" android:keyEdgeFlags="left"/>
+ android:keyWidth="15%p" android:keyEdgeFlags="left"/>
+ <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings"
+ android:iconPreview="@drawable/sym_keyboard_feedback_settings"
+ android:keyWidth="10%p"/>
<Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_bkeyboard_mic"
android:iconPreview="@drawable/sym_keyboard_feedback_mic"
android:keyWidth="10%p"/>
<Key android:codes="32" android:keyIcon="@drawable/sym_bkeyboard_space"
android:iconPreview="@drawable/sym_keyboard_feedback_space"
- android:keyWidth="40%p" android:isRepeatable="true"/>
+ android:keyWidth="30%p" android:isRepeatable="true"/>
<Key android:codes="46" android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"
android:keyWidth="10%p"/>
<Key android:keyLabel=":-)" android:keyOutputText=":-) "
android:popupKeyboard="@xml/popup_smileys"
- android:keyWidth="20%p" android:keyEdgeFlags="right"/>
+ android:keyWidth="25%p" android:keyEdgeFlags="right"/>
</Row>
<Row android:keyboardMode="@+id/mode_webentry" android:rowEdgeFlags="bottom">
<Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
- android:keyWidth="20%p" android:keyEdgeFlags="left"/>
+ android:keyWidth="10%p" android:keyEdgeFlags="left"/>
+ <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings"
+ android:iconPreview="@drawable/sym_keyboard_feedback_settings"
+ android:keyWidth="10%p"/>
<Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_bkeyboard_mic"
android:iconPreview="@drawable/sym_keyboard_feedback_mic"
android:keyWidth="10%p"/>
@@ -193,11 +199,11 @@
android:keyWidth="20%p" android:isRepeatable="true"/>
<Key android:codes="9" android:keyIcon="@drawable/sym_bkeyboard_tab"
android:iconPreview="@drawable/sym_keyboard_feedback_tab"
- android:keyWidth="20%p"/>
- <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"/>
+ android:keyWidth="15%p"/>
+ <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"
+ android:keyWidth="10%p"/>
<Key android:codes="10" android:keyIcon="@drawable/sym_bkeyboard_return"
android:iconPreview="@drawable/sym_keyboard_feedback_return"
- android:keyWidth="20%p" android:keyEdgeFlags="right"/>
+ android:keyWidth="15%p" android:keyEdgeFlags="right"/>
</Row>
-
</Keyboard>
diff --git a/java/res/xml-de/kbd_qwerty.xml b/java/res/xml-de/kbd_qwerty.xml
index 827ad62c756a91001b1129c879198a2c09949eb1..763627a34af89568390f0f1a9a99c0c269056e70 100755
--- a/java/res/xml-de/kbd_qwerty.xml
+++ b/java/res/xml-de/kbd_qwerty.xml
@@ -1,19 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
-/*
+/*
**
** Copyright 2008, The Android Open Source Project
**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
+** 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
+** 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
+** 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.
*/
-->
@@ -49,9 +49,9 @@
/>
<Key android:codes="112" android:keyLabel="p" android:keyEdgeFlags="right"/>
</Row>
-
+
<Row>
- <Key android:codes="97" android:keyLabel="a" android:horizontalGap="5%p"
+ <Key android:codes="97" android:keyLabel="a" android:horizontalGap="5%p"
android:popupKeyboard="@xml/kbd_popup_template"
android:popupCharacters="@string/alternates_for_a"
android:keyEdgeFlags="left"/>
@@ -67,7 +67,7 @@
<Key android:codes="107" android:keyLabel="k"/>
<Key android:codes="108" android:keyLabel="l" android:keyEdgeFlags="right"/>
</Row>
-
+
<Row>
<Key android:codes="-1" android:keyIcon="@drawable/sym_keyboard_shift"
android:keyWidth="15%p" android:isModifier="true"
@@ -90,90 +90,101 @@
/>
<Key android:codes="109" android:keyLabel="m"/>
<Key android:codes="-5" android:keyIcon="@drawable/sym_keyboard_delete"
- android:keyWidth="15%p" android:keyEdgeFlags="right"
+ android:keyWidth="15%p" android:keyEdgeFlags="right"
android:iconPreview="@drawable/sym_keyboard_feedback_delete"
- android:isRepeatable="true"/>
+ android:isRepeatable="true" android:isModifier="true"/>
</Row>
-
+
<Row android:keyboardMode="@+id/mode_normal" android:rowEdgeFlags="bottom">
- <Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
- android:keyWidth="20%p" android:keyEdgeFlags="left"/>
- <Key android:codes="@integer/key_f1"
- android:keyWidth="10%p"/>
+ <Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
+ android:keyWidth="15%p" android:keyEdgeFlags="left" android:isModifier="true"/>
+ <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings"
+ android:iconPreview="@drawable/sym_keyboard_feedback_settings"
+ android:keyWidth="10%p" android:isModifier="true"/>
+ <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_keyboard_mic"
+ android:iconPreview="@drawable/sym_keyboard_feedback_mic"
+ android:keyWidth="10%p" android:isModifier="true"/>
<Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space"
android:iconPreview="@drawable/sym_keyboard_feedback_space"
- android:keyWidth="40%p" android:isRepeatable="true"/>
- <Key android:codes="46" android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"
- android:keyWidth="10%p"/>
+ android:keyWidth="30%p" android:isRepeatable="true" android:isModifier="true"/>
+ <Key android:codes="46" android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"
+ android:keyWidth="10%p" android:isModifier="true"/>
<Key android:codes="10" android:keyIcon="@drawable/sym_keyboard_return"
android:iconPreview="@drawable/sym_keyboard_feedback_return"
- android:keyWidth="20%p" android:keyEdgeFlags="right"/>
+ android:keyWidth="25%p" android:keyEdgeFlags="right" android:isModifier="true"/>
</Row>
<Row android:keyboardMode="@+id/mode_url" android:rowEdgeFlags="bottom">
<Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
- android:keyWidth="20%p" android:keyEdgeFlags="left"/>
+ android:keyWidth="15%p" android:keyEdgeFlags="left" android:isModifier="true"/>
+ <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings"
+ android:iconPreview="@drawable/sym_keyboard_feedback_settings"
+ android:keyWidth="10%p" android:isModifier="true"/>
<Key android:keyLabel="/" android:keyWidth="10%p"/>
<Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space"
android:iconPreview="@drawable/sym_keyboard_feedback_space"
- android:keyWidth="40%p" android:isRepeatable="true"/>
- <!--Key android:keyLabel="@string/popular_domain_0"
- android:keyOutputText="@string/popular_domain_0"
- android:popupKeyboard="@xml/popup_domains"
- android:keyWidth="20%p"/-->
+ android:keyWidth="30%p" android:isRepeatable="true" android:isModifier="true"/>
<Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"
- android:keyWidth="10%p"/>
+ android:keyWidth="10%p" android:isModifier="true"/>
<Key android:codes="10" android:keyIcon="@drawable/sym_keyboard_return"
android:iconPreview="@drawable/sym_keyboard_feedback_return"
- android:keyWidth="20%p" android:keyEdgeFlags="right"/>
+ android:keyWidth="25%p" android:keyEdgeFlags="right" android:isModifier="true"/>
</Row>
<Row android:keyboardMode="@+id/mode_email" android:rowEdgeFlags="bottom">
<Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
- android:keyWidth="20%p" android:keyEdgeFlags="left"/>
+ android:keyWidth="15%p" android:keyEdgeFlags="left" android:isModifier="true"/>
+ <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings"
+ android:iconPreview="@drawable/sym_keyboard_feedback_settings"
+ android:keyWidth="10%p" android:isModifier="true"/>
<Key android:keyLabel="\@"/>
<Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space"
android:iconPreview="@drawable/sym_keyboard_feedback_space"
- android:keyWidth="40%p" android:isRepeatable="true"/>
- <!--Key android:keyLabel="@string/popular_domain_0"
- android:keyOutputText="@string/popular_domain_0"
- android:popupKeyboard="@xml/popup_domains"
- android:keyWidth="20%p"/-->
+ android:keyWidth="30%p" android:isRepeatable="true" android:isModifier="true"/>
<Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"/>
<Key android:codes="10" android:keyIcon="@drawable/sym_keyboard_return"
android:iconPreview="@drawable/sym_keyboard_feedback_return"
- android:keyWidth="20%p" android:keyEdgeFlags="right"/>
+ android:keyWidth="25%p" android:keyEdgeFlags="right" android:isModifier="true"/>
</Row>
<Row android:keyboardMode="@+id/mode_im" android:rowEdgeFlags="bottom">
<Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
- android:keyWidth="20%p" android:keyEdgeFlags="left"/>
- <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_keyboard_globe"
- android:keyWidth="10%p"/>
+ android:keyWidth="15%p" android:keyEdgeFlags="left" android:isModifier="true"/>
+ <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings"
+ android:iconPreview="@drawable/sym_keyboard_feedback_settings"
+ android:keyWidth="10%p" android:isModifier="true"/>
+ <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_keyboard_mic"
+ android:iconPreview="@drawable/sym_keyboard_feedback_mic"
+ android:keyWidth="10%p" android:isModifier="true"/>
<Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space"
android:iconPreview="@drawable/sym_keyboard_feedback_space"
- android:keyWidth="40%p" android:isRepeatable="true"/>
- <Key android:codes="46" android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"
- android:keyWidth="10%p"/>
+ android:keyWidth="30%p" android:isRepeatable="true" android:isModifier="true"/>
+ <Key android:codes="46" android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"
+ android:keyWidth="10%p" android:isModifier="true"/>
<Key android:keyLabel=":-)" android:keyOutputText=":-) "
android:popupKeyboard="@xml/popup_smileys"
- android:keyWidth="20%p" android:keyEdgeFlags="right"/>
+ android:keyWidth="25%p" android:keyEdgeFlags="right" android:isModifier="true"/>
</Row>
<Row android:keyboardMode="@+id/mode_webentry" android:rowEdgeFlags="bottom">
<Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
- android:keyWidth="20%p" android:keyEdgeFlags="left"/>
- <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_keyboard_globe"
- android:keyWidth="10%p"/>
+ android:keyWidth="10%p" android:keyEdgeFlags="left" android:isModifier="true"/>
+ <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings"
+ android:iconPreview="@drawable/sym_keyboard_feedback_settings"
+ android:keyWidth="10%p" android:isModifier="true"/>
+ <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_keyboard_mic"
+ android:iconPreview="@drawable/sym_keyboard_feedback_mic"
+ android:keyWidth="10%p" android:isModifier="true"/>
<Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space"
android:iconPreview="@drawable/sym_keyboard_feedback_space"
- android:keyWidth="20%p" android:isRepeatable="true"/>
+ android:keyWidth="20%p" android:isRepeatable="true" android:isModifier="true"/>
<Key android:codes="9" android:keyIcon="@drawable/sym_keyboard_tab"
android:iconPreview="@drawable/sym_keyboard_feedback_tab"
- android:keyWidth="20%p"/>
- <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"/>
+ android:keyWidth="15%p" android:isModifier="true"/>
+ <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"
+ android:keyWidth="10%p" android:isModifier="true"/>
<Key android:codes="10" android:keyIcon="@drawable/sym_keyboard_return"
android:iconPreview="@drawable/sym_keyboard_feedback_return"
- android:keyWidth="20%p" android:keyEdgeFlags="right"/>
+ android:keyWidth="15%p" android:keyEdgeFlags="right" android:isModifier="true"/>
</Row>
</Keyboard>
diff --git a/java/res/xml-de/kbd_qwerty_black.xml b/java/res/xml-de/kbd_qwerty_black.xml
index 18fdc7d017a79512a8a73b8fe590d200c4b49b8f..b0b6c238fe72623fa6830e28c5fc0a5474d6d724 100755
--- a/java/res/xml-de/kbd_qwerty_black.xml
+++ b/java/res/xml-de/kbd_qwerty_black.xml
@@ -97,83 +97,94 @@
<Row android:keyboardMode="@+id/mode_normal" android:rowEdgeFlags="bottom">
<Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
- android:keyWidth="20%p" android:keyEdgeFlags="left"/>
- <Key android:codes="@integer/key_f1"
+ android:keyWidth="15%p" android:keyEdgeFlags="left"/>
+ <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings"
+ android:iconPreview="@drawable/sym_keyboard_feedback_settings"
+ android:keyWidth="10%p"/>
+ <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_bkeyboard_mic"
+ android:iconPreview="@drawable/sym_keyboard_feedback_mic"
android:keyWidth="10%p"/>
<Key android:codes="32" android:keyIcon="@drawable/sym_bkeyboard_space"
android:iconPreview="@drawable/sym_keyboard_feedback_space"
- android:keyWidth="40%p" android:isRepeatable="true"/>
+ android:keyWidth="30%p" android:isRepeatable="true"/>
<Key android:codes="46" android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"
android:keyWidth="10%p"/>
<Key android:codes="10" android:keyIcon="@drawable/sym_bkeyboard_return"
android:iconPreview="@drawable/sym_keyboard_feedback_return"
- android:keyWidth="20%p" android:keyEdgeFlags="right"/>
+ android:keyWidth="25%p" android:keyEdgeFlags="right"/>
</Row>
<Row android:keyboardMode="@+id/mode_url" android:rowEdgeFlags="bottom">
<Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
- android:keyWidth="20%p" android:keyEdgeFlags="left"/>
+ android:keyWidth="15%p" android:keyEdgeFlags="left"/>
+ <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings"
+ android:iconPreview="@drawable/sym_keyboard_feedback_settings"
+ android:keyWidth="10%p"/>
<Key android:keyLabel="/" android:keyWidth="10%p"/>
<Key android:codes="32" android:keyIcon="@drawable/sym_bkeyboard_space"
android:iconPreview="@drawable/sym_keyboard_feedback_space"
- android:keyWidth="40%p" android:isRepeatable="true"/>
- <!--Key android:keyLabel="@string/popular_domain_0"
- android:keyOutputText="@string/popular_domain_0"
- android:popupKeyboard="@xml/popup_domains"
- android:keyWidth="20%p"/-->
+ android:keyWidth="30%p" android:isRepeatable="true"/>
<Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"
android:keyWidth="10%p"/>
<Key android:codes="10" android:keyIcon="@drawable/sym_bkeyboard_return"
android:iconPreview="@drawable/sym_keyboard_feedback_return"
- android:keyWidth="20%p" android:keyEdgeFlags="right"/>
+ android:keyWidth="25%p" android:keyEdgeFlags="right"/>
</Row>
<Row android:keyboardMode="@+id/mode_email" android:rowEdgeFlags="bottom">
<Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
- android:keyWidth="20%p" android:keyEdgeFlags="left"/>
+ android:keyWidth="15%p" android:keyEdgeFlags="left"/>
+ <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings"
+ android:iconPreview="@drawable/sym_keyboard_feedback_settings"
+ android:keyWidth="10%p"/>
<Key android:keyLabel="\@"/>
<Key android:codes="32" android:keyIcon="@drawable/sym_bkeyboard_space"
android:iconPreview="@drawable/sym_keyboard_feedback_space"
- android:keyWidth="40%p" android:isRepeatable="true"/>
- <!--Key android:keyLabel="@string/popular_domain_0"
- android:keyOutputText="@string/popular_domain_0"
- android:popupKeyboard="@xml/popup_domains"
- android:keyWidth="20%p"/-->
+ android:keyWidth="30%p" android:isRepeatable="true"/>
<Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"/>
<Key android:codes="10" android:keyIcon="@drawable/sym_bkeyboard_return"
android:iconPreview="@drawable/sym_keyboard_feedback_return"
- android:keyWidth="20%p" android:keyEdgeFlags="right"/>
+ android:keyWidth="25%p" android:keyEdgeFlags="right"/>
</Row>
<Row android:keyboardMode="@+id/mode_im" android:rowEdgeFlags="bottom">
<Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
- android:keyWidth="20%p" android:keyEdgeFlags="left"/>
- <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_bkeyboard_globe"
+ android:keyWidth="15%p" android:keyEdgeFlags="left"/>
+ <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings"
+ android:iconPreview="@drawable/sym_keyboard_feedback_settings"
+ android:keyWidth="10%p"/>
+ <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_bkeyboard_mic"
+ android:iconPreview="@drawable/sym_keyboard_feedback_mic"
android:keyWidth="10%p"/>
<Key android:codes="32" android:keyIcon="@drawable/sym_bkeyboard_space"
android:iconPreview="@drawable/sym_keyboard_feedback_space"
- android:keyWidth="40%p" android:isRepeatable="true"/>
+ android:keyWidth="30%p" android:isRepeatable="true"/>
<Key android:codes="46" android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"
android:keyWidth="10%p"/>
<Key android:keyLabel=":-)" android:keyOutputText=":-) "
android:popupKeyboard="@xml/popup_smileys"
- android:keyWidth="20%p" android:keyEdgeFlags="right"/>
+ android:keyWidth="25%p" android:keyEdgeFlags="right"/>
</Row>
<Row android:keyboardMode="@+id/mode_webentry" android:rowEdgeFlags="bottom">
<Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
- android:keyWidth="20%p" android:keyEdgeFlags="left"/>
- <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_bkeyboard_globe"
+ android:keyWidth="10%p" android:keyEdgeFlags="left"/>
+ <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings"
+ android:iconPreview="@drawable/sym_keyboard_feedback_settings"
+ android:keyWidth="10%p"/>
+ <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_bkeyboard_mic"
+ android:iconPreview="@drawable/sym_keyboard_feedback_mic"
android:keyWidth="10%p"/>
<Key android:codes="32" android:keyIcon="@drawable/sym_bkeyboard_space"
android:iconPreview="@drawable/sym_keyboard_feedback_space"
android:keyWidth="20%p" android:isRepeatable="true"/>
<Key android:codes="9" android:keyIcon="@drawable/sym_bkeyboard_tab"
android:iconPreview="@drawable/sym_keyboard_feedback_tab"
- android:keyWidth="20%p"/>
- <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"/>
+ android:keyWidth="15%p"/>
+ <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"
+ android:keyWidth="10%p"/>
<Key android:codes="10" android:keyIcon="@drawable/sym_bkeyboard_return"
android:iconPreview="@drawable/sym_keyboard_feedback_return"
- android:keyWidth="20%p" android:keyEdgeFlags="right"/>
+ android:keyWidth="15%p" android:keyEdgeFlags="right"/>
</Row>
</Keyboard>
diff --git a/java/res/xml-fr/kbd_qwerty.xml b/java/res/xml-fr/kbd_qwerty.xml
index 7df32d91419fef1c9aa677fa59e19d72aec0ef14..0f08c26c2781d24fbf9f1f1c298bfadf0de9b83e 100644
--- a/java/res/xml-fr/kbd_qwerty.xml
+++ b/java/res/xml-fr/kbd_qwerty.xml
@@ -1,19 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
-/*
+/*
**
** Copyright 2008, The Android Open Source Project
**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
+** 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
+** 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
+** 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.
*/
-->
@@ -26,7 +26,7 @@
>
<Row>
- <Key android:codes="97" android:keyLabel="a"
+ <Key android:codes="97" android:keyLabel="a"
android:popupKeyboard="@xml/kbd_popup_template"
android:popupCharacters="@string/alternates_for_a"
android:keyEdgeFlags="left"/>
@@ -55,7 +55,7 @@
/>
<Key android:codes="112" android:keyLabel="p" android:keyEdgeFlags="right"/>
</Row>
-
+
<Row>
<Key android:codes="113" android:keyLabel="q" android:keyEdgeFlags="left"/>
<Key android:codes="115" android:keyLabel="s"
@@ -73,7 +73,7 @@
</Row>
<Row>
- <Key android:codes="-1" android:keyIcon="@drawable/sym_keyboard_shift"
+ <Key android:codes="-1" android:keyIcon="@drawable/sym_keyboard_shift"
android:keyWidth="15%p" android:isModifier="true"
android:iconPreview="@drawable/sym_keyboard_feedback_shift"
android:isSticky="true" android:keyEdgeFlags="left"/>
@@ -91,93 +91,102 @@
/>
<!--Key android:codes="233,224,232,234" android:keyLabel="é"/-->
<Key android:keyLabel="\'"/>
- <Key android:codes="-5" android:keyIcon="@drawable/sym_keyboard_delete"
- android:keyWidth="15%p" android:keyEdgeFlags="right"
+ <Key android:codes="-5" android:keyIcon="@drawable/sym_keyboard_delete"
+ android:keyWidth="15%p" android:keyEdgeFlags="right"
android:iconPreview="@drawable/sym_keyboard_feedback_delete"
- android:isRepeatable="true"/>
+ android:isRepeatable="true" android:isModifier="true"/>
</Row>
-
+
<Row android:keyboardMode="@+id/mode_normal" android:rowEdgeFlags="bottom">
- <Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
- android:keyWidth="20%p" android:keyEdgeFlags="left"/>
- <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_keyboard_globe"
- android:keyWidth="10%p"/>
+ <Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
+ android:keyWidth="15%p" android:keyEdgeFlags="left" android:isModifier="true"/>
+ <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings"
+ android:iconPreview="@drawable/sym_keyboard_feedback_settings"
+ android:keyWidth="10%p" android:isModifier="true"/>
+ <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_keyboard_mic"
+ android:iconPreview="@drawable/sym_keyboard_feedback_mic"
+ android:keyWidth="10%p" android:isModifier="true"/>
<Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space"
android:iconPreview="@drawable/sym_keyboard_feedback_space"
- android:keyWidth="40%p" android:isRepeatable="true"/>
- <Key android:codes="46" android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"
- android:keyWidth="10%p"/>
+ android:keyWidth="30%p" android:isRepeatable="true" android:isModifier="true"/>
+ <Key android:codes="46" android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"
+ android:keyWidth="10%p" android:isModifier="true"/>
<Key android:codes="10" android:keyIcon="@drawable/sym_keyboard_return"
android:iconPreview="@drawable/sym_keyboard_feedback_return"
- android:keyWidth="20%p" android:keyEdgeFlags="right"/>
+ android:keyWidth="25%p" android:keyEdgeFlags="right" android:isModifier="true"/>
</Row>
<Row android:keyboardMode="@+id/mode_url" android:rowEdgeFlags="bottom">
<Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
- android:keyWidth="20%p" android:keyEdgeFlags="left"/>
+ android:keyWidth="15%p" android:keyEdgeFlags="left" android:isModifier="true"/>
+ <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings"
+ android:iconPreview="@drawable/sym_keyboard_feedback_settings"
+ android:keyWidth="10%p" android:isModifier="true"/>
<Key android:keyLabel="/" android:keyWidth="10%p"/>
<Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space"
android:iconPreview="@drawable/sym_keyboard_feedback_space"
- android:keyWidth="40%p" android:isRepeatable="true"/>
- <!--Key android:keyLabel="@string/popular_domain_0"
- android:keyOutputText="@string/popular_domain_0"
- android:popupKeyboard="@xml/popup_domains"
- android:keyWidth="20%p"/-->
+ android:keyWidth="30%p" android:isRepeatable="true" android:isModifier="true"/>
<Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"
- android:keyWidth="10%p"/>
+ android:keyWidth="10%p" android:isModifier="true"/>
<Key android:codes="10" android:keyIcon="@drawable/sym_keyboard_return"
android:iconPreview="@drawable/sym_keyboard_feedback_return"
- android:keyWidth="20%p" android:keyEdgeFlags="right"/>
+ android:keyWidth="25%p" android:keyEdgeFlags="right" android:isModifier="true"/>
</Row>
<Row android:keyboardMode="@+id/mode_email" android:rowEdgeFlags="bottom">
<Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
- android:keyWidth="20%p" android:keyEdgeFlags="left"/>
+ android:keyWidth="15%p" android:keyEdgeFlags="left" android:isModifier="true"/>
+ <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings"
+ android:iconPreview="@drawable/sym_keyboard_feedback_settings"
+ android:keyWidth="10%p" android:isModifier="true"/>
<Key android:keyLabel="\@"/>
<Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space"
android:iconPreview="@drawable/sym_keyboard_feedback_space"
- android:keyWidth="40%p" android:isRepeatable="true"/>
- <!--Key android:keyLabel="@string/popular_domain_0"
- android:keyOutputText="@string/popular_domain_0"
- android:popupKeyboard="@xml/popup_domains"
- android:keyWidth="20%p"/-->
+ android:keyWidth="30%p" android:isRepeatable="true" android:isModifier="true"/>
<Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"/>
<Key android:codes="10" android:keyIcon="@drawable/sym_keyboard_return"
android:iconPreview="@drawable/sym_keyboard_feedback_return"
- android:keyWidth="20%p" android:keyEdgeFlags="right"/>
+ android:keyWidth="25%p" android:keyEdgeFlags="right" android:isModifier="true"/>
</Row>
<Row android:keyboardMode="@+id/mode_im" android:rowEdgeFlags="bottom">
<Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
- android:keyWidth="20%p" android:keyEdgeFlags="left"/>
- <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_keyboard_globe"
- android:keyWidth="10%p"/>
+ android:keyWidth="15%p" android:keyEdgeFlags="left" android:isModifier="true"/>
+ <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings"
+ android:iconPreview="@drawable/sym_keyboard_feedback_settings"
+ android:keyWidth="10%p" android:isModifier="true"/>
+ <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_keyboard_mic"
+ android:iconPreview="@drawable/sym_keyboard_feedback_mic"
+ android:keyWidth="10%p" android:isModifier="true"/>
<Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space"
android:iconPreview="@drawable/sym_keyboard_feedback_space"
- android:keyWidth="40%p" android:isRepeatable="true"/>
- <Key android:codes="46" android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"
- android:keyWidth="10%p"/>
+ android:keyWidth="30%p" android:isRepeatable="true" android:isModifier="true"/>
+ <Key android:codes="46" android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"
+ android:keyWidth="10%p" android:isModifier="true"/>
<Key android:keyLabel=":-)" android:keyOutputText=":-) "
android:popupKeyboard="@xml/popup_smileys"
- android:keyWidth="20%p" android:keyEdgeFlags="right"/>
+ android:keyWidth="25%p" android:keyEdgeFlags="right" android:isModifier="true"/>
</Row>
<Row android:keyboardMode="@+id/mode_webentry" android:rowEdgeFlags="bottom">
<Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
- android:keyWidth="20%p" android:keyEdgeFlags="left"/>
- <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_keyboard_globe"
- android:keyWidth="10%p"/>
+ android:keyWidth="10%p" android:keyEdgeFlags="left" android:isModifier="true"/>
+ <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings"
+ android:iconPreview="@drawable/sym_keyboard_feedback_settings"
+ android:keyWidth="10%p" android:isModifier="true"/>
+ <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_keyboard_mic"
+ android:iconPreview="@drawable/sym_keyboard_feedback_mic"
+ android:keyWidth="10%p" android:isModifier="true"/>
<Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space"
android:iconPreview="@drawable/sym_keyboard_feedback_space"
- android:keyWidth="20%p" android:isRepeatable="true"/>
+ android:keyWidth="20%p" android:isRepeatable="true" android:isModifier="true"/>
<Key android:codes="9" android:keyIcon="@drawable/sym_keyboard_tab"
android:iconPreview="@drawable/sym_keyboard_feedback_tab"
- android:keyWidth="20%p"/>
- <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"/>
+ android:keyWidth="15%p" android:isModifier="true"/>
+ <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"
+ android:keyWidth="10%p" android:isModifier="true"/>
<Key android:codes="10" android:keyIcon="@drawable/sym_keyboard_return"
android:iconPreview="@drawable/sym_keyboard_feedback_return"
- android:keyWidth="20%p" android:keyEdgeFlags="right"/>
+ android:keyWidth="15%p" android:keyEdgeFlags="right" android:isModifier="true"/>
</Row>
-
</Keyboard>
-
diff --git a/java/res/xml-fr/kbd_qwerty_black.xml b/java/res/xml-fr/kbd_qwerty_black.xml
index 78b1da9869eae29b5d3b5d347252ff43cdc5466d..6d3aeb8292accb7a71f983960c298d2b90c18c18 100644
--- a/java/res/xml-fr/kbd_qwerty_black.xml
+++ b/java/res/xml-fr/kbd_qwerty_black.xml
@@ -99,84 +99,94 @@
<Row android:keyboardMode="@+id/mode_normal" android:rowEdgeFlags="bottom">
<Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
- android:keyWidth="20%p" android:keyEdgeFlags="left"/>
- <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_bkeyboard_globe"
+ android:keyWidth="15%p" android:keyEdgeFlags="left"/>
+ <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings"
+ android:iconPreview="@drawable/sym_keyboard_feedback_settings"
+ android:keyWidth="10%p"/>
+ <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_bkeyboard_mic"
+ android:iconPreview="@drawable/sym_keyboard_feedback_mic"
android:keyWidth="10%p"/>
<Key android:codes="32" android:keyIcon="@drawable/sym_bkeyboard_space"
android:iconPreview="@drawable/sym_keyboard_feedback_space"
- android:keyWidth="40%p" android:isRepeatable="true"/>
+ android:keyWidth="30%p" android:isRepeatable="true"/>
<Key android:codes="46" android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"
android:keyWidth="10%p"/>
<Key android:codes="10" android:keyIcon="@drawable/sym_bkeyboard_return"
android:iconPreview="@drawable/sym_keyboard_feedback_return"
- android:keyWidth="20%p" android:keyEdgeFlags="right"/>
+ android:keyWidth="25%p" android:keyEdgeFlags="right"/>
</Row>
<Row android:keyboardMode="@+id/mode_url" android:rowEdgeFlags="bottom">
<Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
- android:keyWidth="20%p" android:keyEdgeFlags="left"/>
+ android:keyWidth="15%p" android:keyEdgeFlags="left"/>
+ <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings"
+ android:iconPreview="@drawable/sym_keyboard_feedback_settings"
+ android:keyWidth="10%p"/>
<Key android:keyLabel="/" android:keyWidth="10%p"/>
<Key android:codes="32" android:keyIcon="@drawable/sym_bkeyboard_space"
android:iconPreview="@drawable/sym_keyboard_feedback_space"
- android:keyWidth="40%p" android:isRepeatable="true"/>
- <!--Key android:keyLabel="@string/popular_domain_0"
- android:keyOutputText="@string/popular_domain_0"
- android:popupKeyboard="@xml/popup_domains"
- android:keyWidth="20%p"/-->
+ android:keyWidth="30%p" android:isRepeatable="true"/>
<Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"
android:keyWidth="10%p"/>
<Key android:codes="10" android:keyIcon="@drawable/sym_bkeyboard_return"
android:iconPreview="@drawable/sym_keyboard_feedback_return"
- android:keyWidth="20%p" android:keyEdgeFlags="right"/>
+ android:keyWidth="25%p" android:keyEdgeFlags="right"/>
</Row>
<Row android:keyboardMode="@+id/mode_email" android:rowEdgeFlags="bottom">
<Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
- android:keyWidth="20%p" android:keyEdgeFlags="left"/>
+ android:keyWidth="15%p" android:keyEdgeFlags="left"/>
+ <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings"
+ android:iconPreview="@drawable/sym_keyboard_feedback_settings"
+ android:keyWidth="10%p"/>
<Key android:keyLabel="\@"/>
<Key android:codes="32" android:keyIcon="@drawable/sym_bkeyboard_space"
android:iconPreview="@drawable/sym_keyboard_feedback_space"
- android:keyWidth="40%p" android:isRepeatable="true"/>
- <!--Key android:keyLabel="@string/popular_domain_0"
- android:keyOutputText="@string/popular_domain_0"
- android:popupKeyboard="@xml/popup_domains"
- android:keyWidth="20%p"/-->
+ android:keyWidth="30%p" android:isRepeatable="true"/>
<Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"/>
<Key android:codes="10" android:keyIcon="@drawable/sym_bkeyboard_return"
android:iconPreview="@drawable/sym_keyboard_feedback_return"
- android:keyWidth="20%p" android:keyEdgeFlags="right"/>
+ android:keyWidth="25%p" android:keyEdgeFlags="right"/>
</Row>
<Row android:keyboardMode="@+id/mode_im" android:rowEdgeFlags="bottom">
<Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
- android:keyWidth="20%p" android:keyEdgeFlags="left"/>
- <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_bkeyboard_globe"
+ android:keyWidth="15%p" android:keyEdgeFlags="left"/>
+ <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings"
+ android:iconPreview="@drawable/sym_keyboard_feedback_settings"
+ android:keyWidth="10%p"/>
+ <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_bkeyboard_mic"
+ android:iconPreview="@drawable/sym_keyboard_feedback_mic"
android:keyWidth="10%p"/>
<Key android:codes="32" android:keyIcon="@drawable/sym_bkeyboard_space"
android:iconPreview="@drawable/sym_keyboard_feedback_space"
- android:keyWidth="40%p" android:isRepeatable="true"/>
+ android:keyWidth="30%p" android:isRepeatable="true"/>
<Key android:codes="46" android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"
android:keyWidth="10%p"/>
<Key android:keyLabel=":-)" android:keyOutputText=":-) "
android:popupKeyboard="@xml/popup_smileys"
- android:keyWidth="20%p" android:keyEdgeFlags="right"/>
+ android:keyWidth="25%p" android:keyEdgeFlags="right"/>
</Row>
<Row android:keyboardMode="@+id/mode_webentry" android:rowEdgeFlags="bottom">
<Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
- android:keyWidth="20%p" android:keyEdgeFlags="left"/>
- <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_bkeyboard_globe"
+ android:keyWidth="10%p" android:keyEdgeFlags="left"/>
+ <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings"
+ android:iconPreview="@drawable/sym_keyboard_feedback_settings"
+ android:keyWidth="10%p"/>
+ <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_bkeyboard_mic"
+ android:iconPreview="@drawable/sym_keyboard_feedback_mic"
android:keyWidth="10%p"/>
<Key android:codes="32" android:keyIcon="@drawable/sym_bkeyboard_space"
android:iconPreview="@drawable/sym_keyboard_feedback_space"
android:keyWidth="20%p" android:isRepeatable="true"/>
<Key android:codes="9" android:keyIcon="@drawable/sym_bkeyboard_tab"
android:iconPreview="@drawable/sym_keyboard_feedback_tab"
- android:keyWidth="20%p"/>
- <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"/>
+ android:keyWidth="15%p"/>
+ <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"
+ android:keyWidth="10%p"/>
<Key android:codes="10" android:keyIcon="@drawable/sym_bkeyboard_return"
android:iconPreview="@drawable/sym_keyboard_feedback_return"
- android:keyWidth="20%p" android:keyEdgeFlags="right"/>
+ android:keyWidth="15%p" android:keyEdgeFlags="right"/>
</Row>
-
</Keyboard>
diff --git a/java/res/xml-iw/kbd_qwerty.xml b/java/res/xml-iw/kbd_qwerty.xml
index 0ce5d367f066b863832de0efc8ef20215a9f87d8..208ba92b4a6db08a3acd57cef32db80dc61a8c39 100755
--- a/java/res/xml-iw/kbd_qwerty.xml
+++ b/java/res/xml-iw/kbd_qwerty.xml
@@ -41,7 +41,7 @@
android:keyIcon="@drawable/sym_keyboard_delete"
android:keyWidth="13.75%p" android:keyEdgeFlags="right"
android:iconPreview="@drawable/sym_keyboard_feedback_delete"
- android:isRepeatable="true"/>
+ android:isRepeatable="true" android:isModifier="true"/>
</Row>
<Row>
@@ -71,84 +71,95 @@
<Row android:keyboardMode="@+id/mode_normal" android:rowEdgeFlags="bottom">
<Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
- android:keyWidth="20%p" android:keyEdgeFlags="left"/>
- <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_keyboard_globe"
- android:keyWidth="10%p"/>
+ android:keyWidth="15%p" android:keyEdgeFlags="left" android:isModifier="true"/>
+ <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings"
+ android:iconPreview="@drawable/sym_keyboard_feedback_settings"
+ android:keyWidth="10%p" android:isModifier="true"/>
+ <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_keyboard_mic"
+ android:iconPreview="@drawable/sym_keyboard_feedback_mic"
+ android:keyWidth="10%p" android:isModifier="true"/>
<Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space"
android:iconPreview="@drawable/sym_keyboard_feedback_space"
- android:keyWidth="40%p" android:isRepeatable="true"/>
+ android:keyWidth="30%p" android:isRepeatable="true" android:isModifier="true"/>
<Key android:codes="46" android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"
- android:keyWidth="10%p"/>
+ android:keyWidth="10%p" android:isModifier="true"/>
<Key android:codes="10" android:keyIcon="@drawable/sym_keyboard_return"
android:iconPreview="@drawable/sym_keyboard_feedback_return"
- android:keyWidth="20%p" android:keyEdgeFlags="right"/>
+ android:keyWidth="25%p" android:keyEdgeFlags="right" android:isModifier="true"/>
</Row>
<Row android:keyboardMode="@+id/mode_url" android:rowEdgeFlags="bottom">
<Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
- android:keyWidth="20%p" android:keyEdgeFlags="left"/>
+ android:keyWidth="15%p" android:keyEdgeFlags="left" android:isModifier="true"/>
+ <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings"
+ android:iconPreview="@drawable/sym_keyboard_feedback_settings"
+ android:keyWidth="10%p" android:isModifier="true"/>
<Key android:keyLabel="/" android:keyWidth="10%p"/>
<Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space"
android:iconPreview="@drawable/sym_keyboard_feedback_space"
- android:keyWidth="40%p" android:isRepeatable="true"/>
- <!--Key android:keyLabel="@string/popular_domain_0"
- android:keyOutputText="@string/popular_domain_0"
- android:popupKeyboard="@xml/popup_domains"
- android:keyWidth="20%p"/-->
+ android:keyWidth="30%p" android:isRepeatable="true" android:isModifier="true"/>
<Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"
- android:keyWidth="10%p"/>
+ android:keyWidth="10%p" android:isModifier="true"/>
<Key android:codes="10" android:keyIcon="@drawable/sym_keyboard_return"
android:iconPreview="@drawable/sym_keyboard_feedback_return"
- android:keyWidth="20%p" android:keyEdgeFlags="right"/>
+ android:keyWidth="25%p" android:keyEdgeFlags="right" android:isModifier="true"/>
</Row>
<Row android:keyboardMode="@+id/mode_email" android:rowEdgeFlags="bottom">
<Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
- android:keyWidth="20%p" android:keyEdgeFlags="left"/>
- <Key android:keyLabel="\@" android:keyWidth="10%p"/>
+ android:keyWidth="15%p" android:keyEdgeFlags="left" android:isModifier="true"/>
+ <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings"
+ android:iconPreview="@drawable/sym_keyboard_feedback_settings"
+ android:keyWidth="10%p" android:isModifier="true"/>
+ <Key android:keyLabel="\@"/>
<Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space"
android:iconPreview="@drawable/sym_keyboard_feedback_space"
- android:keyWidth="40%p" android:isRepeatable="true"/>
- <!--Key android:keyLabel="@string/popular_domain_0"
- android:keyOutputText="@string/popular_domain_0"
- android:popupKeyboard="@xml/popup_domains"
- android:keyWidth="20%p"/-->
+ android:keyWidth="30%p" android:isRepeatable="true" android:isModifier="true"/>
<Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"/>
<Key android:codes="10" android:keyIcon="@drawable/sym_keyboard_return"
android:iconPreview="@drawable/sym_keyboard_feedback_return"
- android:keyWidth="20%p" android:keyEdgeFlags="right"/>
+ android:keyWidth="25%p" android:keyEdgeFlags="right" android:isModifier="true"/>
</Row>
<Row android:keyboardMode="@+id/mode_im" android:rowEdgeFlags="bottom">
<Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
- android:keyWidth="20%p" android:keyEdgeFlags="left"/>
- <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_keyboard_globe"
- android:keyWidth="10%p"/>
+ android:keyWidth="15%p" android:keyEdgeFlags="left" android:isModifier="true"/>
+ <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings"
+ android:iconPreview="@drawable/sym_keyboard_feedback_settings"
+ android:keyWidth="10%p" android:isModifier="true"/>
+ <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_keyboard_mic"
+ android:iconPreview="@drawable/sym_keyboard_feedback_mic"
+ android:keyWidth="10%p" android:isModifier="true"/>
<Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space"
android:iconPreview="@drawable/sym_keyboard_feedback_space"
- android:keyWidth="40%p" android:isRepeatable="true"/>
+ android:keyWidth="30%p" android:isRepeatable="true" android:isModifier="true"/>
<Key android:codes="46" android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"
- android:keyWidth="10%p"/>
+ android:keyWidth="10%p" android:isModifier="true"/>
<Key android:keyLabel=":-)" android:keyOutputText=":-) "
android:popupKeyboard="@xml/popup_smileys"
- android:keyWidth="20%p" android:keyEdgeFlags="right"/>
+ android:keyWidth="25%p" android:keyEdgeFlags="right" android:isModifier="true"/>
</Row>
<Row android:keyboardMode="@+id/mode_webentry" android:rowEdgeFlags="bottom">
<Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
- android:keyWidth="20%p" android:keyEdgeFlags="left"/>
- <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_keyboard_globe"
- android:keyWidth="10%p"/>
+ android:keyWidth="10%p" android:keyEdgeFlags="left" android:isModifier="true"/>
+ <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings"
+ android:iconPreview="@drawable/sym_keyboard_feedback_settings"
+ android:keyWidth="10%p" android:isModifier="true"/>
+ <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_keyboard_mic"
+ android:iconPreview="@drawable/sym_keyboard_feedback_mic"
+ android:keyWidth="10%p" android:isModifier="true"/>
<Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space"
android:iconPreview="@drawable/sym_keyboard_feedback_space"
- android:keyWidth="20%p" android:isRepeatable="true"/>
+ android:keyWidth="20%p" android:isRepeatable="true" android:isModifier="true"/>
<Key android:codes="9" android:keyIcon="@drawable/sym_keyboard_tab"
android:iconPreview="@drawable/sym_keyboard_feedback_tab"
- android:keyWidth="20%p"/>
- <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"/>
+ android:keyWidth="15%p" android:isModifier="true"/>
+ <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"
+ android:keyWidth="10%p" android:isModifier="true"/>
<Key android:codes="10" android:keyIcon="@drawable/sym_keyboard_return"
android:iconPreview="@drawable/sym_keyboard_feedback_return"
- android:keyWidth="20%p" android:keyEdgeFlags="right"/>
+ android:keyWidth="15%p" android:keyEdgeFlags="right" android:isModifier="true"/>
</Row>
</Keyboard>
diff --git a/java/res/xml-iw/kbd_qwerty_black.xml b/java/res/xml-iw/kbd_qwerty_black.xml
index 2bf0c2a0cbdd59d381719cc9b979410b6c82702b..981ad37c334233199b4f7903af910b8910187379 100755
--- a/java/res/xml-iw/kbd_qwerty_black.xml
+++ b/java/res/xml-iw/kbd_qwerty_black.xml
@@ -71,84 +71,95 @@
<Row android:keyboardMode="@+id/mode_normal" android:rowEdgeFlags="bottom">
<Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
- android:keyWidth="20%p" android:keyEdgeFlags="left"/>
- <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_bkeyboard_globe"
+ android:keyWidth="15%p" android:keyEdgeFlags="left"/>
+ <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings"
+ android:iconPreview="@drawable/sym_keyboard_feedback_settings"
+ android:keyWidth="10%p"/>
+ <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_bkeyboard_mic"
+ android:iconPreview="@drawable/sym_keyboard_feedback_mic"
android:keyWidth="10%p"/>
<Key android:codes="32" android:keyIcon="@drawable/sym_bkeyboard_space"
android:iconPreview="@drawable/sym_keyboard_feedback_space"
- android:keyWidth="40%p" android:isRepeatable="true"/>
+ android:keyWidth="30%p" android:isRepeatable="true"/>
<Key android:codes="46" android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"
android:keyWidth="10%p"/>
<Key android:codes="10" android:keyIcon="@drawable/sym_bkeyboard_return"
android:iconPreview="@drawable/sym_keyboard_feedback_return"
- android:keyWidth="20%p" android:keyEdgeFlags="right"/>
+ android:keyWidth="25%p" android:keyEdgeFlags="right"/>
</Row>
<Row android:keyboardMode="@+id/mode_url" android:rowEdgeFlags="bottom">
<Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
- android:keyWidth="20%p" android:keyEdgeFlags="left"/>
+ android:keyWidth="15%p" android:keyEdgeFlags="left"/>
+ <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings"
+ android:iconPreview="@drawable/sym_keyboard_feedback_settings"
+ android:keyWidth="10%p"/>
<Key android:keyLabel="/" android:keyWidth="10%p"/>
<Key android:codes="32" android:keyIcon="@drawable/sym_bkeyboard_space"
android:iconPreview="@drawable/sym_keyboard_feedback_space"
- android:keyWidth="40%p" android:isRepeatable="true"/>
- <!--Key android:keyLabel="@string/popular_domain_0"
- android:keyOutputText="@string/popular_domain_0"
- android:popupKeyboard="@xml/popup_domains"
- android:keyWidth="20%p"/-->
+ android:keyWidth="30%p" android:isRepeatable="true"/>
<Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"
android:keyWidth="10%p"/>
<Key android:codes="10" android:keyIcon="@drawable/sym_bkeyboard_return"
android:iconPreview="@drawable/sym_keyboard_feedback_return"
- android:keyWidth="20%p" android:keyEdgeFlags="right"/>
+ android:keyWidth="25%p" android:keyEdgeFlags="right"/>
</Row>
<Row android:keyboardMode="@+id/mode_email" android:rowEdgeFlags="bottom">
<Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
- android:keyWidth="20%p" android:keyEdgeFlags="left"/>
- <Key android:keyLabel="\@" android:keyWidth="10%p"/>
+ android:keyWidth="15%p" android:keyEdgeFlags="left"/>
+ <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings"
+ android:iconPreview="@drawable/sym_keyboard_feedback_settings"
+ android:keyWidth="10%p"/>
+ <Key android:keyLabel="\@"/>
<Key android:codes="32" android:keyIcon="@drawable/sym_bkeyboard_space"
android:iconPreview="@drawable/sym_keyboard_feedback_space"
- android:keyWidth="40%p" android:isRepeatable="true"/>
- <!--Key android:keyLabel="@string/popular_domain_0"
- android:keyOutputText="@string/popular_domain_0"
- android:popupKeyboard="@xml/popup_domains"
- android:keyWidth="20%p"/-->
+ android:keyWidth="30%p" android:isRepeatable="true"/>
<Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"/>
<Key android:codes="10" android:keyIcon="@drawable/sym_bkeyboard_return"
android:iconPreview="@drawable/sym_keyboard_feedback_return"
- android:keyWidth="20%p" android:keyEdgeFlags="right"/>
+ android:keyWidth="25%p" android:keyEdgeFlags="right"/>
</Row>
<Row android:keyboardMode="@+id/mode_im" android:rowEdgeFlags="bottom">
<Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
- android:keyWidth="20%p" android:keyEdgeFlags="left"/>
- <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_bkeyboard_globe"
+ android:keyWidth="15%p" android:keyEdgeFlags="left"/>
+ <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings"
+ android:iconPreview="@drawable/sym_keyboard_feedback_settings"
+ android:keyWidth="10%p"/>
+ <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_bkeyboard_mic"
+ android:iconPreview="@drawable/sym_keyboard_feedback_mic"
android:keyWidth="10%p"/>
<Key android:codes="32" android:keyIcon="@drawable/sym_bkeyboard_space"
android:iconPreview="@drawable/sym_keyboard_feedback_space"
- android:keyWidth="40%p" android:isRepeatable="true"/>
+ android:keyWidth="30%p" android:isRepeatable="true"/>
<Key android:codes="46" android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"
android:keyWidth="10%p"/>
<Key android:keyLabel=":-)" android:keyOutputText=":-) "
android:popupKeyboard="@xml/popup_smileys"
- android:keyWidth="20%p" android:keyEdgeFlags="right"/>
+ android:keyWidth="25%p" android:keyEdgeFlags="right"/>
</Row>
<Row android:keyboardMode="@+id/mode_webentry" android:rowEdgeFlags="bottom">
<Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
- android:keyWidth="20%p" android:keyEdgeFlags="left"/>
- <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_bkeyboard_globe"
+ android:keyWidth="10%p" android:keyEdgeFlags="left"/>
+ <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings"
+ android:iconPreview="@drawable/sym_keyboard_feedback_settings"
+ android:keyWidth="10%p"/>
+ <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_bkeyboard_mic"
+ android:iconPreview="@drawable/sym_keyboard_feedback_mic"
android:keyWidth="10%p"/>
<Key android:codes="32" android:keyIcon="@drawable/sym_bkeyboard_space"
android:iconPreview="@drawable/sym_keyboard_feedback_space"
android:keyWidth="20%p" android:isRepeatable="true"/>
<Key android:codes="9" android:keyIcon="@drawable/sym_bkeyboard_tab"
android:iconPreview="@drawable/sym_keyboard_feedback_tab"
- android:keyWidth="20%p"/>
- <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"/>
+ android:keyWidth="15%p"/>
+ <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"
+ android:keyWidth="10%p"/>
<Key android:codes="10" android:keyIcon="@drawable/sym_bkeyboard_return"
android:iconPreview="@drawable/sym_keyboard_feedback_return"
- android:keyWidth="20%p" android:keyEdgeFlags="right"/>
+ android:keyWidth="15%p" android:keyEdgeFlags="right"/>
</Row>
</Keyboard>
diff --git a/java/res/xml-nb/kbd_qwerty.xml b/java/res/xml-nb/kbd_qwerty.xml
index a9e6adc9e22794a9e8dbddedd6c48e54189f728b..d033bb02c839c1581be32c9fde1c90be92b7ee1b 100644
--- a/java/res/xml-nb/kbd_qwerty.xml
+++ b/java/res/xml-nb/kbd_qwerty.xml
@@ -110,92 +110,99 @@
<Key android:codes="-5" android:keyIcon="@drawable/sym_keyboard_delete"
android:keyWidth="15%p" android:keyEdgeFlags="right"
android:iconPreview="@drawable/sym_keyboard_feedback_delete"
- android:isRepeatable="true"/>
+ android:isRepeatable="true" android:isModifier="true"/>
</Row>
<Row android:keyboardMode="@+id/mode_normal" android:rowEdgeFlags="bottom">
<Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
- android:keyWidth="20%p" android:keyEdgeFlags="left"/>
+ android:keyWidth="15%p" android:keyEdgeFlags="left" android:isModifier="true"/>
+ <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings"
+ android:iconPreview="@drawable/sym_keyboard_feedback_settings"
+ android:keyWidth="10%p" android:isModifier="true"/>
<Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_keyboard_mic"
android:iconPreview="@drawable/sym_keyboard_feedback_mic"
- android:keyWidth="10%p"/>
+ android:keyWidth="10%p" android:isModifier="true"/>
<Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space"
android:iconPreview="@drawable/sym_keyboard_feedback_space"
- android:keyWidth="40%p" android:isRepeatable="true"/>
+ android:keyWidth="30%p" android:isRepeatable="true" android:isModifier="true"/>
<Key android:codes="46" android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"
- android:keyWidth="10%p"/>
+ android:keyWidth="10%p" android:isModifier="true"/>
<Key android:codes="10" android:keyIcon="@drawable/sym_keyboard_return"
android:iconPreview="@drawable/sym_keyboard_feedback_return"
- android:keyWidth="20%p" android:keyEdgeFlags="right"/>
+ android:keyWidth="25%p" android:keyEdgeFlags="right" android:isModifier="true"/>
</Row>
<Row android:keyboardMode="@+id/mode_url" android:rowEdgeFlags="bottom">
<Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
- android:keyWidth="20%p" android:keyEdgeFlags="left"/>
+ android:keyWidth="15%p" android:keyEdgeFlags="left" android:isModifier="true"/>
+ <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings"
+ android:iconPreview="@drawable/sym_keyboard_feedback_settings"
+ android:keyWidth="10%p" android:isModifier="true"/>
<Key android:keyLabel="/" android:keyWidth="10%p"/>
<Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space"
android:iconPreview="@drawable/sym_keyboard_feedback_space"
- android:keyWidth="40%p" android:isRepeatable="true"/>
- <!--Key android:keyLabel="@string/popular_domain_0"
- android:keyOutputText="@string/popular_domain_0"
- android:popupKeyboard="@xml/popup_domains"
- android:keyWidth="20%p"/-->
+ android:keyWidth="30%p" android:isRepeatable="true" android:isModifier="true"/>
<Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"
- android:keyWidth="10%p"/>
+ android:keyWidth="10%p" android:isModifier="true"/>
<Key android:codes="10" android:keyIcon="@drawable/sym_keyboard_return"
android:iconPreview="@drawable/sym_keyboard_feedback_return"
- android:keyWidth="20%p" android:keyEdgeFlags="right"/>
+ android:keyWidth="25%p" android:keyEdgeFlags="right" android:isModifier="true"/>
</Row>
<Row android:keyboardMode="@+id/mode_email" android:rowEdgeFlags="bottom">
<Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
- android:keyWidth="20%p" android:keyEdgeFlags="left"/>
+ android:keyWidth="15%p" android:keyEdgeFlags="left" android:isModifier="true"/>
+ <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings"
+ android:iconPreview="@drawable/sym_keyboard_feedback_settings"
+ android:keyWidth="10%p" android:isModifier="true"/>
<Key android:keyLabel="\@"/>
<Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space"
android:iconPreview="@drawable/sym_keyboard_feedback_space"
- android:keyWidth="40%p" android:isRepeatable="true"/>
- <!--Key android:keyLabel="@string/popular_domain_0"
- android:keyOutputText="@string/popular_domain_0"
- android:popupKeyboard="@xml/popup_domains"
- android:keyWidth="20%p"/-->
+ android:keyWidth="30%p" android:isRepeatable="true" android:isModifier="true"/>
<Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"/>
<Key android:codes="10" android:keyIcon="@drawable/sym_keyboard_return"
android:iconPreview="@drawable/sym_keyboard_feedback_return"
- android:keyWidth="20%p" android:keyEdgeFlags="right"/>
+ android:keyWidth="25%p" android:keyEdgeFlags="right" android:isModifier="true"/>
</Row>
<Row android:keyboardMode="@+id/mode_im" android:rowEdgeFlags="bottom">
<Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
- android:keyWidth="20%p" android:keyEdgeFlags="left"/>
+ android:keyWidth="15%p" android:keyEdgeFlags="left" android:isModifier="true"/>
+ <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings"
+ android:iconPreview="@drawable/sym_keyboard_feedback_settings"
+ android:keyWidth="10%p" android:isModifier="true"/>
<Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_keyboard_mic"
android:iconPreview="@drawable/sym_keyboard_feedback_mic"
- android:keyWidth="10%p"/>
+ android:keyWidth="10%p" android:isModifier="true"/>
<Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space"
android:iconPreview="@drawable/sym_keyboard_feedback_space"
- android:keyWidth="40%p" android:isRepeatable="true"/>
+ android:keyWidth="30%p" android:isRepeatable="true" android:isModifier="true"/>
<Key android:codes="46" android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"
- android:keyWidth="10%p"/>
+ android:keyWidth="10%p" android:isModifier="true"/>
<Key android:keyLabel=":-)" android:keyOutputText=":-) "
android:popupKeyboard="@xml/popup_smileys"
- android:keyWidth="20%p" android:keyEdgeFlags="right"/>
+ android:keyWidth="25%p" android:keyEdgeFlags="right" android:isModifier="true"/>
</Row>
<Row android:keyboardMode="@+id/mode_webentry" android:rowEdgeFlags="bottom">
<Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
- android:keyWidth="20%p" android:keyEdgeFlags="left"/>
+ android:keyWidth="10%p" android:keyEdgeFlags="left" android:isModifier="true"/>
+ <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings"
+ android:iconPreview="@drawable/sym_keyboard_feedback_settings"
+ android:keyWidth="10%p" android:isModifier="true"/>
<Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_keyboard_mic"
android:iconPreview="@drawable/sym_keyboard_feedback_mic"
- android:keyWidth="10%p"/>
+ android:keyWidth="10%p" android:isModifier="true"/>
<Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space"
android:iconPreview="@drawable/sym_keyboard_feedback_space"
- android:keyWidth="20%p" android:isRepeatable="true"/>
+ android:keyWidth="20%p" android:isRepeatable="true" android:isModifier="true"/>
<Key android:codes="9" android:keyIcon="@drawable/sym_keyboard_tab"
android:iconPreview="@drawable/sym_keyboard_feedback_tab"
- android:keyWidth="20%p"/>
- <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"/>
+ android:keyWidth="15%p" android:isModifier="true"/>
+ <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"
+ android:keyWidth="10%p" android:isModifier="true"/>
<Key android:codes="10" android:keyIcon="@drawable/sym_keyboard_return"
android:iconPreview="@drawable/sym_keyboard_feedback_return"
- android:keyWidth="20%p" android:keyEdgeFlags="right"/>
+ android:keyWidth="15%p" android:keyEdgeFlags="right" android:isModifier="true"/>
</Row>
-
</Keyboard>
diff --git a/java/res/xml-nb/kbd_qwerty_black.xml b/java/res/xml-nb/kbd_qwerty_black.xml
index 8d23cc196d88680523e214f2eb9db7233b470fa6..14456e6b690cb5c2109d7390d6eca4864b17e415 100644
--- a/java/res/xml-nb/kbd_qwerty_black.xml
+++ b/java/res/xml-nb/kbd_qwerty_black.xml
@@ -115,74 +115,81 @@
<Row android:keyboardMode="@+id/mode_normal" android:rowEdgeFlags="bottom">
<Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
- android:keyWidth="20%p" android:keyEdgeFlags="left"/>
+ android:keyWidth="15%p" android:keyEdgeFlags="left"/>
+ <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings"
+ android:iconPreview="@drawable/sym_keyboard_feedback_settings"
+ android:keyWidth="10%p"/>
<Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_bkeyboard_mic"
android:iconPreview="@drawable/sym_keyboard_feedback_mic"
android:keyWidth="10%p"/>
<Key android:codes="32" android:keyIcon="@drawable/sym_bkeyboard_space"
android:iconPreview="@drawable/sym_keyboard_feedback_space"
- android:keyWidth="40%p" android:isRepeatable="true"/>
+ android:keyWidth="30%p" android:isRepeatable="true"/>
<Key android:codes="46" android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"
android:keyWidth="10%p"/>
<Key android:codes="10" android:keyIcon="@drawable/sym_bkeyboard_return"
android:iconPreview="@drawable/sym_keyboard_feedback_return"
- android:keyWidth="20%p" android:keyEdgeFlags="right"/>
+ android:keyWidth="25%p" android:keyEdgeFlags="right"/>
</Row>
<Row android:keyboardMode="@+id/mode_url" android:rowEdgeFlags="bottom">
<Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
- android:keyWidth="20%p" android:keyEdgeFlags="left"/>
+ android:keyWidth="15%p" android:keyEdgeFlags="left"/>
+ <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings"
+ android:iconPreview="@drawable/sym_keyboard_feedback_settings"
+ android:keyWidth="10%p"/>
<Key android:keyLabel="/" android:keyWidth="10%p"/>
<Key android:codes="32" android:keyIcon="@drawable/sym_bkeyboard_space"
android:iconPreview="@drawable/sym_keyboard_feedback_space"
- android:keyWidth="40%p" android:isRepeatable="true"/>
- <!--Key android:keyLabel="@string/popular_domain_0"
- android:keyOutputText="@string/popular_domain_0"
- android:popupKeyboard="@xml/popup_domains"
- android:keyWidth="20%p"/-->
+ android:keyWidth="30%p" android:isRepeatable="true"/>
<Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"
android:keyWidth="10%p"/>
<Key android:codes="10" android:keyIcon="@drawable/sym_bkeyboard_return"
android:iconPreview="@drawable/sym_keyboard_feedback_return"
- android:keyWidth="20%p" android:keyEdgeFlags="right"/>
+ android:keyWidth="25%p" android:keyEdgeFlags="right"/>
</Row>
<Row android:keyboardMode="@+id/mode_email" android:rowEdgeFlags="bottom">
<Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
- android:keyWidth="20%p" android:keyEdgeFlags="left"/>
+ android:keyWidth="15%p" android:keyEdgeFlags="left"/>
+ <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings"
+ android:iconPreview="@drawable/sym_keyboard_feedback_settings"
+ android:keyWidth="10%p"/>
<Key android:keyLabel="\@"/>
<Key android:codes="32" android:keyIcon="@drawable/sym_bkeyboard_space"
android:iconPreview="@drawable/sym_keyboard_feedback_space"
- android:keyWidth="40%p" android:isRepeatable="true"/>
- <!--Key android:keyLabel="@string/popular_domain_0"
- android:keyOutputText="@string/popular_domain_0"
- android:popupKeyboard="@xml/popup_domains"
- android:keyWidth="20%p"/-->
+ android:keyWidth="30%p" android:isRepeatable="true"/>
<Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"/>
<Key android:codes="10" android:keyIcon="@drawable/sym_bkeyboard_return"
android:iconPreview="@drawable/sym_keyboard_feedback_return"
- android:keyWidth="20%p" android:keyEdgeFlags="right"/>
+ android:keyWidth="25%p" android:keyEdgeFlags="right"/>
</Row>
<Row android:keyboardMode="@+id/mode_im" android:rowEdgeFlags="bottom">
<Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
- android:keyWidth="20%p" android:keyEdgeFlags="left"/>
+ android:keyWidth="15%p" android:keyEdgeFlags="left"/>
+ <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings"
+ android:iconPreview="@drawable/sym_keyboard_feedback_settings"
+ android:keyWidth="10%p"/>
<Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_bkeyboard_mic"
android:iconPreview="@drawable/sym_keyboard_feedback_mic"
android:keyWidth="10%p"/>
<Key android:codes="32" android:keyIcon="@drawable/sym_bkeyboard_space"
android:iconPreview="@drawable/sym_keyboard_feedback_space"
- android:keyWidth="40%p" android:isRepeatable="true"/>
+ android:keyWidth="30%p" android:isRepeatable="true"/>
<Key android:codes="46" android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"
android:keyWidth="10%p"/>
<Key android:keyLabel=":-)" android:keyOutputText=":-) "
android:popupKeyboard="@xml/popup_smileys"
- android:keyWidth="20%p" android:keyEdgeFlags="right"/>
+ android:keyWidth="25%p" android:keyEdgeFlags="right"/>
</Row>
<Row android:keyboardMode="@+id/mode_webentry" android:rowEdgeFlags="bottom">
<Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
- android:keyWidth="20%p" android:keyEdgeFlags="left"/>
+ android:keyWidth="10%p" android:keyEdgeFlags="left"/>
+ <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings"
+ android:iconPreview="@drawable/sym_keyboard_feedback_settings"
+ android:keyWidth="10%p"/>
<Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_bkeyboard_mic"
android:iconPreview="@drawable/sym_keyboard_feedback_mic"
android:keyWidth="10%p"/>
@@ -191,11 +198,11 @@
android:keyWidth="20%p" android:isRepeatable="true"/>
<Key android:codes="9" android:keyIcon="@drawable/sym_bkeyboard_tab"
android:iconPreview="@drawable/sym_keyboard_feedback_tab"
- android:keyWidth="20%p"/>
- <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"/>
+ android:keyWidth="15%p"/>
+ <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"
+ android:keyWidth="10%p"/>
<Key android:codes="10" android:keyIcon="@drawable/sym_bkeyboard_return"
android:iconPreview="@drawable/sym_keyboard_feedback_return"
- android:keyWidth="20%p" android:keyEdgeFlags="right"/>
+ android:keyWidth="15%p" android:keyEdgeFlags="right"/>
</Row>
-
</Keyboard>
diff --git a/java/res/xml-ru/kbd_qwerty.xml b/java/res/xml-ru/kbd_qwerty.xml
index 0c49f3781745f1bcd725de439d76b7acfe306495..e512c0b84e22fee47ccbc181090c06dc04bdc048 100755
--- a/java/res/xml-ru/kbd_qwerty.xml
+++ b/java/res/xml-ru/kbd_qwerty.xml
@@ -78,89 +78,100 @@
<Key android:codes="-5" android:keyIcon="@drawable/sym_keyboard_delete"
android:keyWidth="11.75%p" android:keyEdgeFlags="right"
android:iconPreview="@drawable/sym_keyboard_feedback_delete"
- android:isRepeatable="true"/>
+ android:isRepeatable="true" android:isModifier="true"/>
</Row>
<Row android:keyboardMode="@+id/mode_normal" android:rowEdgeFlags="bottom">
<Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
- android:keyWidth="20%p" android:keyEdgeFlags="left"/>
- <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_keyboard_globe"
- android:keyWidth="10%p"/>
+ android:keyWidth="15%p" android:keyEdgeFlags="left" android:isModifier="true"/>
+ <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings"
+ android:iconPreview="@drawable/sym_keyboard_feedback_settings"
+ android:keyWidth="10%p" android:isModifier="true"/>
+ <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_keyboard_mic"
+ android:iconPreview="@drawable/sym_keyboard_feedback_mic"
+ android:keyWidth="10%p" android:isModifier="true"/>
<Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space"
android:iconPreview="@drawable/sym_keyboard_feedback_space"
- android:keyWidth="40%p" android:isRepeatable="true"/>
+ android:keyWidth="30%p" android:isRepeatable="true" android:isModifier="true"/>
<Key android:codes="46" android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"
- android:keyWidth="10%p"/>
+ android:keyWidth="10%p" android:isModifier="true"/>
<Key android:codes="10" android:keyIcon="@drawable/sym_keyboard_return"
android:iconPreview="@drawable/sym_keyboard_feedback_return"
- android:keyWidth="20%p" android:keyEdgeFlags="right"/>
+ android:keyWidth="25%p" android:keyEdgeFlags="right" android:isModifier="true"/>
</Row>
<Row android:keyboardMode="@+id/mode_url" android:rowEdgeFlags="bottom">
<Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
- android:keyWidth="20%p" android:keyEdgeFlags="left"/>
+ android:keyWidth="15%p" android:keyEdgeFlags="left" android:isModifier="true"/>
+ <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings"
+ android:iconPreview="@drawable/sym_keyboard_feedback_settings"
+ android:keyWidth="10%p" android:isModifier="true"/>
<Key android:keyLabel="/" android:keyWidth="10%p"/>
<Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space"
android:iconPreview="@drawable/sym_keyboard_feedback_space"
- android:keyWidth="40%p" android:isRepeatable="true"/>
- <!--Key android:keyLabel="@string/popular_domain_0"
- android:keyOutputText="@string/popular_domain_0"
- android:popupKeyboard="@xml/popup_domains"
- android:keyWidth="20%p"/-->
+ android:keyWidth="30%p" android:isRepeatable="true" android:isModifier="true"/>
<Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"
- android:keyWidth="10%p"/>
+ android:keyWidth="10%p" android:isModifier="true"/>
<Key android:codes="10" android:keyIcon="@drawable/sym_keyboard_return"
android:iconPreview="@drawable/sym_keyboard_feedback_return"
- android:keyWidth="20%p" android:keyEdgeFlags="right"/>
+ android:keyWidth="25%p" android:keyEdgeFlags="right" android:isModifier="true"/>
</Row>
<Row android:keyboardMode="@+id/mode_email" android:rowEdgeFlags="bottom">
<Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
- android:keyWidth="20%p" android:keyEdgeFlags="left"/>
- <Key android:keyLabel="\@" android:keyWidth="10%p"/>
+ android:keyWidth="15%p" android:keyEdgeFlags="left" android:isModifier="true"/>
+ <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings"
+ android:iconPreview="@drawable/sym_keyboard_feedback_settings"
+ android:keyWidth="10%p" android:isModifier="true"/>
+ <Key android:keyLabel="\@"/>
<Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space"
android:iconPreview="@drawable/sym_keyboard_feedback_space"
- android:keyWidth="40%p" android:isRepeatable="true"/>
- <!--Key android:keyLabel="@string/popular_domain_0"
- android:keyOutputText="@string/popular_domain_0"
- android:popupKeyboard="@xml/popup_domains"
- android:keyWidth="20%p"/-->
+ android:keyWidth="30%p" android:isRepeatable="true" android:isModifier="true"/>
<Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"/>
<Key android:codes="10" android:keyIcon="@drawable/sym_keyboard_return"
android:iconPreview="@drawable/sym_keyboard_feedback_return"
- android:keyWidth="20%p" android:keyEdgeFlags="right"/>
+ android:keyWidth="25%p" android:keyEdgeFlags="right" android:isModifier="true"/>
</Row>
<Row android:keyboardMode="@+id/mode_im" android:rowEdgeFlags="bottom">
<Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
- android:keyWidth="20%p" android:keyEdgeFlags="left"/>
- <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_keyboard_globe"
- android:keyWidth="10%p"/>
+ android:keyWidth="15%p" android:keyEdgeFlags="left" android:isModifier="true"/>
+ <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings"
+ android:iconPreview="@drawable/sym_keyboard_feedback_settings"
+ android:keyWidth="10%p" android:isModifier="true"/>
+ <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_keyboard_mic"
+ android:iconPreview="@drawable/sym_keyboard_feedback_mic"
+ android:keyWidth="10%p" android:isModifier="true"/>
<Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space"
android:iconPreview="@drawable/sym_keyboard_feedback_space"
- android:keyWidth="40%p" android:isRepeatable="true"/>
+ android:keyWidth="30%p" android:isRepeatable="true" android:isModifier="true"/>
<Key android:codes="46" android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"
- android:keyWidth="10%p"/>
+ android:keyWidth="10%p" android:isModifier="true"/>
<Key android:keyLabel=":-)" android:keyOutputText=":-) "
android:popupKeyboard="@xml/popup_smileys"
- android:keyWidth="20%p" android:keyEdgeFlags="right"/>
+ android:keyWidth="25%p" android:keyEdgeFlags="right" android:isModifier="true"/>
</Row>
<Row android:keyboardMode="@+id/mode_webentry" android:rowEdgeFlags="bottom">
<Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
- android:keyWidth="20%p" android:keyEdgeFlags="left"/>
- <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_keyboard_globe"
- android:keyWidth="10%p"/>
+ android:keyWidth="10%p" android:keyEdgeFlags="left" android:isModifier="true"/>
+ <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings"
+ android:iconPreview="@drawable/sym_keyboard_feedback_settings"
+ android:keyWidth="10%p" android:isModifier="true"/>
+ <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_keyboard_mic"
+ android:iconPreview="@drawable/sym_keyboard_feedback_mic"
+ android:keyWidth="10%p" android:isModifier="true"/>
<Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space"
android:iconPreview="@drawable/sym_keyboard_feedback_space"
- android:keyWidth="20%p" android:isRepeatable="true"/>
+ android:keyWidth="20%p" android:isRepeatable="true" android:isModifier="true"/>
<Key android:codes="9" android:keyIcon="@drawable/sym_keyboard_tab"
android:iconPreview="@drawable/sym_keyboard_feedback_tab"
- android:keyWidth="20%p"/>
- <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"/>
+ android:keyWidth="15%p" android:isModifier="true"/>
+ <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"
+ android:keyWidth="10%p" android:isModifier="true"/>
<Key android:codes="10" android:keyIcon="@drawable/sym_keyboard_return"
android:iconPreview="@drawable/sym_keyboard_feedback_return"
- android:keyWidth="20%p" android:keyEdgeFlags="right"/>
+ android:keyWidth="15%p" android:keyEdgeFlags="right" android:isModifier="true"/>
</Row>
</Keyboard>
diff --git a/java/res/xml-ru/kbd_qwerty_black.xml b/java/res/xml-ru/kbd_qwerty_black.xml
index a9c88b7d2c1915f98fb2f981a3f67b1379f14a80..00c39927374d7749d17901073bc94bf712a7f466 100755
--- a/java/res/xml-ru/kbd_qwerty_black.xml
+++ b/java/res/xml-ru/kbd_qwerty_black.xml
@@ -83,83 +83,94 @@
<Row android:keyboardMode="@+id/mode_normal" android:rowEdgeFlags="bottom">
<Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
- android:keyWidth="20%p" android:keyEdgeFlags="left"/>
- <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_bkeyboard_globe"
+ android:keyWidth="15%p" android:keyEdgeFlags="left"/>
+ <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings"
+ android:iconPreview="@drawable/sym_keyboard_feedback_settings"
+ android:keyWidth="10%p"/>
+ <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_bkeyboard_mic"
+ android:iconPreview="@drawable/sym_keyboard_feedback_mic"
android:keyWidth="10%p"/>
<Key android:codes="32" android:keyIcon="@drawable/sym_bkeyboard_space"
android:iconPreview="@drawable/sym_keyboard_feedback_space"
- android:keyWidth="40%p" android:isRepeatable="true"/>
+ android:keyWidth="30%p" android:isRepeatable="true"/>
<Key android:codes="46" android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"
android:keyWidth="10%p"/>
<Key android:codes="10" android:keyIcon="@drawable/sym_bkeyboard_return"
android:iconPreview="@drawable/sym_keyboard_feedback_return"
- android:keyWidth="20%p" android:keyEdgeFlags="right"/>
+ android:keyWidth="25%p" android:keyEdgeFlags="right"/>
</Row>
<Row android:keyboardMode="@+id/mode_url" android:rowEdgeFlags="bottom">
<Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
- android:keyWidth="20%p" android:keyEdgeFlags="left"/>
+ android:keyWidth="15%p" android:keyEdgeFlags="left"/>
+ <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings"
+ android:iconPreview="@drawable/sym_keyboard_feedback_settings"
+ android:keyWidth="10%p"/>
<Key android:keyLabel="/" android:keyWidth="10%p"/>
<Key android:codes="32" android:keyIcon="@drawable/sym_bkeyboard_space"
android:iconPreview="@drawable/sym_keyboard_feedback_space"
- android:keyWidth="40%p" android:isRepeatable="true"/>
- <!--Key android:keyLabel="@string/popular_domain_0"
- android:keyOutputText="@string/popular_domain_0"
- android:popupKeyboard="@xml/popup_domains"
- android:keyWidth="20%p"/-->
+ android:keyWidth="30%p" android:isRepeatable="true"/>
<Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"
android:keyWidth="10%p"/>
<Key android:codes="10" android:keyIcon="@drawable/sym_bkeyboard_return"
android:iconPreview="@drawable/sym_keyboard_feedback_return"
- android:keyWidth="20%p" android:keyEdgeFlags="right"/>
+ android:keyWidth="25%p" android:keyEdgeFlags="right"/>
</Row>
<Row android:keyboardMode="@+id/mode_email" android:rowEdgeFlags="bottom">
<Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
- android:keyWidth="20%p" android:keyEdgeFlags="left"/>
- <Key android:keyLabel="\@" android:keyWidth="10%p"/>
+ android:keyWidth="15%p" android:keyEdgeFlags="left"/>
+ <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings"
+ android:iconPreview="@drawable/sym_keyboard_feedback_settings"
+ android:keyWidth="10%p"/>
+ <Key android:keyLabel="\@"/>
<Key android:codes="32" android:keyIcon="@drawable/sym_bkeyboard_space"
android:iconPreview="@drawable/sym_keyboard_feedback_space"
- android:keyWidth="40%p" android:isRepeatable="true"/>
- <!--Key android:keyLabel="@string/popular_domain_0"
- android:keyOutputText="@string/popular_domain_0"
- android:popupKeyboard="@xml/popup_domains"
- android:keyWidth="20%p"/-->
+ android:keyWidth="30%p" android:isRepeatable="true"/>
<Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"/>
<Key android:codes="10" android:keyIcon="@drawable/sym_bkeyboard_return"
android:iconPreview="@drawable/sym_keyboard_feedback_return"
- android:keyWidth="20%p" android:keyEdgeFlags="right"/>
+ android:keyWidth="25%p" android:keyEdgeFlags="right"/>
</Row>
<Row android:keyboardMode="@+id/mode_im" android:rowEdgeFlags="bottom">
<Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
- android:keyWidth="20%p" android:keyEdgeFlags="left"/>
- <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_bkeyboard_globe"
+ android:keyWidth="15%p" android:keyEdgeFlags="left"/>
+ <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings"
+ android:iconPreview="@drawable/sym_keyboard_feedback_settings"
+ android:keyWidth="10%p"/>
+ <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_bkeyboard_mic"
+ android:iconPreview="@drawable/sym_keyboard_feedback_mic"
android:keyWidth="10%p"/>
<Key android:codes="32" android:keyIcon="@drawable/sym_bkeyboard_space"
android:iconPreview="@drawable/sym_keyboard_feedback_space"
- android:keyWidth="40%p" android:isRepeatable="true"/>
+ android:keyWidth="30%p" android:isRepeatable="true"/>
<Key android:codes="46" android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"
android:keyWidth="10%p"/>
<Key android:keyLabel=":-)" android:keyOutputText=":-) "
android:popupKeyboard="@xml/popup_smileys"
- android:keyWidth="20%p" android:keyEdgeFlags="right"/>
+ android:keyWidth="25%p" android:keyEdgeFlags="right"/>
</Row>
<Row android:keyboardMode="@+id/mode_webentry" android:rowEdgeFlags="bottom">
<Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
- android:keyWidth="20%p" android:keyEdgeFlags="left"/>
- <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_bkeyboard_globe"
+ android:keyWidth="10%p" android:keyEdgeFlags="left"/>
+ <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings"
+ android:iconPreview="@drawable/sym_keyboard_feedback_settings"
+ android:keyWidth="10%p"/>
+ <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_bkeyboard_mic"
+ android:iconPreview="@drawable/sym_keyboard_feedback_mic"
android:keyWidth="10%p"/>
<Key android:codes="32" android:keyIcon="@drawable/sym_bkeyboard_space"
android:iconPreview="@drawable/sym_keyboard_feedback_space"
android:keyWidth="20%p" android:isRepeatable="true"/>
<Key android:codes="9" android:keyIcon="@drawable/sym_bkeyboard_tab"
android:iconPreview="@drawable/sym_keyboard_feedback_tab"
- android:keyWidth="20%p"/>
- <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"/>
+ android:keyWidth="15%p"/>
+ <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"
+ android:keyWidth="10%p"/>
<Key android:codes="10" android:keyIcon="@drawable/sym_bkeyboard_return"
android:iconPreview="@drawable/sym_keyboard_feedback_return"
- android:keyWidth="20%p" android:keyEdgeFlags="right"/>
+ android:keyWidth="15%p" android:keyEdgeFlags="right"/>
</Row>
</Keyboard>
diff --git a/java/res/xml-sr/kbd_qwerty.xml b/java/res/xml-sr/kbd_qwerty.xml
index 117db4c540d11f62e63c716657d3297e8a0745dd..cab846004598c015bf67ec2f796c8fb54e4f4f46 100644
--- a/java/res/xml-sr/kbd_qwerty.xml
+++ b/java/res/xml-sr/kbd_qwerty.xml
@@ -74,88 +74,99 @@
<Key android:codes="-5" android:keyIcon="@drawable/sym_keyboard_delete"
android:keyWidth="11.75%p" android:keyEdgeFlags="right"
android:iconPreview="@drawable/sym_keyboard_feedback_delete"
- android:isRepeatable="true"/>
+ android:isRepeatable="true" android:isModifier="true"/>
</Row>
<Row android:keyboardMode="@+id/mode_normal" android:rowEdgeFlags="bottom">
<Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
- android:keyWidth="20%p" android:keyEdgeFlags="left"/>
- <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_keyboard_globe"
- android:keyWidth="10%p"/>
+ android:keyWidth="15%p" android:keyEdgeFlags="left" android:isModifier="true"/>
+ <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings"
+ android:iconPreview="@drawable/sym_keyboard_feedback_settings"
+ android:keyWidth="10%p" android:isModifier="true"/>
+ <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_keyboard_mic"
+ android:iconPreview="@drawable/sym_keyboard_feedback_mic"
+ android:keyWidth="10%p" android:isModifier="true"/>
<Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space"
android:iconPreview="@drawable/sym_keyboard_feedback_space"
- android:keyWidth="40%p" android:isRepeatable="true"/>
+ android:keyWidth="30%p" android:isRepeatable="true" android:isModifier="true"/>
<Key android:codes="46" android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"
- android:keyWidth="10%p"/>
+ android:keyWidth="10%p" android:isModifier="true"/>
<Key android:codes="10" android:keyIcon="@drawable/sym_keyboard_return"
android:iconPreview="@drawable/sym_keyboard_feedback_return"
- android:keyWidth="20%p" android:keyEdgeFlags="right"/>
+ android:keyWidth="25%p" android:keyEdgeFlags="right" android:isModifier="true"/>
</Row>
<Row android:keyboardMode="@+id/mode_url" android:rowEdgeFlags="bottom">
<Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
- android:keyWidth="20%p" android:keyEdgeFlags="left"/>
+ android:keyWidth="15%p" android:keyEdgeFlags="left" android:isModifier="true"/>
+ <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings"
+ android:iconPreview="@drawable/sym_keyboard_feedback_settings"
+ android:keyWidth="10%p" android:isModifier="true"/>
<Key android:keyLabel="/" android:keyWidth="10%p"/>
<Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space"
android:iconPreview="@drawable/sym_keyboard_feedback_space"
- android:keyWidth="20%p" android:isRepeatable="true"/>
- <Key android:keyLabel="@string/popular_domain_0"
- android:keyOutputText="@string/popular_domain_0"
- android:popupKeyboard="@xml/popup_domains"
- android:keyWidth="20%p"/>
+ android:keyWidth="30%p" android:isRepeatable="true" android:isModifier="true"/>
<Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"
- android:keyWidth="10%p"/>
+ android:keyWidth="10%p" android:isModifier="true"/>
<Key android:codes="10" android:keyIcon="@drawable/sym_keyboard_return"
android:iconPreview="@drawable/sym_keyboard_feedback_return"
- android:keyWidth="20%p" android:keyEdgeFlags="right"/>
+ android:keyWidth="25%p" android:keyEdgeFlags="right" android:isModifier="true"/>
</Row>
<Row android:keyboardMode="@+id/mode_email" android:rowEdgeFlags="bottom">
<Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
- android:keyWidth="20%p" android:keyEdgeFlags="left"/>
- <Key android:keyLabel="\@" android:keyWidth="10%p"/>
+ android:keyWidth="15%p" android:keyEdgeFlags="left" android:isModifier="true"/>
+ <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings"
+ android:iconPreview="@drawable/sym_keyboard_feedback_settings"
+ android:keyWidth="10%p" android:isModifier="true"/>
+ <Key android:keyLabel="\@"/>
<Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space"
android:iconPreview="@drawable/sym_keyboard_feedback_space"
- android:keyWidth="20%p" android:isRepeatable="true"/>
- <Key android:keyLabel="@string/popular_domain_0"
- android:keyOutputText="@string/popular_domain_0"
- android:popupKeyboard="@xml/popup_domains"
- android:keyWidth="20%p"/>
+ android:keyWidth="30%p" android:isRepeatable="true" android:isModifier="true"/>
<Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"/>
<Key android:codes="10" android:keyIcon="@drawable/sym_keyboard_return"
android:iconPreview="@drawable/sym_keyboard_feedback_return"
- android:keyWidth="20%p" android:keyEdgeFlags="right"/>
+ android:keyWidth="25%p" android:keyEdgeFlags="right" android:isModifier="true"/>
</Row>
<Row android:keyboardMode="@+id/mode_im" android:rowEdgeFlags="bottom">
<Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
- android:keyWidth="20%p" android:keyEdgeFlags="left"/>
- <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_keyboard_globe"
- android:keyWidth="10%p"/>
+ android:keyWidth="15%p" android:keyEdgeFlags="left" android:isModifier="true"/>
+ <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings"
+ android:iconPreview="@drawable/sym_keyboard_feedback_settings"
+ android:keyWidth="10%p" android:isModifier="true"/>
+ <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_keyboard_mic"
+ android:iconPreview="@drawable/sym_keyboard_feedback_mic"
+ android:keyWidth="10%p" android:isModifier="true"/>
<Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space"
android:iconPreview="@drawable/sym_keyboard_feedback_space"
- android:keyWidth="40%p" android:isRepeatable="true"/>
+ android:keyWidth="30%p" android:isRepeatable="true" android:isModifier="true"/>
<Key android:codes="46" android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"
- android:keyWidth="10%p"/>
+ android:keyWidth="10%p" android:isModifier="true"/>
<Key android:keyLabel=":-)" android:keyOutputText=":-) "
android:popupKeyboard="@xml/popup_smileys"
- android:keyWidth="20%p" android:keyEdgeFlags="right"/>
+ android:keyWidth="25%p" android:keyEdgeFlags="right" android:isModifier="true"/>
</Row>
<Row android:keyboardMode="@+id/mode_webentry" android:rowEdgeFlags="bottom">
<Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
- android:keyWidth="20%p" android:keyEdgeFlags="left"/>
- <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_keyboard_globe"
- android:keyWidth="10%p"/>
+ android:keyWidth="10%p" android:keyEdgeFlags="left" android:isModifier="true"/>
+ <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings"
+ android:iconPreview="@drawable/sym_keyboard_feedback_settings"
+ android:keyWidth="10%p" android:isModifier="true"/>
+ <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_keyboard_mic"
+ android:iconPreview="@drawable/sym_keyboard_feedback_mic"
+ android:keyWidth="10%p" android:isModifier="true"/>
<Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space"
android:iconPreview="@drawable/sym_keyboard_feedback_space"
- android:keyWidth="20%p" android:isRepeatable="true"/>
+ android:keyWidth="20%p" android:isRepeatable="true" android:isModifier="true"/>
<Key android:codes="9" android:keyIcon="@drawable/sym_keyboard_tab"
android:iconPreview="@drawable/sym_keyboard_feedback_tab"
- android:keyWidth="20%p"/>
- <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"/>
+ android:keyWidth="15%p" android:isModifier="true"/>
+ <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"
+ android:keyWidth="10%p" android:isModifier="true"/>
<Key android:codes="10" android:keyIcon="@drawable/sym_keyboard_return"
android:iconPreview="@drawable/sym_keyboard_feedback_return"
- android:keyWidth="20%p" android:keyEdgeFlags="right"/>
+ android:keyWidth="15%p" android:keyEdgeFlags="right" android:isModifier="true"/>
</Row>
</Keyboard>
diff --git a/java/res/xml-sr/kbd_qwerty_black.xml b/java/res/xml-sr/kbd_qwerty_black.xml
index 91b118f276a594c6652e4004b512e04960e94ee5..00a28944999a4f83e71151f10b4db3f4b1d534c7 100644
--- a/java/res/xml-sr/kbd_qwerty_black.xml
+++ b/java/res/xml-sr/kbd_qwerty_black.xml
@@ -79,83 +79,94 @@
<Row android:keyboardMode="@+id/mode_normal" android:rowEdgeFlags="bottom">
<Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
- android:keyWidth="20%p" android:keyEdgeFlags="left"/>
- <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_bkeyboard_globe"
+ android:keyWidth="15%p" android:keyEdgeFlags="left"/>
+ <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings"
+ android:iconPreview="@drawable/sym_keyboard_feedback_settings"
+ android:keyWidth="10%p"/>
+ <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_bkeyboard_mic"
+ android:iconPreview="@drawable/sym_keyboard_feedback_mic"
android:keyWidth="10%p"/>
<Key android:codes="32" android:keyIcon="@drawable/sym_bkeyboard_space"
android:iconPreview="@drawable/sym_keyboard_feedback_space"
- android:keyWidth="40%p" android:isRepeatable="true"/>
+ android:keyWidth="30%p" android:isRepeatable="true"/>
<Key android:codes="46" android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"
android:keyWidth="10%p"/>
<Key android:codes="10" android:keyIcon="@drawable/sym_bkeyboard_return"
android:iconPreview="@drawable/sym_keyboard_feedback_return"
- android:keyWidth="20%p" android:keyEdgeFlags="right"/>
+ android:keyWidth="25%p" android:keyEdgeFlags="right"/>
</Row>
<Row android:keyboardMode="@+id/mode_url" android:rowEdgeFlags="bottom">
<Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
- android:keyWidth="20%p" android:keyEdgeFlags="left"/>
+ android:keyWidth="15%p" android:keyEdgeFlags="left"/>
+ <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings"
+ android:iconPreview="@drawable/sym_keyboard_feedback_settings"
+ android:keyWidth="10%p"/>
<Key android:keyLabel="/" android:keyWidth="10%p"/>
<Key android:codes="32" android:keyIcon="@drawable/sym_bkeyboard_space"
android:iconPreview="@drawable/sym_keyboard_feedback_space"
- android:keyWidth="20%p" android:isRepeatable="true"/>
- <Key android:keyLabel="@string/popular_domain_0"
- android:keyOutputText="@string/popular_domain_0"
- android:popupKeyboard="@xml/popup_domains"
- android:keyWidth="20%p"/>
+ android:keyWidth="30%p" android:isRepeatable="true"/>
<Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"
android:keyWidth="10%p"/>
<Key android:codes="10" android:keyIcon="@drawable/sym_bkeyboard_return"
android:iconPreview="@drawable/sym_keyboard_feedback_return"
- android:keyWidth="20%p" android:keyEdgeFlags="right"/>
+ android:keyWidth="25%p" android:keyEdgeFlags="right"/>
</Row>
<Row android:keyboardMode="@+id/mode_email" android:rowEdgeFlags="bottom">
<Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
- android:keyWidth="20%p" android:keyEdgeFlags="left"/>
- <Key android:keyLabel="\@" android:keyWidth="10%p"/>
+ android:keyWidth="15%p" android:keyEdgeFlags="left"/>
+ <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings"
+ android:iconPreview="@drawable/sym_keyboard_feedback_settings"
+ android:keyWidth="10%p"/>
+ <Key android:keyLabel="\@"/>
<Key android:codes="32" android:keyIcon="@drawable/sym_bkeyboard_space"
android:iconPreview="@drawable/sym_keyboard_feedback_space"
- android:keyWidth="20%p" android:isRepeatable="true"/>
- <Key android:keyLabel="@string/popular_domain_0"
- android:keyOutputText="@string/popular_domain_0"
- android:popupKeyboard="@xml/popup_domains"
- android:keyWidth="20%p"/>
+ android:keyWidth="30%p" android:isRepeatable="true"/>
<Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"/>
<Key android:codes="10" android:keyIcon="@drawable/sym_bkeyboard_return"
android:iconPreview="@drawable/sym_keyboard_feedback_return"
- android:keyWidth="20%p" android:keyEdgeFlags="right"/>
+ android:keyWidth="25%p" android:keyEdgeFlags="right"/>
</Row>
<Row android:keyboardMode="@+id/mode_im" android:rowEdgeFlags="bottom">
<Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
- android:keyWidth="20%p" android:keyEdgeFlags="left"/>
- <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_bkeyboard_globe"
+ android:keyWidth="15%p" android:keyEdgeFlags="left"/>
+ <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings"
+ android:iconPreview="@drawable/sym_keyboard_feedback_settings"
+ android:keyWidth="10%p"/>
+ <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_bkeyboard_mic"
+ android:iconPreview="@drawable/sym_keyboard_feedback_mic"
android:keyWidth="10%p"/>
<Key android:codes="32" android:keyIcon="@drawable/sym_bkeyboard_space"
android:iconPreview="@drawable/sym_keyboard_feedback_space"
- android:keyWidth="40%p" android:isRepeatable="true"/>
+ android:keyWidth="30%p" android:isRepeatable="true"/>
<Key android:codes="46" android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"
android:keyWidth="10%p"/>
<Key android:keyLabel=":-)" android:keyOutputText=":-) "
android:popupKeyboard="@xml/popup_smileys"
- android:keyWidth="20%p" android:keyEdgeFlags="right"/>
+ android:keyWidth="25%p" android:keyEdgeFlags="right"/>
</Row>
<Row android:keyboardMode="@+id/mode_webentry" android:rowEdgeFlags="bottom">
<Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
- android:keyWidth="20%p" android:keyEdgeFlags="left"/>
- <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_bkeyboard_globe"
+ android:keyWidth="10%p" android:keyEdgeFlags="left"/>
+ <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings"
+ android:iconPreview="@drawable/sym_keyboard_feedback_settings"
+ android:keyWidth="10%p"/>
+ <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_bkeyboard_mic"
+ android:iconPreview="@drawable/sym_keyboard_feedback_mic"
android:keyWidth="10%p"/>
<Key android:codes="32" android:keyIcon="@drawable/sym_bkeyboard_space"
android:iconPreview="@drawable/sym_keyboard_feedback_space"
android:keyWidth="20%p" android:isRepeatable="true"/>
<Key android:codes="9" android:keyIcon="@drawable/sym_bkeyboard_tab"
android:iconPreview="@drawable/sym_keyboard_feedback_tab"
- android:keyWidth="20%p"/>
- <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"/>
+ android:keyWidth="15%p"/>
+ <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"
+ android:keyWidth="10%p"/>
<Key android:codes="10" android:keyIcon="@drawable/sym_bkeyboard_return"
android:iconPreview="@drawable/sym_keyboard_feedback_return"
- android:keyWidth="20%p" android:keyEdgeFlags="right"/>
+ android:keyWidth="15%p" android:keyEdgeFlags="right"/>
</Row>
</Keyboard>
diff --git a/java/res/xml-sv/kbd_qwerty.xml b/java/res/xml-sv/kbd_qwerty.xml
index 1ffa9dd1c6897565bfd07ff8c12de733e0ea1c11..514a441549c9ffbcc6e933ed32151491579e5167 100644
--- a/java/res/xml-sv/kbd_qwerty.xml
+++ b/java/res/xml-sv/kbd_qwerty.xml
@@ -119,87 +119,94 @@
<Row android:keyboardMode="@+id/mode_normal" android:rowEdgeFlags="bottom">
<Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
- android:keyWidth="20%p" android:keyEdgeFlags="left"/>
+ android:keyWidth="15%p" android:keyEdgeFlags="left" android:isModifier="true"/>
+ <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings"
+ android:iconPreview="@drawable/sym_keyboard_feedback_settings"
+ android:keyWidth="10%p" android:isModifier="true"/>
<Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_keyboard_mic"
android:iconPreview="@drawable/sym_keyboard_feedback_mic"
- android:keyWidth="10%p"/>
+ android:keyWidth="10%p" android:isModifier="true"/>
<Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space"
android:iconPreview="@drawable/sym_keyboard_feedback_space"
- android:keyWidth="40%p" android:isRepeatable="true"/>
+ android:keyWidth="30%p" android:isRepeatable="true" android:isModifier="true"/>
<Key android:codes="46" android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"
- android:keyWidth="10%p"/>
+ android:keyWidth="10%p" android:isModifier="true"/>
<Key android:codes="10" android:keyIcon="@drawable/sym_keyboard_return"
android:iconPreview="@drawable/sym_keyboard_feedback_return"
- android:keyWidth="20%p" android:keyEdgeFlags="right"/>
+ android:keyWidth="25%p" android:keyEdgeFlags="right" android:isModifier="true"/>
</Row>
<Row android:keyboardMode="@+id/mode_url" android:rowEdgeFlags="bottom">
<Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
- android:keyWidth="20%p" android:keyEdgeFlags="left"/>
+ android:keyWidth="15%p" android:keyEdgeFlags="left" android:isModifier="true"/>
+ <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings"
+ android:iconPreview="@drawable/sym_keyboard_feedback_settings"
+ android:keyWidth="10%p" android:isModifier="true"/>
<Key android:keyLabel="/" android:keyWidth="10%p"/>
<Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space"
android:iconPreview="@drawable/sym_keyboard_feedback_space"
- android:keyWidth="40%p" android:isRepeatable="true"/>
- <!--Key android:keyLabel="@string/popular_domain_0"
- android:keyOutputText="@string/popular_domain_0"
- android:popupKeyboard="@xml/popup_domains"
- android:keyWidth="20%p"/-->
+ android:keyWidth="30%p" android:isRepeatable="true" android:isModifier="true"/>
<Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"
- android:keyWidth="10%p"/>
+ android:keyWidth="10%p" android:isModifier="true"/>
<Key android:codes="10" android:keyIcon="@drawable/sym_keyboard_return"
android:iconPreview="@drawable/sym_keyboard_feedback_return"
- android:keyWidth="20%p" android:keyEdgeFlags="right"/>
+ android:keyWidth="25%p" android:keyEdgeFlags="right" android:isModifier="true"/>
</Row>
<Row android:keyboardMode="@+id/mode_email" android:rowEdgeFlags="bottom">
<Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
- android:keyWidth="20%p" android:keyEdgeFlags="left"/>
+ android:keyWidth="15%p" android:keyEdgeFlags="left" android:isModifier="true"/>
+ <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings"
+ android:iconPreview="@drawable/sym_keyboard_feedback_settings"
+ android:keyWidth="10%p" android:isModifier="true"/>
<Key android:keyLabel="\@"/>
<Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space"
android:iconPreview="@drawable/sym_keyboard_feedback_space"
- android:keyWidth="40%p" android:isRepeatable="true"/>
- <!--Key android:keyLabel="@string/popular_domain_0"
- android:keyOutputText="@string/popular_domain_0"
- android:popupKeyboard="@xml/popup_domains"
- android:keyWidth="20%p"/-->
+ android:keyWidth="30%p" android:isRepeatable="true" android:isModifier="true"/>
<Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"/>
<Key android:codes="10" android:keyIcon="@drawable/sym_keyboard_return"
android:iconPreview="@drawable/sym_keyboard_feedback_return"
- android:keyWidth="20%p" android:keyEdgeFlags="right"/>
+ android:keyWidth="25%p" android:keyEdgeFlags="right" android:isModifier="true"/>
</Row>
<Row android:keyboardMode="@+id/mode_im" android:rowEdgeFlags="bottom">
<Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
- android:keyWidth="20%p" android:keyEdgeFlags="left"/>
+ android:keyWidth="15%p" android:keyEdgeFlags="left" android:isModifier="true"/>
+ <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings"
+ android:iconPreview="@drawable/sym_keyboard_feedback_settings"
+ android:keyWidth="10%p" android:isModifier="true"/>
<Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_keyboard_mic"
android:iconPreview="@drawable/sym_keyboard_feedback_mic"
- android:keyWidth="10%p"/>
+ android:keyWidth="10%p" android:isModifier="true"/>
<Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space"
android:iconPreview="@drawable/sym_keyboard_feedback_space"
- android:keyWidth="40%p" android:isRepeatable="true"/>
+ android:keyWidth="30%p" android:isRepeatable="true" android:isModifier="true"/>
<Key android:codes="46" android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"
- android:keyWidth="10%p"/>
+ android:keyWidth="10%p" android:isModifier="true"/>
<Key android:keyLabel=":-)" android:keyOutputText=":-) "
android:popupKeyboard="@xml/popup_smileys"
- android:keyWidth="20%p" android:keyEdgeFlags="right"/>
+ android:keyWidth="25%p" android:keyEdgeFlags="right" android:isModifier="true"/>
</Row>
<Row android:keyboardMode="@+id/mode_webentry" android:rowEdgeFlags="bottom">
<Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
- android:keyWidth="20%p" android:keyEdgeFlags="left"/>
+ android:keyWidth="10%p" android:keyEdgeFlags="left" android:isModifier="true"/>
+ <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings"
+ android:iconPreview="@drawable/sym_keyboard_feedback_settings"
+ android:keyWidth="10%p" android:isModifier="true"/>
<Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_keyboard_mic"
android:iconPreview="@drawable/sym_keyboard_feedback_mic"
- android:keyWidth="10%p"/>
+ android:keyWidth="10%p" android:isModifier="true"/>
<Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space"
android:iconPreview="@drawable/sym_keyboard_feedback_space"
- android:keyWidth="20%p" android:isRepeatable="true"/>
+ android:keyWidth="20%p" android:isRepeatable="true" android:isModifier="true"/>
<Key android:codes="9" android:keyIcon="@drawable/sym_keyboard_tab"
android:iconPreview="@drawable/sym_keyboard_feedback_tab"
- android:keyWidth="20%p"/>
- <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"/>
+ android:keyWidth="15%p" android:isModifier="true"/>
+ <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"
+ android:keyWidth="10%p" android:isModifier="true"/>
<Key android:codes="10" android:keyIcon="@drawable/sym_keyboard_return"
android:iconPreview="@drawable/sym_keyboard_feedback_return"
- android:keyWidth="20%p" android:keyEdgeFlags="right"/>
+ android:keyWidth="15%p" android:keyEdgeFlags="right" android:isModifier="true"/>
</Row>
-
</Keyboard>
diff --git a/java/res/xml-sv/kbd_qwerty_black.xml b/java/res/xml-sv/kbd_qwerty_black.xml
index af8cda60ed0dcb39b8d87fd823de2fa1dac52267..4cc37cec8d3d99f8ddce912b518bd94cb2c181a2 100644
--- a/java/res/xml-sv/kbd_qwerty_black.xml
+++ b/java/res/xml-sv/kbd_qwerty_black.xml
@@ -119,74 +119,81 @@
<Row android:keyboardMode="@+id/mode_normal" android:rowEdgeFlags="bottom">
<Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
- android:keyWidth="20%p" android:keyEdgeFlags="left"/>
+ android:keyWidth="15%p" android:keyEdgeFlags="left"/>
+ <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings"
+ android:iconPreview="@drawable/sym_keyboard_feedback_settings"
+ android:keyWidth="10%p"/>
<Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_bkeyboard_mic"
android:iconPreview="@drawable/sym_keyboard_feedback_mic"
android:keyWidth="10%p"/>
<Key android:codes="32" android:keyIcon="@drawable/sym_bkeyboard_space"
android:iconPreview="@drawable/sym_keyboard_feedback_space"
- android:keyWidth="40%p" android:isRepeatable="true"/>
+ android:keyWidth="30%p" android:isRepeatable="true"/>
<Key android:codes="46" android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"
android:keyWidth="10%p"/>
<Key android:codes="10" android:keyIcon="@drawable/sym_bkeyboard_return"
android:iconPreview="@drawable/sym_keyboard_feedback_return"
- android:keyWidth="20%p" android:keyEdgeFlags="right"/>
+ android:keyWidth="25%p" android:keyEdgeFlags="right"/>
</Row>
<Row android:keyboardMode="@+id/mode_url" android:rowEdgeFlags="bottom">
<Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
- android:keyWidth="20%p" android:keyEdgeFlags="left"/>
+ android:keyWidth="15%p" android:keyEdgeFlags="left"/>
+ <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings"
+ android:iconPreview="@drawable/sym_keyboard_feedback_settings"
+ android:keyWidth="10%p"/>
<Key android:keyLabel="/" android:keyWidth="10%p"/>
<Key android:codes="32" android:keyIcon="@drawable/sym_bkeyboard_space"
android:iconPreview="@drawable/sym_keyboard_feedback_space"
- android:keyWidth="40%p" android:isRepeatable="true"/>
- <!--Key android:keyLabel="@string/popular_domain_0"
- android:keyOutputText="@string/popular_domain_0"
- android:popupKeyboard="@xml/popup_domains"
- android:keyWidth="20%p"/-->
+ android:keyWidth="30%p" android:isRepeatable="true"/>
<Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"
android:keyWidth="10%p"/>
<Key android:codes="10" android:keyIcon="@drawable/sym_bkeyboard_return"
android:iconPreview="@drawable/sym_keyboard_feedback_return"
- android:keyWidth="20%p" android:keyEdgeFlags="right"/>
+ android:keyWidth="25%p" android:keyEdgeFlags="right"/>
</Row>
<Row android:keyboardMode="@+id/mode_email" android:rowEdgeFlags="bottom">
<Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
- android:keyWidth="20%p" android:keyEdgeFlags="left"/>
+ android:keyWidth="15%p" android:keyEdgeFlags="left"/>
+ <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings"
+ android:iconPreview="@drawable/sym_keyboard_feedback_settings"
+ android:keyWidth="10%p"/>
<Key android:keyLabel="\@"/>
<Key android:codes="32" android:keyIcon="@drawable/sym_bkeyboard_space"
android:iconPreview="@drawable/sym_keyboard_feedback_space"
- android:keyWidth="40%p" android:isRepeatable="true"/>
- <!--Key android:keyLabel="@string/popular_domain_0"
- android:keyOutputText="@string/popular_domain_0"
- android:popupKeyboard="@xml/popup_domains"
- android:keyWidth="20%p"/-->
+ android:keyWidth="30%p" android:isRepeatable="true"/>
<Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"/>
<Key android:codes="10" android:keyIcon="@drawable/sym_bkeyboard_return"
android:iconPreview="@drawable/sym_keyboard_feedback_return"
- android:keyWidth="20%p" android:keyEdgeFlags="right"/>
+ android:keyWidth="25%p" android:keyEdgeFlags="right"/>
</Row>
<Row android:keyboardMode="@+id/mode_im" android:rowEdgeFlags="bottom">
<Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
- android:keyWidth="20%p" android:keyEdgeFlags="left"/>
+ android:keyWidth="15%p" android:keyEdgeFlags="left"/>
+ <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings"
+ android:iconPreview="@drawable/sym_keyboard_feedback_settings"
+ android:keyWidth="10%p"/>
<Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_bkeyboard_mic"
android:iconPreview="@drawable/sym_keyboard_feedback_mic"
android:keyWidth="10%p"/>
<Key android:codes="32" android:keyIcon="@drawable/sym_bkeyboard_space"
android:iconPreview="@drawable/sym_keyboard_feedback_space"
- android:keyWidth="40%p" android:isRepeatable="true"/>
+ android:keyWidth="30%p" android:isRepeatable="true"/>
<Key android:codes="46" android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"
android:keyWidth="10%p"/>
<Key android:keyLabel=":-)" android:keyOutputText=":-) "
android:popupKeyboard="@xml/popup_smileys"
- android:keyWidth="20%p" android:keyEdgeFlags="right"/>
+ android:keyWidth="25%p" android:keyEdgeFlags="right"/>
</Row>
<Row android:keyboardMode="@+id/mode_webentry" android:rowEdgeFlags="bottom">
<Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
- android:keyWidth="20%p" android:keyEdgeFlags="left"/>
+ android:keyWidth="10%p" android:keyEdgeFlags="left"/>
+ <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings"
+ android:iconPreview="@drawable/sym_keyboard_feedback_settings"
+ android:keyWidth="10%p"/>
<Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_bkeyboard_mic"
android:iconPreview="@drawable/sym_keyboard_feedback_mic"
android:keyWidth="10%p"/>
@@ -195,11 +202,11 @@
android:keyWidth="20%p" android:isRepeatable="true"/>
<Key android:codes="9" android:keyIcon="@drawable/sym_bkeyboard_tab"
android:iconPreview="@drawable/sym_keyboard_feedback_tab"
- android:keyWidth="20%p"/>
- <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"/>
+ android:keyWidth="15%p"/>
+ <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"
+ android:keyWidth="10%p"/>
<Key android:codes="10" android:keyIcon="@drawable/sym_bkeyboard_return"
android:iconPreview="@drawable/sym_keyboard_feedback_return"
- android:keyWidth="20%p" android:keyEdgeFlags="right"/>
+ android:keyWidth="15%p" android:keyEdgeFlags="right"/>
</Row>
-
</Keyboard>
diff --git a/java/res/xml/kbd_qwerty.xml b/java/res/xml/kbd_qwerty.xml
index d7d1ee0d5d1031a385ac6e857f60e3ecb771ca1d..0a0691dd1b54ec67f59aba772d136589a243f988 100755
--- a/java/res/xml/kbd_qwerty.xml
+++ b/java/res/xml/kbd_qwerty.xml
@@ -4,16 +4,16 @@
**
** Copyright 2008, The Android Open Source Project
**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
+** 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
+** 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
+** 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.
*/
-->
@@ -59,9 +59,9 @@
/>
<Key android:codes="112" android:keyLabel="p" android:keyEdgeFlags="right"/>
</Row>
-
+
<Row>
- <Key android:codes="97" android:keyLabel="a" android:horizontalGap="5%p"
+ <Key android:codes="97" android:keyLabel="a" android:horizontalGap="5%p"
android:popupKeyboard="@xml/kbd_popup_template"
android:popupCharacters="@string/alternates_for_a"
android:keyEdgeFlags="left"/>
@@ -85,9 +85,9 @@
android:popupCharacters="@string/alternates_for_l"
android:keyEdgeFlags="right"/>
</Row>
-
+
<Row>
- <Key android:codes="-1" android:keyIcon="@drawable/sym_keyboard_shift"
+ <Key android:codes="-1" android:keyIcon="@drawable/sym_keyboard_shift"
android:keyWidth="15%p" android:isModifier="true"
android:iconPreview="@drawable/sym_keyboard_feedback_shift"
android:isSticky="true" android:keyEdgeFlags="left"/>
@@ -113,7 +113,7 @@
</Row>
<Row android:keyboardMode="@+id/mode_normal" android:rowEdgeFlags="bottom">
- <Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
+ <Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
android:keyWidth="15%p" android:keyEdgeFlags="left" android:isModifier="true"/>
<Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings"
android:iconPreview="@drawable/sym_keyboard_feedback_settings"
@@ -124,7 +124,7 @@
<Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space"
android:iconPreview="@drawable/sym_keyboard_feedback_space"
android:keyWidth="30%p" android:isRepeatable="true" android:isModifier="true"/>
- <Key android:codes="46" android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"
+ <Key android:codes="46" android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"
android:keyWidth="10%p" android:isModifier="true"/>
<Key android:codes="10" android:keyIcon="@drawable/sym_keyboard_return"
android:iconPreview="@drawable/sym_keyboard_feedback_return"
@@ -176,11 +176,11 @@
<Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space"
android:iconPreview="@drawable/sym_keyboard_feedback_space"
android:keyWidth="30%p" android:isRepeatable="true" android:isModifier="true"/>
- <Key android:codes="46" android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"
+ <Key android:codes="46" android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"
android:keyWidth="10%p" android:isModifier="true"/>
<Key android:keyLabel=":-)" android:keyOutputText=":-) "
android:popupKeyboard="@xml/popup_smileys"
- android:keyWidth="25%p" android:keyEdgeFlags="right"/>
+ android:keyWidth="25%p" android:keyEdgeFlags="right" android:isModifier="true"/>
</Row>
<Row android:keyboardMode="@+id/mode_webentry" android:rowEdgeFlags="bottom">