diff options
Diffstat (limited to 'java')
24 files changed, 245 insertions, 19 deletions
diff --git a/java/res/drawable-hdpi/hint_settings.9.png b/java/res/drawable-hdpi/hint_popup.9.png Binary files differindex b5ec003e6..b5ec003e6 100644 --- a/java/res/drawable-hdpi/hint_settings.9.png +++ b/java/res/drawable-hdpi/hint_popup.9.png diff --git a/java/res/drawable-mdpi/hint_settings.9.png b/java/res/drawable-mdpi/hint_popup.9.png Binary files differindex 444cc26ee..444cc26ee 100644 --- a/java/res/drawable-mdpi/hint_settings.9.png +++ b/java/res/drawable-mdpi/hint_popup.9.png diff --git a/java/res/xml-da/kbd_qwerty.xml b/java/res/xml-da/kbd_qwerty.xml index 70eab096d..b7b1b1769 100644 --- a/java/res/xml-da/kbd_qwerty.xml +++ b/java/res/xml-da/kbd_qwerty.xml @@ -187,6 +187,7 @@ android:isModifier="true" /> <Key android:keyLabel="." + android:keyIcon="@drawable/hint_popup" android:popupKeyboard="@xml/popup_punctuation" android:isModifier="true" /> <Key @@ -219,6 +220,7 @@ android:isModifier="true" /> <Key android:keyLabel="." + android:keyIcon="@drawable/hint_popup" android:popupKeyboard="@xml/popup_punctuation" android:isModifier="true" /> <Key @@ -251,6 +253,7 @@ android:isModifier="true" /> <Key android:keyLabel="." + android:keyIcon="@drawable/hint_popup" android:popupKeyboard="@xml/popup_punctuation" android:isModifier="true" /> <Key @@ -283,11 +286,13 @@ android:isModifier="true" /> <Key android:keyLabel="." + android:keyIcon="@drawable/hint_popup" android:popupKeyboard="@xml/popup_punctuation" android:isModifier="true" /> <Key android:keyLabel=":-)" android:keyOutputText=":-) " + android:keyIcon="@drawable/hint_popup" android:popupKeyboard="@xml/popup_smileys" android:keyWidth="20%p" android:isModifier="true" @@ -321,6 +326,7 @@ android:isModifier="true" /> <Key android:keyLabel="." + android:keyIcon="@drawable/hint_popup" android:popupKeyboard="@xml/popup_punctuation" android:isModifier="true" /> <Key @@ -358,6 +364,7 @@ android:isModifier="true" /> <Key android:keyLabel="." + android:keyIcon="@drawable/hint_popup" android:popupKeyboard="@xml/popup_punctuation" android:isModifier="true" /> <Key @@ -395,6 +402,7 @@ android:isModifier="true" /> <Key android:keyLabel="." + android:keyIcon="@drawable/hint_popup" android:popupKeyboard="@xml/popup_punctuation" android:isModifier="true" /> <Key @@ -432,6 +440,7 @@ android:isModifier="true" /> <Key android:keyLabel="." + android:keyIcon="@drawable/hint_popup" android:popupKeyboard="@xml/popup_punctuation" android:isModifier="true" /> <Key @@ -469,11 +478,13 @@ android:isModifier="true" /> <Key android:keyLabel="." + android:keyIcon="@drawable/hint_popup" android:popupKeyboard="@xml/popup_punctuation" android:isModifier="true" /> <Key android:keyLabel=":-)" android:keyOutputText=":-) " + android:keyIcon="@drawable/hint_popup" android:popupKeyboard="@xml/popup_smileys" android:keyWidth="25%p" android:isModifier="true" @@ -511,6 +522,7 @@ android:isModifier="true" /> <Key android:keyLabel="." + android:keyIcon="@drawable/hint_popup" android:popupKeyboard="@xml/popup_punctuation" android:isModifier="true" /> <Key diff --git a/java/res/xml-da/kbd_qwerty_black.xml b/java/res/xml-da/kbd_qwerty_black.xml index 021f991c8..3fb4acd1b 100644 --- a/java/res/xml-da/kbd_qwerty_black.xml +++ b/java/res/xml-da/kbd_qwerty_black.xml @@ -183,6 +183,7 @@ android:keyWidth="40%p" /> <Key android:keyLabel="." + android:keyIcon="@drawable/hint_popup" android:popupKeyboard="@xml/popup_punctuation" /> <Key android:codes="@integer/key_return" @@ -210,6 +211,7 @@ android:keyWidth="40%p" /> <Key android:keyLabel="." + android:keyIcon="@drawable/hint_popup" android:popupKeyboard="@xml/popup_punctuation" /> <Key android:codes="@integer/key_return" @@ -237,6 +239,7 @@ android:keyWidth="40%p" /> <Key android:keyLabel="." + android:keyIcon="@drawable/hint_popup" android:popupKeyboard="@xml/popup_punctuation" /> <Key android:codes="@integer/key_return" @@ -264,10 +267,12 @@ android:keyWidth="40%p" /> <Key android:keyLabel="." + android:keyIcon="@drawable/hint_popup" android:popupKeyboard="@xml/popup_punctuation" /> <Key android:keyLabel=":-)" android:keyOutputText=":-) " + android:keyIcon="@drawable/hint_popup" android:popupKeyboard="@xml/popup_smileys" android:keyWidth="20%p" android:keyEdgeFlags="right" /> @@ -296,6 +301,7 @@ android:keyWidth="20%p" /> <Key android:keyLabel="." + android:keyIcon="@drawable/hint_popup" android:popupKeyboard="@xml/popup_punctuation" /> <Key android:codes="@integer/key_return" @@ -327,6 +333,7 @@ android:keyWidth="30%p" /> <Key android:keyLabel="." + android:keyIcon="@drawable/hint_popup" android:popupKeyboard="@xml/popup_punctuation" /> <Key android:codes="@integer/key_return" @@ -358,6 +365,7 @@ android:keyWidth="30%p" /> <Key android:keyLabel="." + android:keyIcon="@drawable/hint_popup" android:popupKeyboard="@xml/popup_punctuation" /> <Key android:codes="@integer/key_return" @@ -389,6 +397,7 @@ android:keyWidth="30%p" /> <Key android:keyLabel="." + android:keyIcon="@drawable/hint_popup" android:popupKeyboard="@xml/popup_punctuation" /> <Key android:codes="@integer/key_return" @@ -420,10 +429,12 @@ android:keyWidth="30%p" /> <Key android:keyLabel="." + android:keyIcon="@drawable/hint_popup" android:popupKeyboard="@xml/popup_punctuation" /> <Key android:keyLabel=":-)" android:keyOutputText=":-) " + android:keyIcon="@drawable/hint_popup" android:popupKeyboard="@xml/popup_smileys" android:keyWidth="25%p" android:keyEdgeFlags="right" /> @@ -455,6 +466,7 @@ android:iconPreview="@drawable/sym_keyboard_feedback_tab" /> <Key android:keyLabel="." + android:keyIcon="@drawable/hint_popup" android:popupKeyboard="@xml/popup_punctuation" /> <Key android:codes="@integer/key_return" diff --git a/java/res/xml-de/kbd_qwerty.xml b/java/res/xml-de/kbd_qwerty.xml index c28ec5e64..6f34b45f1 100644 --- a/java/res/xml-de/kbd_qwerty.xml +++ b/java/res/xml-de/kbd_qwerty.xml @@ -166,6 +166,7 @@ android:isModifier="true" /> <Key android:keyLabel="." + android:keyIcon="@drawable/hint_popup" android:popupKeyboard="@xml/popup_punctuation" android:isModifier="true" /> <Key @@ -198,6 +199,7 @@ android:isModifier="true" /> <Key android:keyLabel="." + android:keyIcon="@drawable/hint_popup" android:popupKeyboard="@xml/popup_punctuation" android:isModifier="true" /> <Key @@ -230,6 +232,7 @@ android:isModifier="true" /> <Key android:keyLabel="." + android:keyIcon="@drawable/hint_popup" android:popupKeyboard="@xml/popup_punctuation" android:isModifier="true" /> <Key @@ -262,11 +265,13 @@ android:isModifier="true" /> <Key android:keyLabel="." + android:keyIcon="@drawable/hint_popup" android:popupKeyboard="@xml/popup_punctuation" android:isModifier="true" /> <Key android:keyLabel=":-)" android:keyOutputText=":-) " + android:keyIcon="@drawable/hint_popup" android:popupKeyboard="@xml/popup_smileys" android:keyWidth="20%p" android:isModifier="true" @@ -300,6 +305,7 @@ android:isModifier="true" /> <Key android:keyLabel="." + android:keyIcon="@drawable/hint_popup" android:popupKeyboard="@xml/popup_punctuation" android:isModifier="true" /> <Key @@ -337,6 +343,7 @@ android:isModifier="true" /> <Key android:keyLabel="." + android:keyIcon="@drawable/hint_popup" android:popupKeyboard="@xml/popup_punctuation" android:isModifier="true" /> <Key @@ -374,6 +381,7 @@ android:isModifier="true" /> <Key android:keyLabel="." + android:keyIcon="@drawable/hint_popup" android:popupKeyboard="@xml/popup_punctuation" android:isModifier="true" /> <Key @@ -411,6 +419,7 @@ android:isModifier="true" /> <Key android:keyLabel="." + android:keyIcon="@drawable/hint_popup" android:popupKeyboard="@xml/popup_punctuation" android:isModifier="true" /> <Key @@ -448,11 +457,13 @@ android:isModifier="true" /> <Key android:keyLabel="." + android:keyIcon="@drawable/hint_popup" android:popupKeyboard="@xml/popup_punctuation" android:isModifier="true" /> <Key android:keyLabel=":-)" android:keyOutputText=":-) " + android:keyIcon="@drawable/hint_popup" android:popupKeyboard="@xml/popup_smileys" android:keyWidth="25%p" android:isModifier="true" @@ -490,6 +501,7 @@ android:isModifier="true" /> <Key android:keyLabel="." + android:keyIcon="@drawable/hint_popup" android:popupKeyboard="@xml/popup_punctuation" android:isModifier="true" /> <Key diff --git a/java/res/xml-de/kbd_qwerty_black.xml b/java/res/xml-de/kbd_qwerty_black.xml index 2c0d6d59d..833537019 100644 --- a/java/res/xml-de/kbd_qwerty_black.xml +++ b/java/res/xml-de/kbd_qwerty_black.xml @@ -162,6 +162,7 @@ android:keyWidth="40%p" /> <Key android:keyLabel="." + android:keyIcon="@drawable/hint_popup" android:popupKeyboard="@xml/popup_punctuation" /> <Key android:codes="@integer/key_return" @@ -189,6 +190,7 @@ android:keyWidth="40%p" /> <Key android:keyLabel="." + android:keyIcon="@drawable/hint_popup" android:popupKeyboard="@xml/popup_punctuation" /> <Key android:codes="@integer/key_return" @@ -216,6 +218,7 @@ android:keyWidth="40%p" /> <Key android:keyLabel="." + android:keyIcon="@drawable/hint_popup" android:popupKeyboard="@xml/popup_punctuation" /> <Key android:codes="@integer/key_return" @@ -243,10 +246,12 @@ android:keyWidth="40%p" /> <Key android:keyLabel="." + android:keyIcon="@drawable/hint_popup" android:popupKeyboard="@xml/popup_punctuation" /> <Key android:keyLabel=":-)" android:keyOutputText=":-) " + android:keyIcon="@drawable/hint_popup" android:popupKeyboard="@xml/popup_smileys" android:keyWidth="20%p" android:keyEdgeFlags="right" /> @@ -275,6 +280,7 @@ android:keyWidth="20%p" /> <Key android:keyLabel="." + android:keyIcon="@drawable/hint_popup" android:popupKeyboard="@xml/popup_punctuation" /> <Key android:codes="@integer/key_return" @@ -306,6 +312,7 @@ android:keyWidth="30%p" /> <Key android:keyLabel="." + android:keyIcon="@drawable/hint_popup" android:popupKeyboard="@xml/popup_punctuation" /> <Key android:codes="@integer/key_return" @@ -337,6 +344,7 @@ android:keyWidth="30%p" /> <Key android:keyLabel="." + android:keyIcon="@drawable/hint_popup" android:popupKeyboard="@xml/popup_punctuation" /> <Key android:codes="@integer/key_return" @@ -368,6 +376,7 @@ android:keyWidth="30%p" /> <Key android:keyLabel="." + android:keyIcon="@drawable/hint_popup" android:popupKeyboard="@xml/popup_punctuation" /> <Key android:codes="@integer/key_return" @@ -399,10 +408,12 @@ android:keyWidth="30%p" /> <Key android:keyLabel="." + android:keyIcon="@drawable/hint_popup" android:popupKeyboard="@xml/popup_punctuation" /> <Key android:keyLabel=":-)" android:keyOutputText=":-) " + android:keyIcon="@drawable/hint_popup" android:popupKeyboard="@xml/popup_smileys" android:keyWidth="25%p" android:keyEdgeFlags="right" /> @@ -434,6 +445,7 @@ android:iconPreview="@drawable/sym_keyboard_feedback_tab" /> <Key android:keyLabel="." + android:keyIcon="@drawable/hint_popup" android:popupKeyboard="@xml/popup_punctuation" /> <Key android:codes="@integer/key_return" diff --git a/java/res/xml-fr/kbd_qwerty.xml b/java/res/xml-fr/kbd_qwerty.xml index aca06ea24..9a2c75d8c 100644 --- a/java/res/xml-fr/kbd_qwerty.xml +++ b/java/res/xml-fr/kbd_qwerty.xml @@ -167,6 +167,7 @@ android:isModifier="true" /> <Key android:keyLabel="." + android:keyIcon="@drawable/hint_popup" android:popupKeyboard="@xml/popup_punctuation" android:isModifier="true" /> <Key @@ -199,6 +200,7 @@ android:isModifier="true" /> <Key android:keyLabel="." + android:keyIcon="@drawable/hint_popup" android:popupKeyboard="@xml/popup_punctuation" android:isModifier="true" /> <Key @@ -231,6 +233,7 @@ android:isModifier="true" /> <Key android:keyLabel="." + android:keyIcon="@drawable/hint_popup" android:popupKeyboard="@xml/popup_punctuation" android:isModifier="true" /> <Key @@ -263,11 +266,13 @@ android:isModifier="true" /> <Key android:keyLabel="." + android:keyIcon="@drawable/hint_popup" android:popupKeyboard="@xml/popup_punctuation" android:isModifier="true" /> <Key android:keyLabel=":-)" android:keyOutputText=":-) " + android:keyIcon="@drawable/hint_popup" android:popupKeyboard="@xml/popup_smileys" android:keyWidth="20%p" android:isModifier="true" @@ -301,6 +306,7 @@ android:isModifier="true" /> <Key android:keyLabel="." + android:keyIcon="@drawable/hint_popup" android:popupKeyboard="@xml/popup_punctuation" android:isModifier="true" /> <Key @@ -338,6 +344,7 @@ android:isModifier="true" /> <Key android:keyLabel="." + android:keyIcon="@drawable/hint_popup" android:popupKeyboard="@xml/popup_punctuation" android:isModifier="true" /> <Key @@ -375,6 +382,7 @@ android:isModifier="true" /> <Key android:keyLabel="." + android:keyIcon="@drawable/hint_popup" android:popupKeyboard="@xml/popup_punctuation" android:isModifier="true" /> <Key @@ -412,6 +420,7 @@ android:isModifier="true" /> <Key android:keyLabel="." + android:keyIcon="@drawable/hint_popup" android:popupKeyboard="@xml/popup_punctuation" android:isModifier="true" /> <Key @@ -449,11 +458,13 @@ android:isModifier="true" /> <Key android:keyLabel="." + android:keyIcon="@drawable/hint_popup" android:popupKeyboard="@xml/popup_punctuation" android:isModifier="true" /> <Key android:keyLabel=":-)" android:keyOutputText=":-) " + android:keyIcon="@drawable/hint_popup" android:popupKeyboard="@xml/popup_smileys" android:keyWidth="25%p" android:isModifier="true" @@ -491,6 +502,7 @@ android:isModifier="true" /> <Key android:keyLabel="." + android:keyIcon="@drawable/hint_popup" android:popupKeyboard="@xml/popup_punctuation" android:isModifier="true" /> <Key diff --git a/java/res/xml-fr/kbd_qwerty_black.xml b/java/res/xml-fr/kbd_qwerty_black.xml index 53eddaa40..f11c4a0ba 100644 --- a/java/res/xml-fr/kbd_qwerty_black.xml +++ b/java/res/xml-fr/kbd_qwerty_black.xml @@ -163,6 +163,7 @@ android:keyWidth="40%p" /> <Key android:keyLabel="." + android:keyIcon="@drawable/hint_popup" android:popupKeyboard="@xml/popup_punctuation" /> <Key android:codes="@integer/key_return" @@ -190,6 +191,7 @@ android:keyWidth="40%p" /> <Key android:keyLabel="." + android:keyIcon="@drawable/hint_popup" android:popupKeyboard="@xml/popup_punctuation" /> <Key android:codes="@integer/key_return" @@ -217,6 +219,7 @@ android:keyWidth="40%p" /> <Key android:keyLabel="." + android:keyIcon="@drawable/hint_popup" android:popupKeyboard="@xml/popup_punctuation" /> <Key android:codes="@integer/key_return" @@ -244,10 +247,12 @@ android:keyWidth="40%p" /> <Key android:keyLabel="." + android:keyIcon="@drawable/hint_popup" android:popupKeyboard="@xml/popup_punctuation" /> <Key android:keyLabel=":-)" android:keyOutputText=":-) " + android:keyIcon="@drawable/hint_popup" android:popupKeyboard="@xml/popup_smileys" android:keyWidth="20%p" android:keyEdgeFlags="right" /> @@ -276,6 +281,7 @@ android:keyWidth="20%p" /> <Key android:keyLabel="." + android:keyIcon="@drawable/hint_popup" android:popupKeyboard="@xml/popup_punctuation" /> <Key android:codes="@integer/key_return" @@ -307,6 +313,7 @@ android:keyWidth="30%p" /> <Key android:keyLabel="." + android:keyIcon="@drawable/hint_popup" android:popupKeyboard="@xml/popup_punctuation" /> <Key android:codes="@integer/key_return" @@ -338,6 +345,7 @@ android:keyWidth="30%p" /> <Key android:keyLabel="." + android:keyIcon="@drawable/hint_popup" android:popupKeyboard="@xml/popup_punctuation" /> <Key android:codes="@integer/key_return" @@ -369,6 +377,7 @@ android:keyWidth="30%p" /> <Key android:keyLabel="." + android:keyIcon="@drawable/hint_popup" android:popupKeyboard="@xml/popup_punctuation" /> <Key android:codes="@integer/key_return" @@ -400,10 +409,12 @@ android:keyWidth="30%p" /> <Key android:keyLabel="." + android:keyIcon="@drawable/hint_popup" android:popupKeyboard="@xml/popup_punctuation" /> <Key android:keyLabel=":-)" android:keyOutputText=":-) " + android:keyIcon="@drawable/hint_popup" android:popupKeyboard="@xml/popup_smileys" android:keyWidth="25%p" android:keyEdgeFlags="right" /> @@ -435,6 +446,7 @@ android:iconPreview="@drawable/sym_keyboard_feedback_tab" /> <Key android:keyLabel="." + android:keyIcon="@drawable/hint_popup" android:popupKeyboard="@xml/popup_punctuation" /> <Key android:codes="@integer/key_return" diff --git a/java/res/xml-iw/kbd_qwerty.xml b/java/res/xml-iw/kbd_qwerty.xml index b652b82bd..5d8338ae8 100644 --- a/java/res/xml-iw/kbd_qwerty.xml +++ b/java/res/xml-iw/kbd_qwerty.xml @@ -125,6 +125,7 @@ android:isModifier="true" /> <Key android:keyLabel="." + android:keyIcon="@drawable/hint_popup" android:popupKeyboard="@xml/popup_punctuation" android:isModifier="true" /> <Key @@ -157,6 +158,7 @@ android:isModifier="true" /> <Key android:keyLabel="." + android:keyIcon="@drawable/hint_popup" android:popupKeyboard="@xml/popup_punctuation" android:isModifier="true" /> <Key @@ -189,6 +191,7 @@ android:isModifier="true" /> <Key android:keyLabel="." + android:keyIcon="@drawable/hint_popup" android:popupKeyboard="@xml/popup_punctuation" android:isModifier="true" /> <Key @@ -221,11 +224,13 @@ android:isModifier="true" /> <Key android:keyLabel="." + android:keyIcon="@drawable/hint_popup" android:popupKeyboard="@xml/popup_punctuation" android:isModifier="true" /> <Key android:keyLabel=":-)" android:keyOutputText=":-) " + android:keyIcon="@drawable/hint_popup" android:popupKeyboard="@xml/popup_smileys" android:keyWidth="20%p" android:isModifier="true" @@ -259,6 +264,7 @@ android:isModifier="true" /> <Key android:keyLabel="." + android:keyIcon="@drawable/hint_popup" android:popupKeyboard="@xml/popup_punctuation" android:isModifier="true" /> <Key @@ -296,6 +302,7 @@ android:isModifier="true" /> <Key android:keyLabel="." + android:keyIcon="@drawable/hint_popup" android:popupKeyboard="@xml/popup_punctuation" android:isModifier="true" /> <Key @@ -333,6 +340,7 @@ android:isModifier="true" /> <Key android:keyLabel="." + android:keyIcon="@drawable/hint_popup" android:popupKeyboard="@xml/popup_punctuation" android:isModifier="true" /> <Key @@ -370,6 +378,7 @@ android:isModifier="true" /> <Key android:keyLabel="." + android:keyIcon="@drawable/hint_popup" android:popupKeyboard="@xml/popup_punctuation" android:isModifier="true" /> <Key @@ -407,11 +416,13 @@ android:isModifier="true" /> <Key android:keyLabel="." + android:keyIcon="@drawable/hint_popup" android:popupKeyboard="@xml/popup_punctuation" android:isModifier="true" /> <Key android:keyLabel=":-)" android:keyOutputText=":-) " + android:keyIcon="@drawable/hint_popup" android:popupKeyboard="@xml/popup_smileys" android:keyWidth="25%p" android:isModifier="true" @@ -449,6 +460,7 @@ android:isModifier="true" /> <Key android:keyLabel="." + android:keyIcon="@drawable/hint_popup" android:popupKeyboard="@xml/popup_punctuation" android:isModifier="true" /> <Key diff --git a/java/res/xml-iw/kbd_qwerty_black.xml b/java/res/xml-iw/kbd_qwerty_black.xml index f191133e0..eee6dc158 100644 --- a/java/res/xml-iw/kbd_qwerty_black.xml +++ b/java/res/xml-iw/kbd_qwerty_black.xml @@ -121,6 +121,7 @@ android:keyWidth="40%p" /> <Key android:keyLabel="." + android:keyIcon="@drawable/hint_popup" android:popupKeyboard="@xml/popup_punctuation" /> <Key android:codes="@integer/key_return" @@ -148,6 +149,7 @@ android:keyWidth="40%p" /> <Key android:keyLabel="." + android:keyIcon="@drawable/hint_popup" android:popupKeyboard="@xml/popup_punctuation" /> <Key android:codes="@integer/key_return" @@ -175,6 +177,7 @@ android:keyWidth="40%p" /> <Key android:keyLabel="." + android:keyIcon="@drawable/hint_popup" android:popupKeyboard="@xml/popup_punctuation" /> <Key android:codes="@integer/key_return" @@ -202,10 +205,12 @@ android:keyWidth="40%p" /> <Key android:keyLabel="." + android:keyIcon="@drawable/hint_popup" android:popupKeyboard="@xml/popup_punctuation" /> <Key android:keyLabel=":-)" android:keyOutputText=":-) " + android:keyIcon="@drawable/hint_popup" android:popupKeyboard="@xml/popup_smileys" android:keyWidth="20%p" android:keyEdgeFlags="right" /> @@ -234,6 +239,7 @@ android:keyWidth="20%p" /> <Key android:keyLabel="." + android:keyIcon="@drawable/hint_popup" android:popupKeyboard="@xml/popup_punctuation" /> <Key android:codes="@integer/key_return" @@ -265,6 +271,7 @@ android:keyWidth="30%p" /> <Key android:keyLabel="." + android:keyIcon="@drawable/hint_popup" android:popupKeyboard="@xml/popup_punctuation" /> <Key android:codes="@integer/key_return" @@ -296,6 +303,7 @@ android:keyWidth="30%p" /> <Key android:keyLabel="." + android:keyIcon="@drawable/hint_popup" android:popupKeyboard="@xml/popup_punctuation" /> <Key android:codes="@integer/key_return" @@ -327,6 +335,7 @@ android:keyWidth="30%p" /> <Key android:keyLabel="." + android:keyIcon="@drawable/hint_popup" android:popupKeyboard="@xml/popup_punctuation" /> <Key android:codes="@integer/key_return" @@ -358,10 +367,12 @@ android:keyWidth="30%p" /> <Key android:keyLabel="." + android:keyIcon="@drawable/hint_popup" android:popupKeyboard="@xml/popup_punctuation" /> <Key android:keyLabel=":-)" android:keyOutputText=":-) " + android:keyIcon="@drawable/hint_popup" android:popupKeyboard="@xml/popup_smileys" android:keyWidth="25%p" android:keyEdgeFlags="right" /> @@ -393,6 +404,7 @@ android:iconPreview="@drawable/sym_keyboard_feedback_tab" /> <Key android:keyLabel="." + android:keyIcon="@drawable/hint_popup" android:popupKeyboard="@xml/popup_punctuation" /> <Key android:codes="@integer/key_return" diff --git a/java/res/xml-nb/kbd_qwerty.xml b/java/res/xml-nb/kbd_qwerty.xml index 632ee6d15..14071d770 100644 --- a/java/res/xml-nb/kbd_qwerty.xml +++ b/java/res/xml-nb/kbd_qwerty.xml @@ -187,6 +187,7 @@ android:isModifier="true" /> <Key android:keyLabel="." + android:keyIcon="@drawable/hint_popup" android:popupKeyboard="@xml/popup_punctuation" android:isModifier="true" /> <Key @@ -219,6 +220,7 @@ android:isModifier="true" /> <Key android:keyLabel="." + android:keyIcon="@drawable/hint_popup" android:popupKeyboard="@xml/popup_punctuation" android:isModifier="true" /> <Key @@ -251,6 +253,7 @@ android:isModifier="true" /> <Key android:keyLabel="." + android:keyIcon="@drawable/hint_popup" android:popupKeyboard="@xml/popup_punctuation" android:isModifier="true" /> <Key @@ -283,11 +286,13 @@ android:isModifier="true" /> <Key android:keyLabel="." + android:keyIcon="@drawable/hint_popup" android:popupKeyboard="@xml/popup_punctuation" android:isModifier="true" /> <Key android:keyLabel=":-)" android:keyOutputText=":-) " + android:keyIcon="@drawable/hint_popup" android:popupKeyboard="@xml/popup_smileys" android:keyWidth="20%p" android:isModifier="true" @@ -321,6 +326,7 @@ android:isModifier="true" /> <Key android:keyLabel="." + android:keyIcon="@drawable/hint_popup" android:popupKeyboard="@xml/popup_punctuation" android:isModifier="true" /> <Key @@ -358,6 +364,7 @@ android:isModifier="true" /> <Key android:keyLabel="." + android:keyIcon="@drawable/hint_popup" android:popupKeyboard="@xml/popup_punctuation" android:isModifier="true" /> <Key @@ -395,6 +402,7 @@ android:isModifier="true" /> <Key android:keyLabel="." + android:keyIcon="@drawable/hint_popup" android:popupKeyboard="@xml/popup_punctuation" android:isModifier="true" /> <Key @@ -432,6 +440,7 @@ android:isModifier="true" /> <Key android:keyLabel="." + android:keyIcon="@drawable/hint_popup" android:popupKeyboard="@xml/popup_punctuation" android:isModifier="true" /> <Key @@ -469,11 +478,13 @@ android:isModifier="true" /> <Key android:keyLabel="." + android:keyIcon="@drawable/hint_popup" android:popupKeyboard="@xml/popup_punctuation" android:isModifier="true" /> <Key android:keyLabel=":-)" android:keyOutputText=":-) " + android:keyIcon="@drawable/hint_popup" android:popupKeyboard="@xml/popup_smileys" android:keyWidth="25%p" android:isModifier="true" @@ -511,6 +522,7 @@ android:isModifier="true" /> <Key android:keyLabel="." + android:keyIcon="@drawable/hint_popup" android:popupKeyboard="@xml/popup_punctuation" android:isModifier="true" /> <Key diff --git a/java/res/xml-nb/kbd_qwerty_black.xml b/java/res/xml-nb/kbd_qwerty_black.xml index 67d87500d..d90313a0b 100644 --- a/java/res/xml-nb/kbd_qwerty_black.xml +++ b/java/res/xml-nb/kbd_qwerty_black.xml @@ -183,6 +183,7 @@ android:keyWidth="40%p" /> <Key android:keyLabel="." + android:keyIcon="@drawable/hint_popup" android:popupKeyboard="@xml/popup_punctuation" /> <Key android:codes="@integer/key_return" @@ -210,6 +211,7 @@ android:keyWidth="40%p" /> <Key android:keyLabel="." + android:keyIcon="@drawable/hint_popup" android:popupKeyboard="@xml/popup_punctuation" /> <Key android:codes="@integer/key_return" @@ -237,6 +239,7 @@ android:keyWidth="40%p" /> <Key android:keyLabel="." + android:keyIcon="@drawable/hint_popup" android:popupKeyboard="@xml/popup_punctuation" /> <Key android:codes="@integer/key_return" @@ -264,10 +267,12 @@ android:keyWidth="40%p" /> <Key android:keyLabel="." + android:keyIcon="@drawable/hint_popup" android:popupKeyboard="@xml/popup_punctuation" /> <Key android:keyLabel=":-)" android:keyOutputText=":-) " + android:keyIcon="@drawable/hint_popup" android:popupKeyboard="@xml/popup_smileys" android:keyWidth="20%p" android:keyEdgeFlags="right" /> @@ -296,6 +301,7 @@ android:keyWidth="20%p" /> <Key android:keyLabel="." + android:keyIcon="@drawable/hint_popup" android:popupKeyboard="@xml/popup_punctuation" /> <Key android:codes="@integer/key_return" @@ -327,6 +333,7 @@ android:keyWidth="30%p" /> <Key android:keyLabel="." + android:keyIcon="@drawable/hint_popup" android:popupKeyboard="@xml/popup_punctuation" /> <Key android:codes="@integer/key_return" @@ -358,6 +365,7 @@ android:keyWidth="30%p" /> <Key android:keyLabel="." + android:keyIcon="@drawable/hint_popup" android:popupKeyboard="@xml/popup_punctuation" /> <Key android:codes="@integer/key_return" @@ -389,6 +397,7 @@ android:keyWidth="30%p" /> <Key android:keyLabel="." + android:keyIcon="@drawable/hint_popup" android:popupKeyboard="@xml/popup_punctuation" /> <Key android:codes="@integer/key_return" @@ -420,10 +429,12 @@ android:keyWidth="30%p" /> <Key android:keyLabel="." + android:keyIcon="@drawable/hint_popup" android:popupKeyboard="@xml/popup_punctuation" /> <Key android:keyLabel=":-)" android:keyOutputText=":-) " + android:keyIcon="@drawable/hint_popup" android:popupKeyboard="@xml/popup_smileys" android:keyWidth="25%p" android:keyEdgeFlags="right" /> @@ -455,6 +466,7 @@ android:iconPreview="@drawable/sym_keyboard_feedback_tab" /> <Key android:keyLabel="." + android:keyIcon="@drawable/hint_popup" android:popupKeyboard="@xml/popup_punctuation" /> <Key android:codes="@integer/key_return" diff --git a/java/res/xml-ru/kbd_qwerty.xml b/java/res/xml-ru/kbd_qwerty.xml index ed44e769b..c0b98bafa 100644 --- a/java/res/xml-ru/kbd_qwerty.xml +++ b/java/res/xml-ru/kbd_qwerty.xml @@ -165,6 +165,7 @@ android:isModifier="true" /> <Key android:keyLabel="." + android:keyIcon="@drawable/hint_popup" android:popupKeyboard="@xml/popup_punctuation" android:isModifier="true" /> <Key @@ -197,6 +198,7 @@ android:isModifier="true" /> <Key android:keyLabel="." + android:keyIcon="@drawable/hint_popup" android:popupKeyboard="@xml/popup_punctuation" android:isModifier="true" /> <Key @@ -229,6 +231,7 @@ android:isModifier="true" /> <Key android:keyLabel="." + android:keyIcon="@drawable/hint_popup" android:popupKeyboard="@xml/popup_punctuation" android:isModifier="true" /> <Key @@ -261,11 +264,13 @@ android:isModifier="true" /> <Key android:keyLabel="." + android:keyIcon="@drawable/hint_popup" android:popupKeyboard="@xml/popup_punctuation" android:isModifier="true" /> <Key android:keyLabel=":-)" android:keyOutputText=":-) " + android:keyIcon="@drawable/hint_popup" android:popupKeyboard="@xml/popup_smileys" android:keyWidth="20%p" android:isModifier="true" @@ -299,6 +304,7 @@ android:isModifier="true" /> <Key android:keyLabel="." + android:keyIcon="@drawable/hint_popup" android:popupKeyboard="@xml/popup_punctuation" android:isModifier="true" /> <Key @@ -336,6 +342,7 @@ android:isModifier="true" /> <Key android:keyLabel="." + android:keyIcon="@drawable/hint_popup" android:popupKeyboard="@xml/popup_punctuation" android:isModifier="true" /> <Key @@ -373,6 +380,7 @@ android:isModifier="true" /> <Key android:keyLabel="." + android:keyIcon="@drawable/hint_popup" android:popupKeyboard="@xml/popup_punctuation" android:isModifier="true" /> <Key @@ -410,6 +418,7 @@ android:isModifier="true" /> <Key android:keyLabel="." + android:keyIcon="@drawable/hint_popup" android:popupKeyboard="@xml/popup_punctuation" android:isModifier="true" /> <Key @@ -447,11 +456,13 @@ android:isModifier="true" /> <Key android:keyLabel="." + android:keyIcon="@drawable/hint_popup" android:popupKeyboard="@xml/popup_punctuation" android:isModifier="true" /> <Key android:keyLabel=":-)" android:keyOutputText=":-) " + android:keyIcon="@drawable/hint_popup" android:popupKeyboard="@xml/popup_smileys" android:keyWidth="25%p" android:isModifier="true" @@ -489,6 +500,7 @@ android:isModifier="true" /> <Key android:keyLabel="." + android:keyIcon="@drawable/hint_popup" android:popupKeyboard="@xml/popup_punctuation" android:isModifier="true" /> <Key diff --git a/java/res/xml-ru/kbd_qwerty_black.xml b/java/res/xml-ru/kbd_qwerty_black.xml index 62ce7d692..94a450cfa 100644 --- a/java/res/xml-ru/kbd_qwerty_black.xml +++ b/java/res/xml-ru/kbd_qwerty_black.xml @@ -161,6 +161,7 @@ android:keyWidth="40%p" /> <Key android:keyLabel="." + android:keyIcon="@drawable/hint_popup" android:popupKeyboard="@xml/popup_punctuation" /> <Key android:codes="@integer/key_return" @@ -188,6 +189,7 @@ android:keyWidth="40%p" /> <Key android:keyLabel="." + android:keyIcon="@drawable/hint_popup" android:popupKeyboard="@xml/popup_punctuation" /> <Key android:codes="@integer/key_return" @@ -215,6 +217,7 @@ android:keyWidth="40%p" /> <Key android:keyLabel="." + android:keyIcon="@drawable/hint_popup" android:popupKeyboard="@xml/popup_punctuation" /> <Key android:codes="@integer/key_return" @@ -242,10 +245,12 @@ android:keyWidth="40%p" /> <Key android:keyLabel="." + android:keyIcon="@drawable/hint_popup" android:popupKeyboard="@xml/popup_punctuation" /> <Key android:keyLabel=":-)" android:keyOutputText=":-) " + android:keyIcon="@drawable/hint_popup" android:popupKeyboard="@xml/popup_smileys" android:keyWidth="20%p" android:keyEdgeFlags="right" /> @@ -274,6 +279,7 @@ android:keyWidth="20%p" /> <Key android:keyLabel="." + android:keyIcon="@drawable/hint_popup" android:popupKeyboard="@xml/popup_punctuation" /> <Key android:codes="@integer/key_return" @@ -305,6 +311,7 @@ android:keyWidth="30%p" /> <Key android:keyLabel="." + android:keyIcon="@drawable/hint_popup" android:popupKeyboard="@xml/popup_punctuation" /> <Key android:codes="@integer/key_return" @@ -336,6 +343,7 @@ android:keyWidth="30%p" /> <Key android:keyLabel="." + android:keyIcon="@drawable/hint_popup" android:popupKeyboard="@xml/popup_punctuation" /> <Key android:codes="@integer/key_return" @@ -367,6 +375,7 @@ android:keyWidth="30%p" /> <Key android:keyLabel="." + android:keyIcon="@drawable/hint_popup" android:popupKeyboard="@xml/popup_punctuation" /> <Key android:codes="@integer/key_return" @@ -398,10 +407,12 @@ android:keyWidth="30%p" /> <Key android:keyLabel="." + android:keyIcon="@drawable/hint_popup" android:popupKeyboard="@xml/popup_punctuation" /> <Key android:keyLabel=":-)" android:keyOutputText=":-) " + android:keyIcon="@drawable/hint_popup" android:popupKeyboard="@xml/popup_smileys" android:keyWidth="25%p" android:keyEdgeFlags="right" /> @@ -433,6 +444,7 @@ android:iconPreview="@drawable/sym_keyboard_feedback_tab" /> <Key android:keyLabel="." + android:keyIcon="@drawable/hint_popup" android:popupKeyboard="@xml/popup_punctuation" /> <Key android:codes="@integer/key_return" diff --git a/java/res/xml-sr/kbd_qwerty.xml b/java/res/xml-sr/kbd_qwerty.xml index e3279dc5d..464c74f40 100644 --- a/java/res/xml-sr/kbd_qwerty.xml +++ b/java/res/xml-sr/kbd_qwerty.xml @@ -158,6 +158,7 @@ android:isModifier="true" /> <Key android:keyLabel="." + android:keyIcon="@drawable/hint_popup" android:popupKeyboard="@xml/popup_punctuation" android:isModifier="true" /> <Key @@ -190,6 +191,7 @@ android:isModifier="true" /> <Key android:keyLabel="." + android:keyIcon="@drawable/hint_popup" android:popupKeyboard="@xml/popup_punctuation" android:isModifier="true" /> <Key @@ -222,6 +224,7 @@ android:isModifier="true" /> <Key android:keyLabel="." + android:keyIcon="@drawable/hint_popup" android:popupKeyboard="@xml/popup_punctuation" android:isModifier="true" /> <Key @@ -254,11 +257,13 @@ android:isModifier="true" /> <Key android:keyLabel="." + android:keyIcon="@drawable/hint_popup" android:popupKeyboard="@xml/popup_punctuation" android:isModifier="true" /> <Key android:keyLabel=":-)" android:keyOutputText=":-) " + android:keyIcon="@drawable/hint_popup" android:popupKeyboard="@xml/popup_smileys" android:keyWidth="20%p" android:isModifier="true" @@ -292,6 +297,7 @@ android:isModifier="true" /> <Key android:keyLabel="." + android:keyIcon="@drawable/hint_popup" android:popupKeyboard="@xml/popup_punctuation" android:isModifier="true" /> <Key @@ -329,6 +335,7 @@ android:isModifier="true" /> <Key android:keyLabel="." + android:keyIcon="@drawable/hint_popup" android:popupKeyboard="@xml/popup_punctuation" android:isModifier="true" /> <Key @@ -366,6 +373,7 @@ android:isModifier="true" /> <Key android:keyLabel="." + android:keyIcon="@drawable/hint_popup" android:popupKeyboard="@xml/popup_punctuation" android:isModifier="true" /> <Key @@ -403,6 +411,7 @@ android:isModifier="true" /> <Key android:keyLabel="." + android:keyIcon="@drawable/hint_popup" android:popupKeyboard="@xml/popup_punctuation" android:isModifier="true" /> <Key @@ -440,11 +449,13 @@ android:isModifier="true" /> <Key android:keyLabel="." + android:keyIcon="@drawable/hint_popup" android:popupKeyboard="@xml/popup_punctuation" android:isModifier="true" /> <Key android:keyLabel=":-)" android:keyOutputText=":-) " + android:keyIcon="@drawable/hint_popup" android:popupKeyboard="@xml/popup_smileys" android:keyWidth="25%p" android:isModifier="true" @@ -482,6 +493,7 @@ android:isModifier="true" /> <Key android:keyLabel="." + android:keyIcon="@drawable/hint_popup" android:popupKeyboard="@xml/popup_punctuation" android:isModifier="true" /> <Key diff --git a/java/res/xml-sr/kbd_qwerty_black.xml b/java/res/xml-sr/kbd_qwerty_black.xml index b485360b0..2ffa240f5 100644 --- a/java/res/xml-sr/kbd_qwerty_black.xml +++ b/java/res/xml-sr/kbd_qwerty_black.xml @@ -154,6 +154,7 @@ android:keyWidth="40%p" /> <Key android:keyLabel="." + android:keyIcon="@drawable/hint_popup" android:popupKeyboard="@xml/popup_punctuation" /> <Key android:codes="@integer/key_return" @@ -181,6 +182,7 @@ android:keyWidth="40%p" /> <Key android:keyLabel="." + android:keyIcon="@drawable/hint_popup" android:popupKeyboard="@xml/popup_punctuation" /> <Key android:codes="@integer/key_return" @@ -208,6 +210,7 @@ android:keyWidth="40%p" /> <Key android:keyLabel="." + android:keyIcon="@drawable/hint_popup" android:popupKeyboard="@xml/popup_punctuation" /> <Key android:codes="@integer/key_return" @@ -235,10 +238,12 @@ android:keyWidth="40%p" /> <Key android:keyLabel="." + android:keyIcon="@drawable/hint_popup" android:popupKeyboard="@xml/popup_punctuation" /> <Key android:keyLabel=":-)" android:keyOutputText=":-) " + android:keyIcon="@drawable/hint_popup" android:popupKeyboard="@xml/popup_smileys" android:keyWidth="20%p" android:keyEdgeFlags="right" /> @@ -267,6 +272,7 @@ android:keyWidth="20%p" /> <Key android:keyLabel="." + android:keyIcon="@drawable/hint_popup" android:popupKeyboard="@xml/popup_punctuation" /> <Key android:codes="@integer/key_return" @@ -298,6 +304,7 @@ android:keyWidth="30%p" /> <Key android:keyLabel="." + android:keyIcon="@drawable/hint_popup" android:popupKeyboard="@xml/popup_punctuation" /> <Key android:codes="@integer/key_return" @@ -329,6 +336,7 @@ android:keyWidth="30%p" /> <Key android:keyLabel="." + android:keyIcon="@drawable/hint_popup" android:popupKeyboard="@xml/popup_punctuation" /> <Key android:codes="@integer/key_return" @@ -360,6 +368,7 @@ android:keyWidth="30%p" /> <Key android:keyLabel="." + android:keyIcon="@drawable/hint_popup" android:popupKeyboard="@xml/popup_punctuation" /> <Key android:codes="@integer/key_return" @@ -391,10 +400,12 @@ android:keyWidth="30%p" /> <Key android:keyLabel="." + android:keyIcon="@drawable/hint_popup" android:popupKeyboard="@xml/popup_punctuation" /> <Key android:keyLabel=":-)" android:keyOutputText=":-) " + android:keyIcon="@drawable/hint_popup" android:popupKeyboard="@xml/popup_smileys" android:keyWidth="25%p" android:keyEdgeFlags="right" /> @@ -426,6 +437,7 @@ android:iconPreview="@drawable/sym_keyboard_feedback_tab" /> <Key android:keyLabel="." + android:keyIcon="@drawable/hint_popup" android:popupKeyboard="@xml/popup_punctuation" /> <Key android:codes="@integer/key_return" diff --git a/java/res/xml-sv/kbd_qwerty.xml b/java/res/xml-sv/kbd_qwerty.xml index f8a7e9475..0fc80a341 100644 --- a/java/res/xml-sv/kbd_qwerty.xml +++ b/java/res/xml-sv/kbd_qwerty.xml @@ -188,6 +188,7 @@ android:isModifier="true" /> <Key android:keyLabel="." + android:keyIcon="@drawable/hint_popup" android:popupKeyboard="@xml/popup_punctuation" android:isModifier="true" /> <Key @@ -220,6 +221,7 @@ android:isModifier="true" /> <Key android:keyLabel="." + android:keyIcon="@drawable/hint_popup" android:popupKeyboard="@xml/popup_punctuation" android:isModifier="true" /> <Key @@ -252,6 +254,7 @@ android:isModifier="true" /> <Key android:keyLabel="." + android:keyIcon="@drawable/hint_popup" android:popupKeyboard="@xml/popup_punctuation" android:isModifier="true" /> <Key @@ -284,11 +287,13 @@ android:isModifier="true" /> <Key android:keyLabel="." + android:keyIcon="@drawable/hint_popup" android:popupKeyboard="@xml/popup_punctuation" android:isModifier="true" /> <Key android:keyLabel=":-)" android:keyOutputText=":-) " + android:keyIcon="@drawable/hint_popup" android:popupKeyboard="@xml/popup_smileys" android:keyWidth="20%p" android:isModifier="true" @@ -322,6 +327,7 @@ android:isModifier="true" /> <Key android:keyLabel="." + android:keyIcon="@drawable/hint_popup" android:popupKeyboard="@xml/popup_punctuation" android:isModifier="true" /> <Key @@ -359,6 +365,7 @@ android:isModifier="true" /> <Key android:keyLabel="." + android:keyIcon="@drawable/hint_popup" android:popupKeyboard="@xml/popup_punctuation" android:isModifier="true" /> <Key @@ -396,6 +403,7 @@ android:isModifier="true" /> <Key android:keyLabel="." + android:keyIcon="@drawable/hint_popup" android:popupKeyboard="@xml/popup_punctuation" android:isModifier="true" /> <Key @@ -433,6 +441,7 @@ android:isModifier="true" /> <Key android:keyLabel="." + android:keyIcon="@drawable/hint_popup" android:popupKeyboard="@xml/popup_punctuation" android:isModifier="true" /> <Key @@ -470,11 +479,13 @@ android:isModifier="true" /> <Key android:keyLabel="." + android:keyIcon="@drawable/hint_popup" android:popupKeyboard="@xml/popup_punctuation" android:isModifier="true" /> <Key android:keyLabel=":-)" android:keyOutputText=":-) " + android:keyIcon="@drawable/hint_popup" android:popupKeyboard="@xml/popup_smileys" android:keyWidth="25%p" android:isModifier="true" @@ -512,6 +523,7 @@ android:isModifier="true" /> <Key android:keyLabel="." + android:keyIcon="@drawable/hint_popup" android:popupKeyboard="@xml/popup_punctuation" android:isModifier="true" /> <Key diff --git a/java/res/xml-sv/kbd_qwerty_black.xml b/java/res/xml-sv/kbd_qwerty_black.xml index 0141c2b05..d03fb773a 100644 --- a/java/res/xml-sv/kbd_qwerty_black.xml +++ b/java/res/xml-sv/kbd_qwerty_black.xml @@ -185,6 +185,7 @@ android:keyWidth="40%p" /> <Key android:keyLabel="." + android:keyIcon="@drawable/hint_popup" android:popupKeyboard="@xml/popup_punctuation" /> <Key android:codes="@integer/key_return" @@ -212,6 +213,7 @@ android:keyWidth="40%p" /> <Key android:keyLabel="." + android:keyIcon="@drawable/hint_popup" android:popupKeyboard="@xml/popup_punctuation" /> <Key android:codes="@integer/key_return" @@ -239,6 +241,7 @@ android:keyWidth="40%p" /> <Key android:keyLabel="." + android:keyIcon="@drawable/hint_popup" android:popupKeyboard="@xml/popup_punctuation" /> <Key android:codes="@integer/key_return" @@ -266,10 +269,12 @@ android:keyWidth="40%p" /> <Key android:keyLabel="." + android:keyIcon="@drawable/hint_popup" android:popupKeyboard="@xml/popup_punctuation" /> <Key android:keyLabel=":-)" android:keyOutputText=":-) " + android:keyIcon="@drawable/hint_popup" android:popupKeyboard="@xml/popup_smileys" android:keyWidth="20%p" android:keyEdgeFlags="right" /> @@ -298,6 +303,7 @@ android:keyWidth="20%p" /> <Key android:keyLabel="." + android:keyIcon="@drawable/hint_popup" android:popupKeyboard="@xml/popup_punctuation" /> <Key android:codes="@integer/key_return" @@ -329,6 +335,7 @@ android:keyWidth="30%p" /> <Key android:keyLabel="." + android:keyIcon="@drawable/hint_popup" android:popupKeyboard="@xml/popup_punctuation" /> <Key android:codes="@integer/key_return" @@ -360,6 +367,7 @@ android:keyWidth="30%p" /> <Key android:keyLabel="." + android:keyIcon="@drawable/hint_popup" android:popupKeyboard="@xml/popup_punctuation" /> <Key android:codes="@integer/key_return" @@ -391,6 +399,7 @@ android:keyWidth="30%p" /> <Key android:keyLabel="." + android:keyIcon="@drawable/hint_popup" android:popupKeyboard="@xml/popup_punctuation" /> <Key android:codes="@integer/key_return" @@ -422,10 +431,12 @@ android:keyWidth="30%p" /> <Key android:keyLabel="." + android:keyIcon="@drawable/hint_popup" android:popupKeyboard="@xml/popup_punctuation" /> <Key android:keyLabel=":-)" android:keyOutputText=":-) " + android:keyIcon="@drawable/hint_popup" android:popupKeyboard="@xml/popup_smileys" android:keyWidth="25%p" android:keyEdgeFlags="right" /> @@ -457,6 +468,7 @@ android:iconPreview="@drawable/sym_keyboard_feedback_tab" /> <Key android:keyLabel="." + android:keyIcon="@drawable/hint_popup" android:popupKeyboard="@xml/popup_punctuation" /> <Key android:codes="@integer/key_return" diff --git a/java/res/xml/kbd_qwerty.xml b/java/res/xml/kbd_qwerty.xml index d5090b3c7..a4ab0f8fe 100644 --- a/java/res/xml/kbd_qwerty.xml +++ b/java/res/xml/kbd_qwerty.xml @@ -165,6 +165,7 @@ android:isModifier="true" /> <Key android:keyLabel="." + android:keyIcon="@drawable/hint_popup" android:popupKeyboard="@xml/popup_punctuation" android:isModifier="true" /> <Key @@ -196,6 +197,7 @@ android:isModifier="true" /> <Key android:keyLabel="." + android:keyIcon="@drawable/hint_popup" android:popupKeyboard="@xml/popup_punctuation" android:isModifier="true" /> <Key @@ -227,6 +229,7 @@ android:isModifier="true" /> <Key android:keyLabel="." + android:keyIcon="@drawable/hint_popup" android:popupKeyboard="@xml/popup_punctuation" android:isModifier="true" /> <Key @@ -258,11 +261,13 @@ android:isModifier="true" /> <Key android:keyLabel="." + android:keyIcon="@drawable/hint_popup" android:popupKeyboard="@xml/popup_punctuation" android:isModifier="true" /> <Key android:keyLabel=":-)" android:keyOutputText=":-) " + android:keyIcon="@drawable/hint_popup" android:popupKeyboard="@xml/popup_smileys" android:keyWidth="20%p" android:isModifier="true" @@ -295,6 +300,7 @@ android:isModifier="true" /> <Key android:keyLabel="." + android:keyIcon="@drawable/hint_popup" android:popupKeyboard="@xml/popup_punctuation" android:isModifier="true" /> <Key @@ -331,6 +337,7 @@ android:isModifier="true" /> <Key android:keyLabel="." + android:keyIcon="@drawable/hint_popup" android:popupKeyboard="@xml/popup_punctuation" android:isModifier="true" /> <Key @@ -367,6 +374,7 @@ android:isModifier="true" /> <Key android:keyLabel="." + android:keyIcon="@drawable/hint_popup" android:popupKeyboard="@xml/popup_punctuation" android:isModifier="true" /> <Key @@ -403,6 +411,7 @@ android:isModifier="true" /> <Key android:keyLabel="." + android:keyIcon="@drawable/hint_popup" android:popupKeyboard="@xml/popup_punctuation" android:isModifier="true" /> <Key @@ -439,11 +448,13 @@ android:isModifier="true" /> <Key android:keyLabel="." + android:keyIcon="@drawable/hint_popup" android:popupKeyboard="@xml/popup_punctuation" android:isModifier="true" /> <Key android:keyLabel=":-)" android:keyOutputText=":-) " + android:keyIcon="@drawable/hint_popup" android:popupKeyboard="@xml/popup_smileys" android:keyWidth="25%p" android:isModifier="true" @@ -480,6 +491,7 @@ android:isModifier="true" /> <Key android:keyLabel="." + android:keyIcon="@drawable/hint_popup" android:popupKeyboard="@xml/popup_punctuation" android:isModifier="true" /> <Key diff --git a/java/res/xml/kbd_qwerty_black.xml b/java/res/xml/kbd_qwerty_black.xml index c5de4d462..787e4ef7c 100644 --- a/java/res/xml/kbd_qwerty_black.xml +++ b/java/res/xml/kbd_qwerty_black.xml @@ -161,6 +161,7 @@ android:keyWidth="40%p" /> <Key android:keyLabel="." + android:keyIcon="@drawable/hint_popup" android:popupKeyboard="@xml/popup_punctuation" /> <Key android:codes="@integer/key_return" @@ -187,6 +188,7 @@ android:keyWidth="40%p" /> <Key android:keyLabel="." + android:keyIcon="@drawable/hint_popup" android:popupKeyboard="@xml/popup_punctuation" /> <Key android:codes="@integer/key_return" @@ -213,6 +215,7 @@ android:keyWidth="40%p" /> <Key android:keyLabel="." + android:keyIcon="@drawable/hint_popup" android:popupKeyboard="@xml/popup_punctuation" /> <Key android:codes="@integer/key_return" @@ -239,10 +242,12 @@ android:keyWidth="40%p" /> <Key android:keyLabel="." + android:keyIcon="@drawable/hint_popup" android:popupKeyboard="@xml/popup_punctuation" /> <Key android:keyLabel=":-)" android:keyOutputText=":-) " + android:keyIcon="@drawable/hint_popup" android:popupKeyboard="@xml/popup_smileys" android:keyWidth="20%p" android:keyEdgeFlags="right" /> @@ -270,6 +275,7 @@ android:keyWidth="20%p" /> <Key android:keyLabel="." + android:keyIcon="@drawable/hint_popup" android:popupKeyboard="@xml/popup_punctuation" /> <Key android:codes="@integer/key_return" @@ -300,6 +306,7 @@ android:keyWidth="30%p" /> <Key android:keyLabel="." + android:keyIcon="@drawable/hint_popup" android:popupKeyboard="@xml/popup_punctuation" /> <Key android:codes="@integer/key_return" @@ -330,6 +337,7 @@ android:keyWidth="30%p" /> <Key android:keyLabel="." + android:keyIcon="@drawable/hint_popup" android:popupKeyboard="@xml/popup_punctuation" /> <Key android:codes="@integer/key_return" @@ -360,6 +368,7 @@ android:keyWidth="30%p" /> <Key android:keyLabel="." + android:keyIcon="@drawable/hint_popup" android:popupKeyboard="@xml/popup_punctuation" /> <Key android:codes="@integer/key_return" @@ -390,10 +399,12 @@ android:keyWidth="30%p" /> <Key android:keyLabel="." + android:keyIcon="@drawable/hint_popup" android:popupKeyboard="@xml/popup_punctuation" /> <Key android:keyLabel=":-)" android:keyOutputText=":-) " + android:keyIcon="@drawable/hint_popup" android:popupKeyboard="@xml/popup_smileys" android:keyWidth="25%p" android:keyEdgeFlags="right" /> @@ -424,6 +435,7 @@ android:iconPreview="@drawable/sym_keyboard_feedback_tab" /> <Key android:keyLabel="." + android:keyIcon="@drawable/hint_popup" android:popupKeyboard="@xml/popup_punctuation" /> <Key android:codes="@integer/key_return" diff --git a/java/res/xml/kbd_symbols.xml b/java/res/xml/kbd_symbols.xml index dfc5bd0ec..bcb6e8ae8 100644 --- a/java/res/xml/kbd_symbols.xml +++ b/java/res/xml/kbd_symbols.xml @@ -163,6 +163,7 @@ android:isModifier="true" /> <Key android:keyLabel="." + android:keyIcon="@drawable/hint_popup" android:popupKeyboard="@xml/popup_punctuation" android:isModifier="true" /> <Key @@ -199,6 +200,7 @@ android:isModifier="true" /> <Key android:keyLabel="." + android:keyIcon="@drawable/hint_popup" android:popupKeyboard="@xml/popup_punctuation" android:isModifier="true" /> <Key diff --git a/java/res/xml/kbd_symbols_black.xml b/java/res/xml/kbd_symbols_black.xml index add7f9fb2..add6c01c5 100644 --- a/java/res/xml/kbd_symbols_black.xml +++ b/java/res/xml/kbd_symbols_black.xml @@ -159,6 +159,7 @@ android:keyWidth="40%p" /> <Key android:keyLabel="." + android:keyIcon="@drawable/hint_popup" android:popupKeyboard="@xml/popup_punctuation" /> <Key android:codes="@integer/key_return" @@ -189,6 +190,7 @@ android:keyWidth="30%p" /> <Key android:keyLabel="." + android:keyIcon="@drawable/hint_popup" android:popupKeyboard="@xml/popup_punctuation" /> <Key android:codes="@integer/key_return" diff --git a/java/src/com/android/inputmethod/latin/LatinKeyboard.java b/java/src/com/android/inputmethod/latin/LatinKeyboard.java index d04fc586a..096f3e702 100644 --- a/java/src/com/android/inputmethod/latin/LatinKeyboard.java +++ b/java/src/com/android/inputmethod/latin/LatinKeyboard.java @@ -61,7 +61,7 @@ public class LatinKeyboard extends Keyboard { private Key mShiftKey; private Key mEnterKey; private Key mF1Key; - private final Drawable mF1HintIcon; + private final Drawable mHintIcon; private Key mSpaceKey; private Key m123Key; private final int NUMBER_HINT_COUNT = 10; @@ -138,7 +138,7 @@ public class LatinKeyboard extends Keyboard { mButtonArrowRightIcon = res.getDrawable(R.drawable.sym_keyboard_language_arrows_right); m123MicIcon = res.getDrawable(R.drawable.sym_keyboard_123_mic); m123MicPreviewIcon = res.getDrawable(R.drawable.sym_keyboard_feedback_123_mic); - mF1HintIcon = res.getDrawable(R.drawable.hint_settings); + mHintIcon = res.getDrawable(R.drawable.hint_popup); setDefaultBounds(m123MicPreviewIcon); sSpacebarVerticalCorrection = res.getDimensionPixelOffset( R.dimen.spacebar_vertical_correction); @@ -241,7 +241,7 @@ public class LatinKeyboard extends Keyboard { break; default: if (mode == KeyboardSwitcher.MODE_IM) { - mEnterKey.icon = null; + mEnterKey.icon = mHintIcon; mEnterKey.iconPreview = null; mEnterKey.label = ":-)"; mEnterKey.text = ":-) "; @@ -403,9 +403,9 @@ public class LatinKeyboard extends Keyboard { } private void setMicF1Key(Key key) { - // HACK: draw mMicIcon and mF1HintIcon at the same time + // HACK: draw mMicIcon and mHintIcon at the same time final Drawable micWithSettingsHintDrawable = new BitmapDrawable(mRes, - drawSynthesizedSettingsHintImage(key.width, key.height, mMicIcon, mF1HintIcon)); + drawSynthesizedSettingsHintImage(key.width, key.height, mMicIcon, mHintIcon)); key.label = null; key.codes = new int[] { LatinKeyboardView.KEYCODE_VOICE }; @@ -418,7 +418,7 @@ public class LatinKeyboard extends Keyboard { key.label = label; key.codes = new int[] { label.charAt(0) }; key.popupResId = popupResId; - key.icon = mF1HintIcon; + key.icon = mHintIcon; key.iconPreview = null; } @@ -426,6 +426,10 @@ public class LatinKeyboard extends Keyboard { return key == mF1Key; } + public static boolean hasPuncOrSmileysPopup(Key key) { + return key.popupResId == R.xml.popup_punctuation || key.popupResId == R.xml.popup_smileys; + } + /** * @return a key which should be invalidated. */ diff --git a/java/src/com/android/inputmethod/latin/LatinKeyboardBaseView.java b/java/src/com/android/inputmethod/latin/LatinKeyboardBaseView.java index b1b82b64d..5a015e93b 100644 --- a/java/src/com/android/inputmethod/latin/LatinKeyboardBaseView.java +++ b/java/src/com/android/inputmethod/latin/LatinKeyboardBaseView.java @@ -56,6 +56,8 @@ import java.util.WeakHashMap; * A view that renders a virtual {@link LatinKeyboard}. It handles rendering of keys and * detecting key presses and touch movements. * + * TODO: References to LatinKeyboard in this class should be replaced with ones to its base class. + * * @attr ref R.styleable#LatinKeyboardBaseView_keyBackground * @attr ref R.styleable#LatinKeyboardBaseView_keyPreviewLayout * @attr ref R.styleable#LatinKeyboardBaseView_keyPreviewOffset @@ -849,8 +851,8 @@ public class LatinKeyboardBaseView extends View implements PointerTracker.UIProx paint.setShadowLayer(0, 0, 0, 0); // Usually don't draw icon if label is not null, but we draw icon for the number - // hint. - shouldDrawIcon = isNonMicLatinF1KeyOrNumberAtEdgeOfPopupChars(key); + // hint and popup hint. + shouldDrawIcon = shouldDrawLabelAndIcon(key); } if (key.icon != null && shouldDrawIcon) { // Special handing for the upper-right number hint icons @@ -858,7 +860,7 @@ public class LatinKeyboardBaseView extends View implements PointerTracker.UIProx final int drawableHeight; final int drawableX; final int drawableY; - if (isLatinF1KeyOrNumberAtEdgeOfPopupChars(key)) { + if (shouldDrawIconFully(key)) { drawableWidth = key.width; drawableHeight = key.height; drawableX = 0; @@ -866,10 +868,8 @@ public class LatinKeyboardBaseView extends View implements PointerTracker.UIProx } else { drawableWidth = key.icon.getIntrinsicWidth(); drawableHeight = key.icon.getIntrinsicHeight(); - drawableX = (key.width - padding.left - padding.right - drawableWidth) - / 2 + padding.left; - drawableY = (key.height - padding.top - padding.bottom - drawableHeight) - / 2 + padding.top; + drawableX = (key.width + padding.left - padding.right - drawableWidth) / 2; + drawableY = (key.height + padding.top - padding.bottom - drawableHeight) / 2; } canvas.translate(drawableX, drawableY); key.icon.setBounds(0, 0, drawableWidth, drawableHeight); @@ -942,8 +942,8 @@ public class LatinKeyboardBaseView extends View implements PointerTracker.UIProx Key key = tracker.getKey(keyIndex); if (key == null) return; - // Should not draw number hint icons - if (key.icon != null && !isNonMicLatinF1KeyOrNumberAtEdgeOfPopupChars(key)) { + // Should not draw hint icon in key preview + if (key.icon != null && !shouldDrawLabelAndIcon(key)) { mPreviewText.setCompoundDrawables(null, null, null, key.iconPreview != null ? key.iconPreview : key.icon); mPreviewText.setText(null); @@ -1226,12 +1226,14 @@ public class LatinKeyboardBaseView extends View implements PointerTracker.UIProx return false; } - private boolean isLatinF1KeyOrNumberAtEdgeOfPopupChars(Key key) { - return isNumberAtEdgeOfPopupChars(key) || isLatinF1Key(key); + private boolean shouldDrawIconFully(Key key) { + return isNumberAtEdgeOfPopupChars(key) || isLatinF1Key(key) + || LatinKeyboard.hasPuncOrSmileysPopup(key); } - private boolean isNonMicLatinF1KeyOrNumberAtEdgeOfPopupChars(Key key) { - return isNumberAtEdgeOfPopupChars(key) || isNonMicLatinF1Key(key); + private boolean shouldDrawLabelAndIcon(Key key) { + return isNumberAtEdgeOfPopupChars(key) || isNonMicLatinF1Key(key) + || LatinKeyboard.hasPuncOrSmileysPopup(key); } private boolean isLatinF1Key(Key key) { |
