nyancrimew
/
LatinIME
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

am 8e1f1be0: Long press mic/comma key bring mini keyboard with settings 

Merge commit '8e1f1be0f3cfce4ed0623d3d137f53f034f5b718' into gingerbread-plus-aosp

* commit '8e1f1be0f3cfce4ed0623d3d137f53f034f5b718':
  Long press mic/comma key bring mini keyboard with settings
main
Tadashi G. Takaoka 2010-10-01 04:02:12 -07:00 committed by Android Git Automerger
parent bd67788049 8e1f1be0f3
commit c0fc4bf993
23 changed files with 136 additions and 280 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
java/res/values/keycodes.xml
View File

@ -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>

12
java/res/xml-da/kbd_qwerty.xml
View File

@ -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"

24
java/res/xml-da/kbd_qwerty_black.xml
View File

@ -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"

12
java/res/xml-de/kbd_qwerty.xml
View File

@ -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"

24
java/res/xml-de/kbd_qwerty_black.xml
View File

@ -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"

12
java/res/xml-fr/kbd_qwerty.xml
View File

@ -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"

24
java/res/xml-fr/kbd_qwerty_black.xml
View File

@ -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"

12
java/res/xml-iw/kbd_qwerty.xml
View File

@ -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"

24
java/res/xml-iw/kbd_qwerty_black.xml
View File

@ -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"

12
java/res/xml-nb/kbd_qwerty.xml
View File

@ -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"

24
java/res/xml-nb/kbd_qwerty_black.xml
View File

@ -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"

12
java/res/xml-ru/kbd_qwerty.xml
View File

@ -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"

24
java/res/xml-ru/kbd_qwerty_black.xml
View File

@ -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"

12
java/res/xml-sr/kbd_qwerty.xml
View File

@ -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"

24
java/res/xml-sr/kbd_qwerty_black.xml
View File

@ -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"

12
java/res/xml-sv/kbd_qwerty.xml
View File

@ -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"

24
java/res/xml-sv/kbd_qwerty_black.xml
View File

@ -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"

12
java/res/xml/kbd_qwerty.xml
View File

@ -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"

24
java/res/xml/kbd_qwerty_black.xml
View File

@ -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"

39
java/res/xml/popup_comma.xml Normal file
View File

@ -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>

40
java/res/xml/popup_mic.xml Normal file
View File

@ -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>

2
java/src/com/android/inputmethod/latin/LatinKeyboard.java
View File

@ -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;
}
}

10
java/src/com/android/inputmethod/latin/LatinKeyboardView.java
View File

@ -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);
}