diff --git a/java/res/values/keycodes.xml b/java/res/values/keycodes.xml
index 9dded508a5cbc657280b70b6bc1b984572834da3..c5d5b3cd1fb3d3076b4d5f9fe437a00112be1ea2 100644
--- a/java/res/values/keycodes.xml
+++ b/java/res/values/keycodes.xml
@@ -27,5 +27,6 @@
<integer name="key_delete">-5</integer>
<!-- Keycode for F1 (function) key. This one switches between language switch & comma/.com -->
<integer name="key_settings">-100</integer>
+ <integer name="key_voice">-102</integer>
<integer name="key_f1">-103</integer>
</resources>
diff --git a/java/res/xml-da/kbd_qwerty.xml b/java/res/xml-da/kbd_qwerty.xml
index a17d604bfe6e51f78fdbf958c2f5f9f4844b94cd..084795463eb7b2485710bf02f7807d88594172b5 100644
--- a/java/res/xml-da/kbd_qwerty.xml
+++ b/java/res/xml-da/kbd_qwerty.xml
@@ -176,8 +176,6 @@
android:keyEdgeFlags="left" />
<Key
android:codes="@integer/key_f1"
- android:keyIcon="@drawable/sym_keyboard_mic"
- android:iconPreview="@drawable/sym_keyboard_feedback_mic"
android:isModifier="true" />
<Key
android:codes="@integer/key_space"
@@ -274,8 +272,6 @@
android:keyEdgeFlags="left" />
<Key
android:codes="@integer/key_f1"
- android:keyIcon="@drawable/sym_keyboard_mic"
- android:iconPreview="@drawable/sym_keyboard_feedback_mic"
android:isModifier="true" />
<Key
android:codes="@integer/key_space"
@@ -308,8 +304,6 @@
android:keyEdgeFlags="left" />
<Key
android:codes="@integer/key_f1"
- android:keyIcon="@drawable/sym_keyboard_mic"
- android:iconPreview="@drawable/sym_keyboard_feedback_mic"
android:isModifier="true" />
<Key
android:codes="@integer/key_space"
@@ -353,8 +347,6 @@
android:isModifier="true" />
<Key
android:codes="@integer/key_f1"
- android:keyIcon="@drawable/sym_keyboard_mic"
- android:iconPreview="@drawable/sym_keyboard_feedback_mic"
android:isModifier="true" />
<Key
android:codes="@integer/key_space"
@@ -466,8 +458,6 @@
android:isModifier="true" />
<Key
android:codes="@integer/key_f1"
- android:keyIcon="@drawable/sym_keyboard_mic"
- android:iconPreview="@drawable/sym_keyboard_feedback_mic"
android:isModifier="true" />
<Key
android:codes="@integer/key_space"
@@ -505,8 +495,6 @@
android:isModifier="true" />
<Key
android:codes="@integer/key_f1"
- android:keyIcon="@drawable/sym_keyboard_mic"
- android:iconPreview="@drawable/sym_keyboard_feedback_mic"
android:isModifier="true" />
<Key
android:codes="@integer/key_space"
diff --git a/java/res/xml-da/kbd_qwerty_black.xml b/java/res/xml-da/kbd_qwerty_black.xml
index bab7db5d33009e7c04e4fd4ce0d922aeb5056e30..9a64e869d550f156aaf06fa391aa9fa14fed2f1c 100644
--- a/java/res/xml-da/kbd_qwerty_black.xml
+++ b/java/res/xml-da/kbd_qwerty_black.xml
@@ -173,9 +173,7 @@
android:keyWidth="20%p"
android:keyEdgeFlags="left" />
<Key
- android:codes="@integer/key_f1"
- android:keyIcon="@drawable/sym_bkeyboard_mic"
- android:iconPreview="@drawable/sym_keyboard_feedback_mic" />
+ android:codes="@integer/key_f1" />
<Key
android:codes="@integer/key_space"
android:keyIcon="@drawable/sym_bkeyboard_space"
@@ -256,9 +254,7 @@
android:keyWidth="20%p"
android:keyEdgeFlags="left" />
<Key
- android:codes="@integer/key_f1"
- android:keyIcon="@drawable/sym_bkeyboard_mic"
- android:iconPreview="@drawable/sym_keyboard_feedback_mic" />
+ android:codes="@integer/key_f1" />
<Key
android:codes="@integer/key_space"
android:keyIcon="@drawable/sym_bkeyboard_space"
@@ -285,9 +281,7 @@
android:keyWidth="20%p"
android:keyEdgeFlags="left" />
<Key
- android:codes="@integer/key_f1"
- android:keyIcon="@drawable/sym_bkeyboard_mic"
- android:iconPreview="@drawable/sym_keyboard_feedback_mic" />
+ android:codes="@integer/key_f1" />
<Key
android:codes="@integer/key_space"
android:keyIcon="@drawable/sym_bkeyboard_space"
@@ -323,9 +317,7 @@
android:keyIcon="@drawable/sym_bkeyboard_settings"
android:iconPreview="@drawable/sym_keyboard_feedback_settings" />
<Key
- android:codes="@integer/key_f1"
- android:keyIcon="@drawable/sym_bkeyboard_mic"
- android:iconPreview="@drawable/sym_keyboard_feedback_mic" />
+ android:codes="@integer/key_f1" />
<Key
android:codes="@integer/key_space"
android:keyIcon="@drawable/sym_bkeyboard_space"
@@ -418,9 +410,7 @@
android:keyIcon="@drawable/sym_bkeyboard_settings"
android:iconPreview="@drawable/sym_keyboard_feedback_settings" />
<Key
- android:codes="@integer/key_f1"
- android:keyIcon="@drawable/sym_bkeyboard_mic"
- android:iconPreview="@drawable/sym_keyboard_feedback_mic" />
+ android:codes="@integer/key_f1" />
<Key
android:codes="@integer/key_space"
android:keyIcon="@drawable/sym_bkeyboard_space"
@@ -451,9 +441,7 @@
android:keyIcon="@drawable/sym_bkeyboard_settings"
android:iconPreview="@drawable/sym_keyboard_feedback_settings" />
<Key
- android:codes="@integer/key_f1"
- android:keyIcon="@drawable/sym_bkeyboard_mic"
- android:iconPreview="@drawable/sym_keyboard_feedback_mic" />
+ android:codes="@integer/key_f1" />
<Key
android:codes="@integer/key_space"
android:keyIcon="@drawable/sym_bkeyboard_space"
diff --git a/java/res/xml-de/kbd_qwerty.xml b/java/res/xml-de/kbd_qwerty.xml
index 167f84c62df61f2e4e88efc118a0f2fab1a52676..b60c50dd6bf6abda54ac38e1f11d71e3c48c1dac 100644
--- a/java/res/xml-de/kbd_qwerty.xml
+++ b/java/res/xml-de/kbd_qwerty.xml
@@ -155,8 +155,6 @@
android:keyEdgeFlags="left" />
<Key
android:codes="@integer/key_f1"
- android:keyIcon="@drawable/sym_keyboard_mic"
- android:iconPreview="@drawable/sym_keyboard_feedback_mic"
android:isModifier="true" />
<Key
android:codes="@integer/key_space"
@@ -253,8 +251,6 @@
android:keyEdgeFlags="left" />
<Key
android:codes="@integer/key_f1"
- android:keyIcon="@drawable/sym_keyboard_mic"
- android:iconPreview="@drawable/sym_keyboard_feedback_mic"
android:isModifier="true" />
<Key
android:codes="@integer/key_space"
@@ -287,8 +283,6 @@
android:keyEdgeFlags="left" />
<Key
android:codes="@integer/key_f1"
- android:keyIcon="@drawable/sym_keyboard_mic"
- android:iconPreview="@drawable/sym_keyboard_feedback_mic"
android:isModifier="true" />
<Key
android:codes="@integer/key_space"
@@ -332,8 +326,6 @@
android:isModifier="true" />
<Key
android:codes="@integer/key_f1"
- android:keyIcon="@drawable/sym_keyboard_mic"
- android:iconPreview="@drawable/sym_keyboard_feedback_mic"
android:isModifier="true" />
<Key
android:codes="@integer/key_space"
@@ -445,8 +437,6 @@
android:isModifier="true" />
<Key
android:codes="@integer/key_f1"
- android:keyIcon="@drawable/sym_keyboard_mic"
- android:iconPreview="@drawable/sym_keyboard_feedback_mic"
android:isModifier="true" />
<Key
android:codes="@integer/key_space"
@@ -484,8 +474,6 @@
android:isModifier="true" />
<Key
android:codes="@integer/key_f1"
- android:keyIcon="@drawable/sym_keyboard_mic"
- android:iconPreview="@drawable/sym_keyboard_feedback_mic"
android:isModifier="true" />
<Key
android:codes="@integer/key_space"
diff --git a/java/res/xml-de/kbd_qwerty_black.xml b/java/res/xml-de/kbd_qwerty_black.xml
index 0ec39b9c85e5b9dca436079ff5b795926413c720..5cca5a62225114fa00e3386fad4b8b20fde8987b 100644
--- a/java/res/xml-de/kbd_qwerty_black.xml
+++ b/java/res/xml-de/kbd_qwerty_black.xml
@@ -152,9 +152,7 @@
android:keyWidth="20%p"
android:keyEdgeFlags="left" />
<Key
- android:codes="@integer/key_f1"
- android:keyIcon="@drawable/sym_bkeyboard_mic"
- android:iconPreview="@drawable/sym_keyboard_feedback_mic" />
+ android:codes="@integer/key_f1" />
<Key
android:codes="@integer/key_space"
android:keyIcon="@drawable/sym_bkeyboard_space"
@@ -235,9 +233,7 @@
android:keyWidth="20%p"
android:keyEdgeFlags="left" />
<Key
- android:codes="@integer/key_f1"
- android:keyIcon="@drawable/sym_bkeyboard_mic"
- android:iconPreview="@drawable/sym_keyboard_feedback_mic" />
+ android:codes="@integer/key_f1" />
<Key
android:codes="@integer/key_space"
android:keyIcon="@drawable/sym_bkeyboard_space"
@@ -264,9 +260,7 @@
android:keyWidth="20%p"
android:keyEdgeFlags="left" />
<Key
- android:codes="@integer/key_f1"
- android:keyIcon="@drawable/sym_bkeyboard_mic"
- android:iconPreview="@drawable/sym_keyboard_feedback_mic" />
+ android:codes="@integer/key_f1" />
<Key
android:codes="@integer/key_space"
android:keyIcon="@drawable/sym_bkeyboard_space"
@@ -302,9 +296,7 @@
android:keyIcon="@drawable/sym_bkeyboard_settings"
android:iconPreview="@drawable/sym_keyboard_feedback_settings" />
<Key
- android:codes="@integer/key_f1"
- android:keyIcon="@drawable/sym_bkeyboard_mic"
- android:iconPreview="@drawable/sym_keyboard_feedback_mic" />
+ android:codes="@integer/key_f1" />
<Key
android:codes="@integer/key_space"
android:keyIcon="@drawable/sym_bkeyboard_space"
@@ -397,9 +389,7 @@
android:keyIcon="@drawable/sym_bkeyboard_settings"
android:iconPreview="@drawable/sym_keyboard_feedback_settings" />
<Key
- android:codes="@integer/key_f1"
- android:keyIcon="@drawable/sym_bkeyboard_mic"
- android:iconPreview="@drawable/sym_keyboard_feedback_mic" />
+ android:codes="@integer/key_f1" />
<Key
android:codes="@integer/key_space"
android:keyIcon="@drawable/sym_bkeyboard_space"
@@ -430,9 +420,7 @@
android:keyIcon="@drawable/sym_bkeyboard_settings"
android:iconPreview="@drawable/sym_keyboard_feedback_settings" />
<Key
- android:codes="@integer/key_f1"
- android:keyIcon="@drawable/sym_bkeyboard_mic"
- android:iconPreview="@drawable/sym_keyboard_feedback_mic" />
+ android:codes="@integer/key_f1" />
<Key
android:codes="@integer/key_space"
android:keyIcon="@drawable/sym_bkeyboard_space"
diff --git a/java/res/xml-fr/kbd_qwerty.xml b/java/res/xml-fr/kbd_qwerty.xml
index a86ae1e1cd162cd62484a7120bc85bd7518a455c..ab78b37bb4761559d872d12d2b3ed6a6b4634505 100644
--- a/java/res/xml-fr/kbd_qwerty.xml
+++ b/java/res/xml-fr/kbd_qwerty.xml
@@ -156,8 +156,6 @@
android:keyEdgeFlags="left" />
<Key
android:codes="@integer/key_f1"
- android:keyIcon="@drawable/sym_keyboard_mic"
- android:iconPreview="@drawable/sym_keyboard_feedback_mic"
android:isModifier="true" />
<Key
android:codes="@integer/key_space"
@@ -254,8 +252,6 @@
android:keyEdgeFlags="left" />
<Key
android:codes="@integer/key_f1"
- android:keyIcon="@drawable/sym_keyboard_mic"
- android:iconPreview="@drawable/sym_keyboard_feedback_mic"
android:isModifier="true" />
<Key
android:codes="@integer/key_space"
@@ -288,8 +284,6 @@
android:keyEdgeFlags="left" />
<Key
android:codes="@integer/key_f1"
- android:keyIcon="@drawable/sym_keyboard_mic"
- android:iconPreview="@drawable/sym_keyboard_feedback_mic"
android:isModifier="true" />
<Key
android:codes="@integer/key_space"
@@ -333,8 +327,6 @@
android:isModifier="true" />
<Key
android:codes="@integer/key_f1"
- android:keyIcon="@drawable/sym_keyboard_mic"
- android:iconPreview="@drawable/sym_keyboard_feedback_mic"
android:isModifier="true" />
<Key
android:codes="@integer/key_space"
@@ -446,8 +438,6 @@
android:isModifier="true" />
<Key
android:codes="@integer/key_f1"
- android:keyIcon="@drawable/sym_keyboard_mic"
- android:iconPreview="@drawable/sym_keyboard_feedback_mic"
android:isModifier="true" />
<Key
android:codes="@integer/key_space"
@@ -485,8 +475,6 @@
android:isModifier="true" />
<Key
android:codes="@integer/key_f1"
- android:keyIcon="@drawable/sym_keyboard_mic"
- android:iconPreview="@drawable/sym_keyboard_feedback_mic"
android:isModifier="true" />
<Key
android:codes="@integer/key_space"
diff --git a/java/res/xml-fr/kbd_qwerty_black.xml b/java/res/xml-fr/kbd_qwerty_black.xml
index f01c3a811de892637d4c0bf28bc119cdc8443113..97b55dccd29b24e0862afbc44975981b9461c944 100644
--- a/java/res/xml-fr/kbd_qwerty_black.xml
+++ b/java/res/xml-fr/kbd_qwerty_black.xml
@@ -153,9 +153,7 @@
android:keyWidth="20%p"
android:keyEdgeFlags="left" />
<Key
- android:codes="@integer/key_f1"
- android:keyIcon="@drawable/sym_bkeyboard_mic"
- android:iconPreview="@drawable/sym_keyboard_feedback_mic" />
+ android:codes="@integer/key_f1" />
<Key
android:codes="@integer/key_space"
android:keyIcon="@drawable/sym_bkeyboard_space"
@@ -236,9 +234,7 @@
android:keyWidth="20%p"
android:keyEdgeFlags="left" />
<Key
- android:codes="@integer/key_f1"
- android:keyIcon="@drawable/sym_bkeyboard_mic"
- android:iconPreview="@drawable/sym_keyboard_feedback_mic" />
+ android:codes="@integer/key_f1" />
<Key
android:codes="@integer/key_space"
android:keyIcon="@drawable/sym_bkeyboard_space"
@@ -265,9 +261,7 @@
android:keyWidth="20%p"
android:keyEdgeFlags="left" />
<Key
- android:codes="@integer/key_f1"
- android:keyIcon="@drawable/sym_bkeyboard_mic"
- android:iconPreview="@drawable/sym_keyboard_feedback_mic" />
+ android:codes="@integer/key_f1" />
<Key
android:codes="@integer/key_space"
android:keyIcon="@drawable/sym_bkeyboard_space"
@@ -303,9 +297,7 @@
android:keyIcon="@drawable/sym_bkeyboard_settings"
android:iconPreview="@drawable/sym_keyboard_feedback_settings" />
<Key
- android:codes="@integer/key_f1"
- android:keyIcon="@drawable/sym_bkeyboard_mic"
- android:iconPreview="@drawable/sym_keyboard_feedback_mic" />
+ android:codes="@integer/key_f1" />
<Key
android:codes="@integer/key_space"
android:keyIcon="@drawable/sym_bkeyboard_space"
@@ -398,9 +390,7 @@
android:keyIcon="@drawable/sym_bkeyboard_settings"
android:iconPreview="@drawable/sym_keyboard_feedback_settings" />
<Key
- android:codes="@integer/key_f1"
- android:keyIcon="@drawable/sym_bkeyboard_mic"
- android:iconPreview="@drawable/sym_keyboard_feedback_mic" />
+ android:codes="@integer/key_f1" />
<Key
android:codes="@integer/key_space"
android:keyIcon="@drawable/sym_bkeyboard_space"
@@ -431,9 +421,7 @@
android:keyIcon="@drawable/sym_bkeyboard_settings"
android:iconPreview="@drawable/sym_keyboard_feedback_settings" />
<Key
- android:codes="@integer/key_f1"
- android:keyIcon="@drawable/sym_bkeyboard_mic"
- android:iconPreview="@drawable/sym_keyboard_feedback_mic" />
+ android:codes="@integer/key_f1" />
<Key
android:codes="@integer/key_space"
android:keyIcon="@drawable/sym_bkeyboard_space"
diff --git a/java/res/xml-iw/kbd_qwerty.xml b/java/res/xml-iw/kbd_qwerty.xml
index c0b1339768057178cf1ac69f284e2ce8ca219826..a48c849d07c4d876c27e3ba4c716ec9fa8620ad4 100644
--- a/java/res/xml-iw/kbd_qwerty.xml
+++ b/java/res/xml-iw/kbd_qwerty.xml
@@ -114,8 +114,6 @@
android:keyEdgeFlags="left" />
<Key
android:codes="@integer/key_f1"
- android:keyIcon="@drawable/sym_keyboard_mic"
- android:iconPreview="@drawable/sym_keyboard_feedback_mic"
android:isModifier="true" />
<Key
android:codes="@integer/key_space"
@@ -212,8 +210,6 @@
android:keyEdgeFlags="left" />
<Key
android:codes="@integer/key_f1"
- android:keyIcon="@drawable/sym_keyboard_mic"
- android:iconPreview="@drawable/sym_keyboard_feedback_mic"
android:isModifier="true" />
<Key
android:codes="@integer/key_space"
@@ -246,8 +242,6 @@
android:keyEdgeFlags="left" />
<Key
android:codes="@integer/key_f1"
- android:keyIcon="@drawable/sym_keyboard_mic"
- android:iconPreview="@drawable/sym_keyboard_feedback_mic"
android:isModifier="true" />
<Key
android:codes="@integer/key_space"
@@ -291,8 +285,6 @@
android:isModifier="true" />
<Key
android:codes="@integer/key_f1"
- android:keyIcon="@drawable/sym_keyboard_mic"
- android:iconPreview="@drawable/sym_keyboard_feedback_mic"
android:isModifier="true" />
<Key
android:codes="@integer/key_space"
@@ -404,8 +396,6 @@
android:isModifier="true" />
<Key
android:codes="@integer/key_f1"
- android:keyIcon="@drawable/sym_keyboard_mic"
- android:iconPreview="@drawable/sym_keyboard_feedback_mic"
android:isModifier="true" />
<Key
android:codes="@integer/key_space"
@@ -443,8 +433,6 @@
android:isModifier="true" />
<Key
android:codes="@integer/key_f1"
- android:keyIcon="@drawable/sym_keyboard_mic"
- android:iconPreview="@drawable/sym_keyboard_feedback_mic"
android:isModifier="true" />
<Key
android:codes="@integer/key_space"
diff --git a/java/res/xml-iw/kbd_qwerty_black.xml b/java/res/xml-iw/kbd_qwerty_black.xml
index b0ed519d29ab5bc05680d8a26a3a718731dc22ae..a72b036f40bcfdffe5c39ec596a5fefc5aabf2d1 100644
--- a/java/res/xml-iw/kbd_qwerty_black.xml
+++ b/java/res/xml-iw/kbd_qwerty_black.xml
@@ -111,9 +111,7 @@
android:keyWidth="20%p"
android:keyEdgeFlags="left" />
<Key
- android:codes="@integer/key_f1"
- android:keyIcon="@drawable/sym_bkeyboard_mic"
- android:iconPreview="@drawable/sym_keyboard_feedback_mic" />
+ android:codes="@integer/key_f1" />
<Key
android:codes="@integer/key_space"
android:keyIcon="@drawable/sym_bkeyboard_space"
@@ -194,9 +192,7 @@
android:keyWidth="20%p"
android:keyEdgeFlags="left" />
<Key
- android:codes="@integer/key_f1"
- android:keyIcon="@drawable/sym_bkeyboard_mic"
- android:iconPreview="@drawable/sym_keyboard_feedback_mic" />
+ android:codes="@integer/key_f1" />
<Key
android:codes="@integer/key_space"
android:keyIcon="@drawable/sym_bkeyboard_space"
@@ -223,9 +219,7 @@
android:keyWidth="20%p"
android:keyEdgeFlags="left" />
<Key
- android:codes="@integer/key_f1"
- android:keyIcon="@drawable/sym_bkeyboard_mic"
- android:iconPreview="@drawable/sym_keyboard_feedback_mic" />
+ android:codes="@integer/key_f1" />
<Key
android:codes="@integer/key_space"
android:keyIcon="@drawable/sym_bkeyboard_space"
@@ -261,9 +255,7 @@
android:keyIcon="@drawable/sym_bkeyboard_settings"
android:iconPreview="@drawable/sym_keyboard_feedback_settings" />
<Key
- android:codes="@integer/key_f1"
- android:keyIcon="@drawable/sym_bkeyboard_mic"
- android:iconPreview="@drawable/sym_keyboard_feedback_mic" />
+ android:codes="@integer/key_f1" />
<Key
android:codes="@integer/key_space"
android:keyIcon="@drawable/sym_bkeyboard_space"
@@ -356,9 +348,7 @@
android:keyIcon="@drawable/sym_bkeyboard_settings"
android:iconPreview="@drawable/sym_keyboard_feedback_settings" />
<Key
- android:codes="@integer/key_f1"
- android:keyIcon="@drawable/sym_bkeyboard_mic"
- android:iconPreview="@drawable/sym_keyboard_feedback_mic" />
+ android:codes="@integer/key_f1" />
<Key
android:codes="@integer/key_space"
android:keyIcon="@drawable/sym_bkeyboard_space"
@@ -389,9 +379,7 @@
android:keyIcon="@drawable/sym_bkeyboard_settings"
android:iconPreview="@drawable/sym_keyboard_feedback_settings" />
<Key
- android:codes="@integer/key_f1"
- android:keyIcon="@drawable/sym_bkeyboard_mic"
- android:iconPreview="@drawable/sym_keyboard_feedback_mic" />
+ android:codes="@integer/key_f1" />
<Key
android:codes="@integer/key_space"
android:keyIcon="@drawable/sym_bkeyboard_space"
diff --git a/java/res/xml-nb/kbd_qwerty.xml b/java/res/xml-nb/kbd_qwerty.xml
index 89d45468ca2a2ebfc980e7e68c67ed375cc45c26..7e16106845e22316a2443a9db42e49d928448f3a 100644
--- a/java/res/xml-nb/kbd_qwerty.xml
+++ b/java/res/xml-nb/kbd_qwerty.xml
@@ -176,8 +176,6 @@
android:keyEdgeFlags="left" />
<Key
android:codes="@integer/key_f1"
- android:keyIcon="@drawable/sym_keyboard_mic"
- android:iconPreview="@drawable/sym_keyboard_feedback_mic"
android:isModifier="true" />
<Key
android:codes="@integer/key_space"
@@ -274,8 +272,6 @@
android:keyEdgeFlags="left" />
<Key
android:codes="@integer/key_f1"
- android:keyIcon="@drawable/sym_keyboard_mic"
- android:iconPreview="@drawable/sym_keyboard_feedback_mic"
android:isModifier="true" />
<Key
android:codes="@integer/key_space"
@@ -308,8 +304,6 @@
android:keyEdgeFlags="left" />
<Key
android:codes="@integer/key_f1"
- android:keyIcon="@drawable/sym_keyboard_mic"
- android:iconPreview="@drawable/sym_keyboard_feedback_mic"
android:isModifier="true" />
<Key
android:codes="@integer/key_space"
@@ -353,8 +347,6 @@
android:isModifier="true" />
<Key
android:codes="@integer/key_f1"
- android:keyIcon="@drawable/sym_keyboard_mic"
- android:iconPreview="@drawable/sym_keyboard_feedback_mic"
android:isModifier="true" />
<Key
android:codes="@integer/key_space"
@@ -466,8 +458,6 @@
android:isModifier="true" />
<Key
android:codes="@integer/key_f1"
- android:keyIcon="@drawable/sym_keyboard_mic"
- android:iconPreview="@drawable/sym_keyboard_feedback_mic"
android:isModifier="true" />
<Key
android:codes="@integer/key_space"
@@ -505,8 +495,6 @@
android:isModifier="true" />
<Key
android:codes="@integer/key_f1"
- android:keyIcon="@drawable/sym_keyboard_mic"
- android:iconPreview="@drawable/sym_keyboard_feedback_mic"
android:isModifier="true" />
<Key
android:codes="@integer/key_space"
diff --git a/java/res/xml-nb/kbd_qwerty_black.xml b/java/res/xml-nb/kbd_qwerty_black.xml
index 8fbfead79c11443644d0dd91ac8a2cfa73b1226a..f6a034ee9f52f80f75e69e1830473bb3de090217 100644
--- a/java/res/xml-nb/kbd_qwerty_black.xml
+++ b/java/res/xml-nb/kbd_qwerty_black.xml
@@ -173,9 +173,7 @@
android:keyWidth="20%p"
android:keyEdgeFlags="left" />
<Key
- android:codes="@integer/key_f1"
- android:keyIcon="@drawable/sym_bkeyboard_mic"
- android:iconPreview="@drawable/sym_keyboard_feedback_mic" />
+ android:codes="@integer/key_f1" />
<Key
android:codes="@integer/key_space"
android:keyIcon="@drawable/sym_bkeyboard_space"
@@ -256,9 +254,7 @@
android:keyWidth="20%p"
android:keyEdgeFlags="left" />
<Key
- android:codes="@integer/key_f1"
- android:keyIcon="@drawable/sym_bkeyboard_mic"
- android:iconPreview="@drawable/sym_keyboard_feedback_mic" />
+ android:codes="@integer/key_f1" />
<Key
android:codes="@integer/key_space"
android:keyIcon="@drawable/sym_bkeyboard_space"
@@ -285,9 +281,7 @@
android:keyWidth="20%p"
android:keyEdgeFlags="left" />
<Key
- android:codes="@integer/key_f1"
- android:keyIcon="@drawable/sym_bkeyboard_mic"
- android:iconPreview="@drawable/sym_keyboard_feedback_mic" />
+ android:codes="@integer/key_f1" />
<Key
android:codes="@integer/key_space"
android:keyIcon="@drawable/sym_bkeyboard_space"
@@ -323,9 +317,7 @@
android:keyIcon="@drawable/sym_bkeyboard_settings"
android:iconPreview="@drawable/sym_keyboard_feedback_settings" />
<Key
- android:codes="@integer/key_f1"
- android:keyIcon="@drawable/sym_bkeyboard_mic"
- android:iconPreview="@drawable/sym_keyboard_feedback_mic" />
+ android:codes="@integer/key_f1" />
<Key
android:codes="@integer/key_space"
android:keyIcon="@drawable/sym_bkeyboard_space"
@@ -418,9 +410,7 @@
android:keyIcon="@drawable/sym_bkeyboard_settings"
android:iconPreview="@drawable/sym_keyboard_feedback_settings" />
<Key
- android:codes="@integer/key_f1"
- android:keyIcon="@drawable/sym_bkeyboard_mic"
- android:iconPreview="@drawable/sym_keyboard_feedback_mic" />
+ android:codes="@integer/key_f1" />
<Key
android:codes="@integer/key_space"
android:keyIcon="@drawable/sym_bkeyboard_space"
@@ -451,9 +441,7 @@
android:keyIcon="@drawable/sym_bkeyboard_settings"
android:iconPreview="@drawable/sym_keyboard_feedback_settings" />
<Key
- android:codes="@integer/key_f1"
- android:keyIcon="@drawable/sym_bkeyboard_mic"
- android:iconPreview="@drawable/sym_keyboard_feedback_mic" />
+ android:codes="@integer/key_f1" />
<Key
android:codes="@integer/key_space"
android:keyIcon="@drawable/sym_bkeyboard_space"
diff --git a/java/res/xml-ru/kbd_qwerty.xml b/java/res/xml-ru/kbd_qwerty.xml
index 1877f838e3752ed8356e6fa3310f016260698911..9f16b9b7ddd2e53847dfa7044b259bdeced07c2a 100644
--- a/java/res/xml-ru/kbd_qwerty.xml
+++ b/java/res/xml-ru/kbd_qwerty.xml
@@ -154,8 +154,6 @@
android:keyEdgeFlags="left" />
<Key
android:codes="@integer/key_f1"
- android:keyIcon="@drawable/sym_keyboard_mic"
- android:iconPreview="@drawable/sym_keyboard_feedback_mic"
android:isModifier="true" />
<Key
android:codes="@integer/key_space"
@@ -252,8 +250,6 @@
android:keyEdgeFlags="left" />
<Key
android:codes="@integer/key_f1"
- android:keyIcon="@drawable/sym_keyboard_mic"
- android:iconPreview="@drawable/sym_keyboard_feedback_mic"
android:isModifier="true" />
<Key
android:codes="@integer/key_space"
@@ -286,8 +282,6 @@
android:keyEdgeFlags="left" />
<Key
android:codes="@integer/key_f1"
- android:keyIcon="@drawable/sym_keyboard_mic"
- android:iconPreview="@drawable/sym_keyboard_feedback_mic"
android:isModifier="true" />
<Key
android:codes="@integer/key_space"
@@ -331,8 +325,6 @@
android:isModifier="true" />
<Key
android:codes="@integer/key_f1"
- android:keyIcon="@drawable/sym_keyboard_mic"
- android:iconPreview="@drawable/sym_keyboard_feedback_mic"
android:isModifier="true" />
<Key
android:codes="@integer/key_space"
@@ -444,8 +436,6 @@
android:isModifier="true" />
<Key
android:codes="@integer/key_f1"
- android:keyIcon="@drawable/sym_keyboard_mic"
- android:iconPreview="@drawable/sym_keyboard_feedback_mic"
android:isModifier="true" />
<Key
android:codes="@integer/key_space"
@@ -483,8 +473,6 @@
android:isModifier="true" />
<Key
android:codes="@integer/key_f1"
- android:keyIcon="@drawable/sym_keyboard_mic"
- android:iconPreview="@drawable/sym_keyboard_feedback_mic"
android:isModifier="true" />
<Key
android:codes="@integer/key_space"
diff --git a/java/res/xml-ru/kbd_qwerty_black.xml b/java/res/xml-ru/kbd_qwerty_black.xml
index ebf78ce97d9ff272d6149549dc12f88fe0a1d6e2..73008befd6f848e63f10dd95ea6be225efb10b93 100644
--- a/java/res/xml-ru/kbd_qwerty_black.xml
+++ b/java/res/xml-ru/kbd_qwerty_black.xml
@@ -151,9 +151,7 @@
android:keyWidth="20%p"
android:keyEdgeFlags="left" />
<Key
- android:codes="@integer/key_f1"
- android:keyIcon="@drawable/sym_bkeyboard_mic"
- android:iconPreview="@drawable/sym_keyboard_feedback_mic" />
+ android:codes="@integer/key_f1" />
<Key
android:codes="@integer/key_space"
android:keyIcon="@drawable/sym_bkeyboard_space"
@@ -234,9 +232,7 @@
android:keyWidth="20%p"
android:keyEdgeFlags="left" />
<Key
- android:codes="@integer/key_f1"
- android:keyIcon="@drawable/sym_bkeyboard_mic"
- android:iconPreview="@drawable/sym_keyboard_feedback_mic" />
+ android:codes="@integer/key_f1" />
<Key
android:codes="@integer/key_space"
android:keyIcon="@drawable/sym_bkeyboard_space"
@@ -263,9 +259,7 @@
android:keyWidth="20%p"
android:keyEdgeFlags="left" />
<Key
- android:codes="@integer/key_f1"
- android:keyIcon="@drawable/sym_bkeyboard_mic"
- android:iconPreview="@drawable/sym_keyboard_feedback_mic" />
+ android:codes="@integer/key_f1" />
<Key
android:codes="@integer/key_space"
android:keyIcon="@drawable/sym_bkeyboard_space"
@@ -301,9 +295,7 @@
android:keyIcon="@drawable/sym_bkeyboard_settings"
android:iconPreview="@drawable/sym_keyboard_feedback_settings" />
<Key
- android:codes="@integer/key_f1"
- android:keyIcon="@drawable/sym_bkeyboard_mic"
- android:iconPreview="@drawable/sym_keyboard_feedback_mic" />
+ android:codes="@integer/key_f1" />
<Key
android:codes="@integer/key_space"
android:keyIcon="@drawable/sym_bkeyboard_space"
@@ -396,9 +388,7 @@
android:keyIcon="@drawable/sym_bkeyboard_settings"
android:iconPreview="@drawable/sym_keyboard_feedback_settings" />
<Key
- android:codes="@integer/key_f1"
- android:keyIcon="@drawable/sym_bkeyboard_mic"
- android:iconPreview="@drawable/sym_keyboard_feedback_mic" />
+ android:codes="@integer/key_f1" />
<Key
android:codes="@integer/key_space"
android:keyIcon="@drawable/sym_bkeyboard_space"
@@ -429,9 +419,7 @@
android:keyIcon="@drawable/sym_bkeyboard_settings"
android:iconPreview="@drawable/sym_keyboard_feedback_settings" />
<Key
- android:codes="@integer/key_f1"
- android:keyIcon="@drawable/sym_bkeyboard_mic"
- android:iconPreview="@drawable/sym_keyboard_feedback_mic" />
+ android:codes="@integer/key_f1" />
<Key
android:codes="@integer/key_space"
android:keyIcon="@drawable/sym_bkeyboard_space"
diff --git a/java/res/xml-sr/kbd_qwerty.xml b/java/res/xml-sr/kbd_qwerty.xml
index ba8bf8c7db6fc201c7dbbe94e6e3fdcc1670c3c7..c671166d1bc290bfe7cf9362f49366675470e421 100644
--- a/java/res/xml-sr/kbd_qwerty.xml
+++ b/java/res/xml-sr/kbd_qwerty.xml
@@ -147,8 +147,6 @@
android:keyEdgeFlags="left" />
<Key
android:codes="@integer/key_f1"
- android:keyIcon="@drawable/sym_keyboard_mic"
- android:iconPreview="@drawable/sym_keyboard_feedback_mic"
android:isModifier="true" />
<Key
android:codes="@integer/key_space"
@@ -245,8 +243,6 @@
android:keyEdgeFlags="left" />
<Key
android:codes="@integer/key_f1"
- android:keyIcon="@drawable/sym_keyboard_mic"
- android:iconPreview="@drawable/sym_keyboard_feedback_mic"
android:isModifier="true" />
<Key
android:codes="@integer/key_space"
@@ -279,8 +275,6 @@
android:keyEdgeFlags="left" />
<Key
android:codes="@integer/key_f1"
- android:keyIcon="@drawable/sym_keyboard_mic"
- android:iconPreview="@drawable/sym_keyboard_feedback_mic"
android:isModifier="true" />
<Key
android:codes="@integer/key_space"
@@ -324,8 +318,6 @@
android:isModifier="true" />
<Key
android:codes="@integer/key_f1"
- android:keyIcon="@drawable/sym_keyboard_mic"
- android:iconPreview="@drawable/sym_keyboard_feedback_mic"
android:isModifier="true" />
<Key
android:codes="@integer/key_space"
@@ -437,8 +429,6 @@
android:isModifier="true" />
<Key
android:codes="@integer/key_f1"
- android:keyIcon="@drawable/sym_keyboard_mic"
- android:iconPreview="@drawable/sym_keyboard_feedback_mic"
android:isModifier="true" />
<Key
android:codes="@integer/key_space"
@@ -476,8 +466,6 @@
android:isModifier="true" />
<Key
android:codes="@integer/key_f1"
- android:keyIcon="@drawable/sym_keyboard_mic"
- android:iconPreview="@drawable/sym_keyboard_feedback_mic"
android:isModifier="true" />
<Key
android:codes="@integer/key_space"
diff --git a/java/res/xml-sr/kbd_qwerty_black.xml b/java/res/xml-sr/kbd_qwerty_black.xml
index 1bfb58e48f2daf019cbbe5754c0c57caba86832d..5e5bceec0011e1c34c7df1c0b50e25106af7a861 100644
--- a/java/res/xml-sr/kbd_qwerty_black.xml
+++ b/java/res/xml-sr/kbd_qwerty_black.xml
@@ -144,9 +144,7 @@
android:keyWidth="20%p"
android:keyEdgeFlags="left" />
<Key
- android:codes="@integer/key_f1"
- android:keyIcon="@drawable/sym_bkeyboard_mic"
- android:iconPreview="@drawable/sym_keyboard_feedback_mic" />
+ android:codes="@integer/key_f1" />
<Key
android:codes="@integer/key_space"
android:keyIcon="@drawable/sym_bkeyboard_space"
@@ -227,9 +225,7 @@
android:keyWidth="20%p"
android:keyEdgeFlags="left" />
<Key
- android:codes="@integer/key_f1"
- android:keyIcon="@drawable/sym_bkeyboard_mic"
- android:iconPreview="@drawable/sym_keyboard_feedback_mic" />
+ android:codes="@integer/key_f1" />
<Key
android:codes="@integer/key_space"
android:keyIcon="@drawable/sym_bkeyboard_space"
@@ -256,9 +252,7 @@
android:keyWidth="20%p"
android:keyEdgeFlags="left" />
<Key
- android:codes="@integer/key_f1"
- android:keyIcon="@drawable/sym_bkeyboard_mic"
- android:iconPreview="@drawable/sym_keyboard_feedback_mic" />
+ android:codes="@integer/key_f1" />
<Key
android:codes="@integer/key_space"
android:keyIcon="@drawable/sym_bkeyboard_space"
@@ -294,9 +288,7 @@
android:keyIcon="@drawable/sym_bkeyboard_settings"
android:iconPreview="@drawable/sym_keyboard_feedback_settings" />
<Key
- android:codes="@integer/key_f1"
- android:keyIcon="@drawable/sym_bkeyboard_mic"
- android:iconPreview="@drawable/sym_keyboard_feedback_mic" />
+ android:codes="@integer/key_f1" />
<Key
android:codes="@integer/key_space"
android:keyIcon="@drawable/sym_bkeyboard_space"
@@ -389,9 +381,7 @@
android:keyIcon="@drawable/sym_bkeyboard_settings"
android:iconPreview="@drawable/sym_keyboard_feedback_settings" />
<Key
- android:codes="@integer/key_f1"
- android:keyIcon="@drawable/sym_bkeyboard_mic"
- android:iconPreview="@drawable/sym_keyboard_feedback_mic" />
+ android:codes="@integer/key_f1" />
<Key
android:codes="@integer/key_space"
android:keyIcon="@drawable/sym_bkeyboard_space"
@@ -422,9 +412,7 @@
android:keyIcon="@drawable/sym_bkeyboard_settings"
android:iconPreview="@drawable/sym_keyboard_feedback_settings" />
<Key
- android:codes="@integer/key_f1"
- android:keyIcon="@drawable/sym_bkeyboard_mic"
- android:iconPreview="@drawable/sym_keyboard_feedback_mic" />
+ android:codes="@integer/key_f1" />
<Key
android:codes="@integer/key_space"
android:keyIcon="@drawable/sym_bkeyboard_space"
diff --git a/java/res/xml-sv/kbd_qwerty.xml b/java/res/xml-sv/kbd_qwerty.xml
index 32a6add89c8fc2461cd22533f8fa854d9794342f..44117fc1f6287188294441ef0e1b256332a524e6 100644
--- a/java/res/xml-sv/kbd_qwerty.xml
+++ b/java/res/xml-sv/kbd_qwerty.xml
@@ -177,8 +177,6 @@
android:keyEdgeFlags="left" />
<Key
android:codes="@integer/key_f1"
- android:keyIcon="@drawable/sym_keyboard_mic"
- android:iconPreview="@drawable/sym_keyboard_feedback_mic"
android:isModifier="true" />
<Key
android:codes="@integer/key_space"
@@ -275,8 +273,6 @@
android:keyEdgeFlags="left" />
<Key
android:codes="@integer/key_f1"
- android:keyIcon="@drawable/sym_keyboard_mic"
- android:iconPreview="@drawable/sym_keyboard_feedback_mic"
android:isModifier="true" />
<Key
android:codes="@integer/key_space"
@@ -309,8 +305,6 @@
android:keyEdgeFlags="left" />
<Key
android:codes="@integer/key_f1"
- android:keyIcon="@drawable/sym_keyboard_mic"
- android:iconPreview="@drawable/sym_keyboard_feedback_mic"
android:isModifier="true" />
<Key
android:codes="@integer/key_space"
@@ -354,8 +348,6 @@
android:isModifier="true" />
<Key
android:codes="@integer/key_f1"
- android:keyIcon="@drawable/sym_keyboard_mic"
- android:iconPreview="@drawable/sym_keyboard_feedback_mic"
android:isModifier="true" />
<Key
android:codes="@integer/key_space"
@@ -467,8 +459,6 @@
android:isModifier="true" />
<Key
android:codes="@integer/key_f1"
- android:keyIcon="@drawable/sym_keyboard_mic"
- android:iconPreview="@drawable/sym_keyboard_feedback_mic"
android:isModifier="true" />
<Key
android:codes="@integer/key_space"
@@ -506,8 +496,6 @@
android:isModifier="true" />
<Key
android:codes="@integer/key_f1"
- android:keyIcon="@drawable/sym_keyboard_mic"
- android:iconPreview="@drawable/sym_keyboard_feedback_mic"
android:isModifier="true" />
<Key
android:codes="@integer/key_space"
diff --git a/java/res/xml-sv/kbd_qwerty_black.xml b/java/res/xml-sv/kbd_qwerty_black.xml
index 56050e9d0b4b0c4294158a58d2116700337310ce..13ed3d1bf16504261ee91cdbb8714d6a03216958 100644
--- a/java/res/xml-sv/kbd_qwerty_black.xml
+++ b/java/res/xml-sv/kbd_qwerty_black.xml
@@ -175,9 +175,7 @@
android:keyWidth="20%p"
android:keyEdgeFlags="left" />
<Key
- android:codes="@integer/key_f1"
- android:keyIcon="@drawable/sym_bkeyboard_mic"
- android:iconPreview="@drawable/sym_keyboard_feedback_mic" />
+ android:codes="@integer/key_f1" />
<Key
android:codes="@integer/key_space"
android:keyIcon="@drawable/sym_bkeyboard_space"
@@ -258,9 +256,7 @@
android:keyWidth="20%p"
android:keyEdgeFlags="left" />
<Key
- android:codes="@integer/key_f1"
- android:keyIcon="@drawable/sym_bkeyboard_mic"
- android:iconPreview="@drawable/sym_keyboard_feedback_mic" />
+ android:codes="@integer/key_f1" />
<Key
android:codes="@integer/key_space"
android:keyIcon="@drawable/sym_bkeyboard_space"
@@ -287,9 +283,7 @@
android:keyWidth="20%p"
android:keyEdgeFlags="left" />
<Key
- android:codes="@integer/key_f1"
- android:keyIcon="@drawable/sym_bkeyboard_mic"
- android:iconPreview="@drawable/sym_keyboard_feedback_mic" />
+ android:codes="@integer/key_f1" />
<Key
android:codes="@integer/key_space"
android:keyIcon="@drawable/sym_bkeyboard_space"
@@ -325,9 +319,7 @@
android:keyIcon="@drawable/sym_bkeyboard_settings"
android:iconPreview="@drawable/sym_keyboard_feedback_settings" />
<Key
- android:codes="@integer/key_f1"
- android:keyIcon="@drawable/sym_bkeyboard_mic"
- android:iconPreview="@drawable/sym_keyboard_feedback_mic" />
+ android:codes="@integer/key_f1" />
<Key
android:codes="@integer/key_space"
android:keyIcon="@drawable/sym_bkeyboard_space"
@@ -420,9 +412,7 @@
android:keyIcon="@drawable/sym_bkeyboard_settings"
android:iconPreview="@drawable/sym_keyboard_feedback_settings" />
<Key
- android:codes="@integer/key_f1"
- android:keyIcon="@drawable/sym_bkeyboard_mic"
- android:iconPreview="@drawable/sym_keyboard_feedback_mic" />
+ android:codes="@integer/key_f1" />
<Key
android:codes="@integer/key_space"
android:keyIcon="@drawable/sym_bkeyboard_space"
@@ -453,9 +443,7 @@
android:keyIcon="@drawable/sym_bkeyboard_settings"
android:iconPreview="@drawable/sym_keyboard_feedback_settings" />
<Key
- android:codes="@integer/key_f1"
- android:keyIcon="@drawable/sym_bkeyboard_mic"
- android:iconPreview="@drawable/sym_keyboard_feedback_mic" />
+ android:codes="@integer/key_f1" />
<Key
android:codes="@integer/key_space"
android:keyIcon="@drawable/sym_bkeyboard_space"
diff --git a/java/res/xml/kbd_qwerty.xml b/java/res/xml/kbd_qwerty.xml
index ca9f99a31b9e38c1783865d055989faf98ba4caf..446467fa42e38bed662f3c319c08e761691e0e7b 100644
--- a/java/res/xml/kbd_qwerty.xml
+++ b/java/res/xml/kbd_qwerty.xml
@@ -154,8 +154,6 @@
android:keyEdgeFlags="left" />
<Key
android:codes="@integer/key_f1"
- android:keyIcon="@drawable/sym_keyboard_mic"
- android:iconPreview="@drawable/sym_keyboard_feedback_mic"
android:isModifier="true" />
<Key
android:codes="@integer/key_space"
@@ -249,8 +247,6 @@
android:keyEdgeFlags="left" />
<Key
android:codes="@integer/key_f1"
- android:keyIcon="@drawable/sym_keyboard_mic"
- android:iconPreview="@drawable/sym_keyboard_feedback_mic"
android:isModifier="true" />
<Key
android:codes="@integer/key_space"
@@ -282,8 +278,6 @@
android:keyEdgeFlags="left" />
<Key
android:codes="@integer/key_f1"
- android:keyIcon="@drawable/sym_keyboard_mic"
- android:iconPreview="@drawable/sym_keyboard_feedback_mic"
android:isModifier="true" />
<Key
android:codes="@integer/key_space"
@@ -326,8 +320,6 @@
android:isModifier="true" />
<Key
android:codes="@integer/key_f1"
- android:keyIcon="@drawable/sym_keyboard_mic"
- android:iconPreview="@drawable/sym_keyboard_feedback_mic"
android:isModifier="true" />
<Key
android:codes="@integer/key_space"
@@ -436,8 +428,6 @@
android:isModifier="true" />
<Key
android:codes="@integer/key_f1"
- android:keyIcon="@drawable/sym_keyboard_mic"
- android:iconPreview="@drawable/sym_keyboard_feedback_mic"
android:isModifier="true" />
<Key
android:codes="@integer/key_space"
@@ -474,8 +464,6 @@
android:isModifier="true" />
<Key
android:codes="@integer/key_f1"
- android:keyIcon="@drawable/sym_keyboard_mic"
- android:iconPreview="@drawable/sym_keyboard_feedback_mic"
android:isModifier="true" />
<Key
android:codes="@integer/key_space"
diff --git a/java/res/xml/kbd_qwerty_black.xml b/java/res/xml/kbd_qwerty_black.xml
index fa300a03493d6b2a4ff05c8d365816acabfc6f12..f44c24fad220ab0472509e338e58c268558ef081 100644
--- a/java/res/xml/kbd_qwerty_black.xml
+++ b/java/res/xml/kbd_qwerty_black.xml
@@ -151,9 +151,7 @@
android:keyWidth="20%p"
android:keyEdgeFlags="left" />
<Key
- android:codes="@integer/key_f1"
- android:keyIcon="@drawable/sym_bkeyboard_mic"
- android:iconPreview="@drawable/sym_keyboard_feedback_mic" />
+ android:codes="@integer/key_f1" />
<Key
android:codes="@integer/key_space"
android:keyIcon="@drawable/sym_bkeyboard_space"
@@ -231,9 +229,7 @@
android:keyWidth="20%p"
android:keyEdgeFlags="left" />
<Key
- android:codes="@integer/key_f1"
- android:keyIcon="@drawable/sym_bkeyboard_mic"
- android:iconPreview="@drawable/sym_keyboard_feedback_mic" />
+ android:codes="@integer/key_f1" />
<Key
android:codes="@integer/key_space"
android:keyIcon="@drawable/sym_bkeyboard_space"
@@ -259,9 +255,7 @@
android:keyWidth="20%p"
android:keyEdgeFlags="left" />
<Key
- android:codes="@integer/key_f1"
- android:keyIcon="@drawable/sym_bkeyboard_mic"
- android:iconPreview="@drawable/sym_keyboard_feedback_mic" />
+ android:codes="@integer/key_f1" />
<Key
android:codes="@integer/key_space"
android:keyIcon="@drawable/sym_bkeyboard_space"
@@ -296,9 +290,7 @@
android:keyIcon="@drawable/sym_bkeyboard_settings"
android:iconPreview="@drawable/sym_keyboard_feedback_settings" />
<Key
- android:codes="@integer/key_f1"
- android:keyIcon="@drawable/sym_bkeyboard_mic"
- android:iconPreview="@drawable/sym_keyboard_feedback_mic" />
+ android:codes="@integer/key_f1" />
<Key
android:codes="@integer/key_space"
android:keyIcon="@drawable/sym_bkeyboard_space"
@@ -388,9 +380,7 @@
android:keyIcon="@drawable/sym_bkeyboard_settings"
android:iconPreview="@drawable/sym_keyboard_feedback_settings" />
<Key
- android:codes="@integer/key_f1"
- android:keyIcon="@drawable/sym_bkeyboard_mic"
- android:iconPreview="@drawable/sym_keyboard_feedback_mic" />
+ android:codes="@integer/key_f1" />
<Key
android:codes="@integer/key_space"
android:keyIcon="@drawable/sym_bkeyboard_space"
@@ -420,9 +410,7 @@
android:keyIcon="@drawable/sym_bkeyboard_settings"
android:iconPreview="@drawable/sym_keyboard_feedback_settings" />
<Key
- android:codes="@integer/key_f1"
- android:keyIcon="@drawable/sym_bkeyboard_mic"
- android:iconPreview="@drawable/sym_keyboard_feedback_mic" />
+ android:codes="@integer/key_f1" />
<Key
android:codes="@integer/key_space"
android:keyIcon="@drawable/sym_bkeyboard_space"
diff --git a/java/res/xml/popup_comma.xml b/java/res/xml/popup_comma.xml
new file mode 100644
index 0000000000000000000000000000000000000000..540dc9615b16e49053dafb9a12217edf14b0555e
--- /dev/null
+++ b/java/res/xml/popup_comma.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2010, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+
+<Keyboard
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:keyWidth="10%p"
+ android:horizontalGap="0px"
+ android:verticalGap="0px"
+ android:keyHeight="@dimen/key_height"
+>
+ <Row
+ android:rowEdgeFlags="top|bottom"
+ >
+ <Key
+ android:codes="@integer/key_settings"
+ android:keyIcon="@drawable/sym_keyboard_settings"
+ android:keyEdgeFlags="left" />
+ <Key
+ android:keyLabel=","
+ android:keyEdgeFlags="right" />
+ </Row>
+</Keyboard>
diff --git a/java/res/xml/popup_mic.xml b/java/res/xml/popup_mic.xml
new file mode 100644
index 0000000000000000000000000000000000000000..f3cc63817e21842e86427a775fde016079636960
--- /dev/null
+++ b/java/res/xml/popup_mic.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2010, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+
+<Keyboard
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:keyWidth="10%p"
+ android:horizontalGap="0px"
+ android:verticalGap="0px"
+ android:keyHeight="@dimen/key_height"
+>
+ <Row
+ android:rowEdgeFlags="top|bottom"
+ >
+ <Key
+ android:codes="@integer/key_settings"
+ android:keyIcon="@drawable/sym_keyboard_settings"
+ android:keyEdgeFlags="left" />
+ <Key
+ android:codes="@integer/key_voice"
+ android:keyIcon="@drawable/sym_keyboard_mic"
+ android:keyEdgeFlags="right" />
+ </Row>
+</Keyboard>
diff --git a/java/src/com/android/inputmethod/latin/LatinKeyboard.java b/java/src/com/android/inputmethod/latin/LatinKeyboard.java
index 14a503bc35ac1b94f60754c5c6b53d771d876df1..43d0a7beb310fc2cbeabd78dbb6d385e8db84c26 100644
--- a/java/src/com/android/inputmethod/latin/LatinKeyboard.java
+++ b/java/src/com/android/inputmethod/latin/LatinKeyboard.java
@@ -367,11 +367,13 @@ public class LatinKeyboard extends Keyboard {
mF1Key.label = null;
mF1Key.icon = mMicIcon;
mF1Key.iconPreview = mMicPreviewIcon;
+ mF1Key.popupResId = R.xml.popup_mic;
} else {
mF1Key.label = ",";
mF1Key.codes = new int[] { ',' };
mF1Key.icon = null;
mF1Key.iconPreview = null;
+ mF1Key.popupResId = R.xml.popup_comma;
}
}
diff --git a/java/src/com/android/inputmethod/latin/LatinKeyboardView.java b/java/src/com/android/inputmethod/latin/LatinKeyboardView.java
index c4afd9a27c29c15e884343c1330f3f96b561bd40..22d39f7aa446dcbf40c46ef8f927c76867f6db5c 100644
--- a/java/src/com/android/inputmethod/latin/LatinKeyboardView.java
+++ b/java/src/com/android/inputmethod/latin/LatinKeyboardView.java
@@ -17,7 +17,6 @@
package com.android.inputmethod.latin;
import android.content.Context;
-import android.content.res.Resources;
import android.graphics.Canvas;
import android.graphics.Paint;
import android.inputmethodservice.Keyboard;
@@ -42,8 +41,6 @@ public class LatinKeyboardView extends LatinKeyboardBaseView {
private Keyboard mPhoneKeyboard;
- private final boolean mLongPressCommaForSettingsEnabled;
-
/** Whether we've started dropping move events because we found a big jump */
private boolean mDroppingEvents;
/**
@@ -62,10 +59,6 @@ public class LatinKeyboardView extends LatinKeyboardBaseView {
public LatinKeyboardView(Context context, AttributeSet attrs, int defStyle) {
super(context, attrs, defStyle);
-
- Resources res = context.getResources();
- mLongPressCommaForSettingsEnabled = res.getBoolean(
- R.bool.config_long_press_comma_for_settings_enabled);
}
public void setPhoneKeyboard(Keyboard phoneKeyboard) {
@@ -101,9 +94,6 @@ public class LatinKeyboardView extends LatinKeyboardBaseView {
} else if (primaryCode == '0' && getKeyboard() == mPhoneKeyboard) {
// Long pressing on 0 in phone number keypad gives you a '+'.
return invokeOnKey('+');
- } else if (primaryCode == KEYCODE_VOICE
- || (primaryCode == ',' && mLongPressCommaForSettingsEnabled)) {
- return invokeOnKey(KEYCODE_OPTIONS);
} else {
return super.onLongPress(key);
}