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

am 13a6c8c1: am 1508c0e8: Add a new preference item to show/hide the settings key. 

Merge commit '13a6c8c1f8691b753cd1a6b7a77d99af4f7d78ac'

* commit '13a6c8c1f8691b753cd1a6b7a77d99af4f7d78ac':
  Add a new preference item to show/hide the settings key.
main
Ken Wakasa 2010-09-15 16:49:53 -07:00 committed by Android Git Automerger
parent 9b2c10284b 13a6c8c1f8
commit 2b90a1adcb
30 changed files with 3637 additions and 673 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
java/res/values/donottranslate.xml
View File

@ -24,4 +24,12 @@
<string name="sentence_separators">.,!?)</string> <string name="sentence_separators">.,!?)</string>
<!-- Symbols that are suggested between words --> <!-- Symbols that are suggested between words -->
<string name="suggested_punctuations">!?,\u0022\u0027:()-/@_</string> <string name="suggested_punctuations">!?,\u0022\u0027:()-/@_</string>
<!-- Option values to show/hide the settings key in onscreen keyboard -->
<!-- Automatically decide to show or hide the settings key -->
<string name="settings_key_mode_auto" translatable="false">0</string>
<!-- Always show the settings key -->
<string name="settings_key_mode_always_show" translatable="false">1</string>
<!-- Always hide the settings key -->
<string name="settings_key_mode_always_hide" translatable="false">2</string>
</resources> </resources>

21
java/res/values/strings.xml
View File

@ -91,6 +91,27 @@
<!-- Description for auto completion --> <!-- Description for auto completion -->
<string name="auto_complete_summary">Spacebar and punctuation automatically insert highlighted word</string> <string name="auto_complete_summary">Spacebar and punctuation automatically insert highlighted word</string>
<!-- Option to show/hide the settings key -->
<string name="prefs_settings_key">Show settings key</string>
<!-- Array of the settings key mode values -->
<string-array name="settings_key_modes_values" translatable="false">
<item>@string/settings_key_mode_auto</item>
<item>@string/settings_key_mode_always_show</item>
<item>@string/settings_key_mode_always_hide</item>
</string-array>
<!-- Option to automatically decide to show/hide the settings key -->
<string name="settings_key_mode_auto_name">Automatic</string>
<!-- Option to always show the settings key -->
<string name="settings_key_mode_always_show_name">Always show</string>
<!-- Option to always hide the settings key -->
<string name="settings_key_mode_always_hide_name">Always hide</string>
<!-- Array of the settings key modes -->
<string-array name="settings_key_modes">
<item>@string/settings_key_mode_auto_name</item>
<item>@string/settings_key_mode_always_show_name</item>
<item>@string/settings_key_mode_always_hide_name</item>
</string-array>
<!-- Option to enable bigram completion --> <!-- Option to enable bigram completion -->
<string name="bigram_suggestion">Bigram Suggestions</string> <string name="bigram_suggestion">Bigram Suggestions</string>
<!-- Description for auto completion --> <!-- Description for auto completion -->

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

@ -165,48 +165,184 @@
</Row> </Row>
<Row <Row
android:keyboardMode="@+id/mode_normal" android:keyboardMode="@+id/mode_normal"
android:keyWidth="10%p"
android:rowEdgeFlags="bottom" android:rowEdgeFlags="bottom"
> >
<Key <Key
android:codes="@integer/key_symbol" android:codes="@integer/key_symbol"
android:keyLabel="@string/label_symbol_key" android:keyLabel="@string/label_symbol_key"
android:keyWidth="15%p" android:keyWidth="20%p"
android:isModifier="true" android:isModifier="true"
android:keyEdgeFlags="left" /> android:keyEdgeFlags="left" />
<Key
android:codes="@integer/key_settings"
android:keyIcon="@drawable/sym_keyboard_settings"
android:iconPreview="@drawable/sym_keyboard_feedback_settings"
android:keyWidth="10%p"
android:isModifier="true" />
<Key <Key
android:codes="@integer/key_f1" android:codes="@integer/key_f1"
android:keyIcon="@drawable/sym_keyboard_mic" android:keyIcon="@drawable/sym_keyboard_mic"
android:iconPreview="@drawable/sym_keyboard_feedback_mic" android:iconPreview="@drawable/sym_keyboard_feedback_mic"
android:keyWidth="10%p"
android:isModifier="true" /> android:isModifier="true" />
<Key <Key
android:codes="@integer/key_space" android:codes="@integer/key_space"
android:keyIcon="@drawable/sym_keyboard_space" android:keyIcon="@drawable/sym_keyboard_space"
android:iconPreview="@drawable/sym_keyboard_feedback_space" android:iconPreview="@drawable/sym_keyboard_feedback_space"
android:keyWidth="30%p" android:keyWidth="40%p"
android:isModifier="true" android:isModifier="true"
android:isRepeatable="true" /> android:isRepeatable="true" />
<Key <Key
android:keyLabel="." android:keyLabel="."
android:popupKeyboard="@xml/popup_punctuation" android:popupKeyboard="@xml/popup_punctuation"
android:keyWidth="10%p"
android:isModifier="true" /> android:isModifier="true" />
<Key <Key
android:codes="@integer/key_return" android:codes="@integer/key_return"
android:keyIcon="@drawable/sym_keyboard_return" android:keyIcon="@drawable/sym_keyboard_return"
android:iconPreview="@drawable/sym_keyboard_feedback_return" android:iconPreview="@drawable/sym_keyboard_feedback_return"
android:keyWidth="25%p" android:keyWidth="20%p"
android:isModifier="true" android:isModifier="true"
android:keyEdgeFlags="right" /> android:keyEdgeFlags="right" />
</Row> </Row>
<Row <Row
android:keyboardMode="@+id/mode_url" android:keyboardMode="@+id/mode_url"
android:keyWidth="10%p"
android:rowEdgeFlags="bottom"
>
<Key
android:codes="@integer/key_symbol"
android:keyLabel="@string/label_symbol_key"
android:keyWidth="20%p"
android:isModifier="true"
android:keyEdgeFlags="left" />
<Key
android:keyLabel="/"
android:isModifier="true" />
<Key
android:codes="@integer/key_space"
android:keyIcon="@drawable/sym_keyboard_space"
android:iconPreview="@drawable/sym_keyboard_feedback_space"
android:keyWidth="40%p"
android:isModifier="true"
android:isRepeatable="true" />
<Key
android:keyLabel="."
android:popupKeyboard="@xml/popup_punctuation"
android:isModifier="true" />
<Key
android:codes="@integer/key_return"
android:keyIcon="@drawable/sym_keyboard_return"
android:iconPreview="@drawable/sym_keyboard_feedback_return"
android:keyWidth="20%p"
android:isModifier="true"
android:keyEdgeFlags="right" />
</Row>
<Row
android:keyboardMode="@+id/mode_email"
android:keyWidth="10%p"
android:rowEdgeFlags="bottom"
>
<Key
android:codes="@integer/key_symbol"
android:keyLabel="@string/label_symbol_key"
android:keyWidth="20%p"
android:isModifier="true"
android:keyEdgeFlags="left" />
<Key
android:keyLabel="\@"
android:isModifier="true" />
<Key
android:codes="@integer/key_space"
android:keyIcon="@drawable/sym_keyboard_space"
android:iconPreview="@drawable/sym_keyboard_feedback_space"
android:keyWidth="40%p"
android:isModifier="true"
android:isRepeatable="true" />
<Key
android:keyLabel="."
android:popupKeyboard="@xml/popup_punctuation"
android:isModifier="true" />
<Key
android:codes="@integer/key_return"
android:keyIcon="@drawable/sym_keyboard_return"
android:iconPreview="@drawable/sym_keyboard_feedback_return"
android:keyWidth="20%p"
android:isModifier="true"
android:keyEdgeFlags="right" />
</Row>
<Row
android:keyboardMode="@+id/mode_im"
android:keyWidth="10%p"
android:rowEdgeFlags="bottom"
>
<Key
android:codes="@integer/key_symbol"
android:keyLabel="@string/label_symbol_key"
android:keyWidth="20%p"
android:isModifier="true"
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"
android:keyIcon="@drawable/sym_keyboard_space"
android:iconPreview="@drawable/sym_keyboard_feedback_space"
android:keyWidth="40%p"
android:isModifier="true"
android:isRepeatable="true" />
<Key
android:keyLabel="."
android:popupKeyboard="@xml/popup_punctuation"
android:isModifier="true" />
<Key
android:keyLabel=":-)"
android:keyOutputText=":-) "
android:popupKeyboard="@xml/popup_smileys"
android:keyWidth="20%p"
android:isModifier="true"
android:keyEdgeFlags="right" />
</Row>
<Row
android:keyboardMode="@+id/mode_webentry"
android:keyWidth="10%p"
android:rowEdgeFlags="bottom"
>
<Key
android:codes="@integer/key_symbol"
android:keyLabel="@string/label_symbol_key"
android:keyWidth="20%p"
android:isModifier="true"
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"
android:keyIcon="@drawable/sym_keyboard_space"
android:iconPreview="@drawable/sym_keyboard_feedback_space"
android:keyWidth="20%p"
android:isModifier="true"
android:isRepeatable="true" />
<Key
android:codes="@integer/key_tab"
android:keyIcon="@drawable/sym_keyboard_tab"
android:iconPreview="@drawable/sym_keyboard_feedback_tab"
android:keyWidth="20%p"
android:isModifier="true" />
<Key
android:keyLabel="."
android:popupKeyboard="@xml/popup_punctuation"
android:isModifier="true" />
<Key
android:codes="@integer/key_return"
android:keyIcon="@drawable/sym_keyboard_return"
android:iconPreview="@drawable/sym_keyboard_feedback_return"
android:keyWidth="20%p"
android:isModifier="true"
android:keyEdgeFlags="right" />
</Row>
<Row
android:keyboardMode="@+id/mode_normal_with_settings_key"
android:keyWidth="10%p"
android:rowEdgeFlags="bottom" android:rowEdgeFlags="bottom"
> >
<Key <Key
@ -219,11 +355,11 @@
android:codes="@integer/key_settings" android:codes="@integer/key_settings"
android:keyIcon="@drawable/sym_keyboard_settings" android:keyIcon="@drawable/sym_keyboard_settings"
android:iconPreview="@drawable/sym_keyboard_feedback_settings" android:iconPreview="@drawable/sym_keyboard_feedback_settings"
android:keyWidth="10%p"
android:isModifier="true" /> android:isModifier="true" />
<Key <Key
android:keyLabel="/" android:codes="@integer/key_f1"
android:keyWidth="10%p" android:keyIcon="@drawable/sym_keyboard_mic"
android:iconPreview="@drawable/sym_keyboard_feedback_mic"
android:isModifier="true" /> android:isModifier="true" />
<Key <Key
android:codes="@integer/key_space" android:codes="@integer/key_space"
@ -235,7 +371,6 @@
<Key <Key
android:keyLabel="." android:keyLabel="."
android:popupKeyboard="@xml/popup_punctuation" android:popupKeyboard="@xml/popup_punctuation"
android:keyWidth="10%p"
android:isModifier="true" /> android:isModifier="true" />
<Key <Key
android:codes="@integer/key_return" android:codes="@integer/key_return"
@ -246,7 +381,8 @@
android:keyEdgeFlags="right" /> android:keyEdgeFlags="right" />
</Row> </Row>
<Row <Row
android:keyboardMode="@+id/mode_email" android:keyboardMode="@+id/mode_url_with_settings_key"
android:keyWidth="10%p"
android:rowEdgeFlags="bottom" android:rowEdgeFlags="bottom"
> >
<Key <Key
@ -259,7 +395,44 @@
android:codes="@integer/key_settings" android:codes="@integer/key_settings"
android:keyIcon="@drawable/sym_keyboard_settings" android:keyIcon="@drawable/sym_keyboard_settings"
android:iconPreview="@drawable/sym_keyboard_feedback_settings" android:iconPreview="@drawable/sym_keyboard_feedback_settings"
android:isModifier="true" />
<Key
android:keyLabel="/"
android:isModifier="true" />
<Key
android:codes="@integer/key_space"
android:keyIcon="@drawable/sym_keyboard_space"
android:iconPreview="@drawable/sym_keyboard_feedback_space"
android:keyWidth="30%p"
android:isModifier="true"
android:isRepeatable="true" />
<Key
android:keyLabel="."
android:popupKeyboard="@xml/popup_punctuation"
android:isModifier="true" />
<Key
android:codes="@integer/key_return"
android:keyIcon="@drawable/sym_keyboard_return"
android:iconPreview="@drawable/sym_keyboard_feedback_return"
android:keyWidth="25%p"
android:isModifier="true"
android:keyEdgeFlags="right" />
</Row>
<Row
android:keyboardMode="@+id/mode_email_with_settings_key"
android:keyWidth="10%p" android:keyWidth="10%p"
android:rowEdgeFlags="bottom"
>
<Key
android:codes="@integer/key_symbol"
android:keyLabel="@string/label_symbol_key"
android:keyWidth="15%p"
android:isModifier="true"
android:keyEdgeFlags="left" />
<Key
android:codes="@integer/key_settings"
android:keyIcon="@drawable/sym_keyboard_settings"
android:iconPreview="@drawable/sym_keyboard_feedback_settings"
android:isModifier="true" /> android:isModifier="true" />
<Key <Key
android:keyLabel="\@" android:keyLabel="\@"
@ -284,7 +457,8 @@
android:keyEdgeFlags="right" /> android:keyEdgeFlags="right" />
</Row> </Row>
<Row <Row
android:keyboardMode="@+id/mode_im" android:keyboardMode="@+id/mode_im_with_settings_key"
android:keyWidth="10%p"
android:rowEdgeFlags="bottom" android:rowEdgeFlags="bottom"
> >
<Key <Key
@ -297,13 +471,11 @@
android:codes="@integer/key_settings" android:codes="@integer/key_settings"
android:keyIcon="@drawable/sym_keyboard_settings" android:keyIcon="@drawable/sym_keyboard_settings"
android:iconPreview="@drawable/sym_keyboard_feedback_settings" android:iconPreview="@drawable/sym_keyboard_feedback_settings"
android:keyWidth="10%p"
android:isModifier="true" /> android:isModifier="true" />
<Key <Key
android:codes="@integer/key_f1" android:codes="@integer/key_f1"
android:keyIcon="@drawable/sym_keyboard_mic" android:keyIcon="@drawable/sym_keyboard_mic"
android:iconPreview="@drawable/sym_keyboard_feedback_mic" android:iconPreview="@drawable/sym_keyboard_feedback_mic"
android:keyWidth="10%p"
android:isModifier="true" /> android:isModifier="true" />
<Key <Key
android:codes="@integer/key_space" android:codes="@integer/key_space"
@ -315,7 +487,6 @@
<Key <Key
android:keyLabel="." android:keyLabel="."
android:popupKeyboard="@xml/popup_punctuation" android:popupKeyboard="@xml/popup_punctuation"
android:keyWidth="10%p"
android:isModifier="true" /> android:isModifier="true" />
<Key <Key
android:keyLabel=":-)" android:keyLabel=":-)"
@ -326,7 +497,8 @@
android:keyEdgeFlags="right" /> android:keyEdgeFlags="right" />
</Row> </Row>
<Row <Row
android:keyboardMode="@+id/mode_webentry" android:keyboardMode="@+id/mode_webentry_with_settings_key"
android:keyWidth="10%p"
android:rowEdgeFlags="bottom" android:rowEdgeFlags="bottom"
> >
<Key <Key
@ -339,13 +511,11 @@
android:codes="@integer/key_settings" android:codes="@integer/key_settings"
android:keyIcon="@drawable/sym_keyboard_settings" android:keyIcon="@drawable/sym_keyboard_settings"
android:iconPreview="@drawable/sym_keyboard_feedback_settings" android:iconPreview="@drawable/sym_keyboard_feedback_settings"
android:keyWidth="10%p"
android:isModifier="true" /> android:isModifier="true" />
<Key <Key
android:codes="@integer/key_f1" android:codes="@integer/key_f1"
android:keyIcon="@drawable/sym_keyboard_mic" android:keyIcon="@drawable/sym_keyboard_mic"
android:iconPreview="@drawable/sym_keyboard_feedback_mic" android:iconPreview="@drawable/sym_keyboard_feedback_mic"
android:keyWidth="10%p"
android:isModifier="true" /> android:isModifier="true" />
<Key <Key
android:codes="@integer/key_space" android:codes="@integer/key_space"
@ -358,12 +528,10 @@
android:codes="@integer/key_tab" android:codes="@integer/key_tab"
android:keyIcon="@drawable/sym_keyboard_tab" android:keyIcon="@drawable/sym_keyboard_tab"
android:iconPreview="@drawable/sym_keyboard_feedback_tab" android:iconPreview="@drawable/sym_keyboard_feedback_tab"
android:keyWidth="10%p"
android:isModifier="true" /> android:isModifier="true" />
<Key <Key
android:keyLabel="." android:keyLabel="."
android:popupKeyboard="@xml/popup_punctuation" android:popupKeyboard="@xml/popup_punctuation"
android:keyWidth="10%p"
android:isModifier="true" /> android:isModifier="true" />
<Key <Key
android:codes="@integer/key_return" android:codes="@integer/key_return"

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

@ -164,42 +164,158 @@
</Row> </Row>
<Row <Row
android:keyboardMode="@+id/mode_normal" android:keyboardMode="@+id/mode_normal"
android:keyWidth="10%p"
android:rowEdgeFlags="bottom" android:rowEdgeFlags="bottom"
> >
<Key <Key
android:codes="@integer/key_symbol" android:codes="@integer/key_symbol"
android:keyLabel="@string/label_symbol_key" android:keyLabel="@string/label_symbol_key"
android:keyWidth="15%p" android:keyWidth="20%p"
android:keyEdgeFlags="left" /> android:keyEdgeFlags="left" />
<Key
android:codes="@integer/key_settings"
android:keyIcon="@drawable/sym_bkeyboard_settings"
android:iconPreview="@drawable/sym_keyboard_feedback_settings"
android:keyWidth="10%p" />
<Key <Key
android:codes="@integer/key_f1" android:codes="@integer/key_f1"
android:keyIcon="@drawable/sym_bkeyboard_mic" android:keyIcon="@drawable/sym_bkeyboard_mic"
android:iconPreview="@drawable/sym_keyboard_feedback_mic" android:iconPreview="@drawable/sym_keyboard_feedback_mic" />
android:keyWidth="10%p" />
<Key <Key
android:codes="@integer/key_space" android:codes="@integer/key_space"
android:keyIcon="@drawable/sym_bkeyboard_space" android:keyIcon="@drawable/sym_bkeyboard_space"
android:iconPreview="@drawable/sym_keyboard_feedback_space" android:iconPreview="@drawable/sym_keyboard_feedback_space"
android:keyWidth="30%p" android:keyWidth="40%p"
android:isRepeatable="true" /> android:isRepeatable="true" />
<Key <Key
android:keyLabel="." android:keyLabel="."
android:popupKeyboard="@xml/popup_punctuation" android:popupKeyboard="@xml/popup_punctuation" />
android:keyWidth="10%p" />
<Key <Key
android:codes="@integer/key_return" android:codes="@integer/key_return"
android:keyIcon="@drawable/sym_bkeyboard_return" android:keyIcon="@drawable/sym_bkeyboard_return"
android:iconPreview="@drawable/sym_keyboard_feedback_return" android:iconPreview="@drawable/sym_keyboard_feedback_return"
android:keyWidth="25%p" android:keyWidth="20%p"
android:keyEdgeFlags="right" /> android:keyEdgeFlags="right" />
</Row> </Row>
<Row <Row
android:keyboardMode="@+id/mode_url" android:keyboardMode="@+id/mode_url"
android:keyWidth="10%p"
android:rowEdgeFlags="bottom"
>
<Key
android:codes="@integer/key_symbol"
android:keyLabel="@string/label_symbol_key"
android:keyWidth="20%p"
android:keyEdgeFlags="left" />
<Key
android:keyLabel="/" />
<Key
android:codes="@integer/key_space"
android:keyIcon="@drawable/sym_bkeyboard_space"
android:iconPreview="@drawable/sym_keyboard_feedback_space"
android:keyWidth="40%p"
android:isRepeatable="true" />
<Key
android:keyLabel="."
android:popupKeyboard="@xml/popup_punctuation" />
<Key
android:codes="@integer/key_return"
android:keyIcon="@drawable/sym_bkeyboard_return"
android:iconPreview="@drawable/sym_keyboard_feedback_return"
android:keyWidth="20%p"
android:keyEdgeFlags="right" />
</Row>
<Row
android:keyboardMode="@+id/mode_email"
android:keyWidth="10%p"
android:rowEdgeFlags="bottom"
>
<Key
android:codes="@integer/key_symbol"
android:keyLabel="@string/label_symbol_key"
android:keyWidth="20%p"
android:keyEdgeFlags="left" />
<Key
android:keyLabel="\@" />
<Key
android:codes="@integer/key_space"
android:keyIcon="@drawable/sym_bkeyboard_space"
android:iconPreview="@drawable/sym_keyboard_feedback_space"
android:keyWidth="40%p"
android:isRepeatable="true" />
<Key
android:keyLabel="."
android:popupKeyboard="@xml/popup_punctuation" />
<Key
android:codes="@integer/key_return"
android:keyIcon="@drawable/sym_bkeyboard_return"
android:iconPreview="@drawable/sym_keyboard_feedback_return"
android:keyWidth="20%p"
android:keyEdgeFlags="right" />
</Row>
<Row
android:keyboardMode="@+id/mode_im"
android:keyWidth="10%p"
android:rowEdgeFlags="bottom"
>
<Key
android:codes="@integer/key_symbol"
android:keyLabel="@string/label_symbol_key"
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" />
<Key
android:codes="@integer/key_space"
android:keyIcon="@drawable/sym_bkeyboard_space"
android:iconPreview="@drawable/sym_keyboard_feedback_space"
android:keyWidth="40%p"
android:isRepeatable="true" />
<Key
android:keyLabel="."
android:popupKeyboard="@xml/popup_punctuation" />
<Key
android:keyLabel=":-)"
android:keyOutputText=":-) "
android:popupKeyboard="@xml/popup_smileys"
android:keyWidth="20%p"
android:keyEdgeFlags="right" />
</Row>
<Row
android:keyboardMode="@+id/mode_webentry"
android:keyWidth="10%p"
android:rowEdgeFlags="bottom"
>
<Key
android:codes="@integer/key_symbol"
android:keyLabel="@string/label_symbol_key"
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" />
<Key
android:codes="@integer/key_space"
android:keyIcon="@drawable/sym_bkeyboard_space"
android:iconPreview="@drawable/sym_keyboard_feedback_space"
android:keyWidth="20%p"
android:isRepeatable="true" />
<Key
android:codes="@integer/key_tab"
android:keyIcon="@drawable/sym_bkeyboard_tab"
android:iconPreview="@drawable/sym_keyboard_feedback_tab"
android:keyWidth="20%p" />
<Key
android:keyLabel="."
android:popupKeyboard="@xml/popup_punctuation" />
<Key
android:codes="@integer/key_return"
android:keyIcon="@drawable/sym_bkeyboard_return"
android:iconPreview="@drawable/sym_keyboard_feedback_return"
android:keyWidth="20%p"
android:keyEdgeFlags="right" />
</Row>
<Row
android:keyboardMode="@+id/mode_normal_with_settings_key"
android:keyWidth="10%p"
android:rowEdgeFlags="bottom" android:rowEdgeFlags="bottom"
> >
<Key <Key
@ -210,11 +326,11 @@
<Key <Key
android:codes="@integer/key_settings" android:codes="@integer/key_settings"
android:keyIcon="@drawable/sym_bkeyboard_settings" android:keyIcon="@drawable/sym_bkeyboard_settings"
android:iconPreview="@drawable/sym_keyboard_feedback_settings" android:iconPreview="@drawable/sym_keyboard_feedback_settings" />
android:keyWidth="10%p" />
<Key <Key
android:keyLabel="/" android:codes="@integer/key_f1"
android:keyWidth="10%p" /> android:keyIcon="@drawable/sym_bkeyboard_mic"
android:iconPreview="@drawable/sym_keyboard_feedback_mic" />
<Key <Key
android:codes="@integer/key_space" android:codes="@integer/key_space"
android:keyIcon="@drawable/sym_bkeyboard_space" android:keyIcon="@drawable/sym_bkeyboard_space"
@ -223,8 +339,7 @@
android:isRepeatable="true" /> android:isRepeatable="true" />
<Key <Key
android:keyLabel="." android:keyLabel="."
android:popupKeyboard="@xml/popup_punctuation" android:popupKeyboard="@xml/popup_punctuation" />
android:keyWidth="10%p" />
<Key <Key
android:codes="@integer/key_return" android:codes="@integer/key_return"
android:keyIcon="@drawable/sym_bkeyboard_return" android:keyIcon="@drawable/sym_bkeyboard_return"
@ -233,7 +348,8 @@
android:keyEdgeFlags="right" /> android:keyEdgeFlags="right" />
</Row> </Row>
<Row <Row
android:keyboardMode="@+id/mode_email" android:keyboardMode="@+id/mode_url_with_settings_key"
android:keyWidth="10%p"
android:rowEdgeFlags="bottom" android:rowEdgeFlags="bottom"
> >
<Key <Key
@ -244,8 +360,39 @@
<Key <Key
android:codes="@integer/key_settings" android:codes="@integer/key_settings"
android:keyIcon="@drawable/sym_bkeyboard_settings" android:keyIcon="@drawable/sym_bkeyboard_settings"
android:iconPreview="@drawable/sym_keyboard_feedback_settings" android:iconPreview="@drawable/sym_keyboard_feedback_settings" />
android:keyWidth="10%p" /> <Key
android:keyLabel="/" />
<Key
android:codes="@integer/key_space"
android:keyIcon="@drawable/sym_bkeyboard_space"
android:iconPreview="@drawable/sym_keyboard_feedback_space"
android:keyWidth="30%p"
android:isRepeatable="true" />
<Key
android:keyLabel="."
android:popupKeyboard="@xml/popup_punctuation" />
<Key
android:codes="@integer/key_return"
android:keyIcon="@drawable/sym_bkeyboard_return"
android:iconPreview="@drawable/sym_keyboard_feedback_return"
android:keyWidth="25%p"
android:keyEdgeFlags="right" />
</Row>
<Row
android:keyboardMode="@+id/mode_email_with_settings_key"
android:keyWidth="10%p"
android:rowEdgeFlags="bottom"
>
<Key
android:codes="@integer/key_symbol"
android:keyLabel="@string/label_symbol_key"
android:keyWidth="15%p"
android:keyEdgeFlags="left" />
<Key
android:codes="@integer/key_settings"
android:keyIcon="@drawable/sym_bkeyboard_settings"
android:iconPreview="@drawable/sym_keyboard_feedback_settings" />
<Key <Key
android:keyLabel="\@" /> android:keyLabel="\@" />
<Key <Key
@ -265,7 +412,8 @@
android:keyEdgeFlags="right" /> android:keyEdgeFlags="right" />
</Row> </Row>
<Row <Row
android:keyboardMode="@+id/mode_im" android:keyboardMode="@+id/mode_im_with_settings_key"
android:keyWidth="10%p"
android:rowEdgeFlags="bottom" android:rowEdgeFlags="bottom"
> >
<Key <Key
@ -276,13 +424,11 @@
<Key <Key
android:codes="@integer/key_settings" android:codes="@integer/key_settings"
android:keyIcon="@drawable/sym_bkeyboard_settings" android:keyIcon="@drawable/sym_bkeyboard_settings"
android:iconPreview="@drawable/sym_keyboard_feedback_settings" android:iconPreview="@drawable/sym_keyboard_feedback_settings" />
android:keyWidth="10%p" />
<Key <Key
android:codes="@integer/key_f1" android:codes="@integer/key_f1"
android:keyIcon="@drawable/sym_bkeyboard_mic" android:keyIcon="@drawable/sym_bkeyboard_mic"
android:iconPreview="@drawable/sym_keyboard_feedback_mic" android:iconPreview="@drawable/sym_keyboard_feedback_mic" />
android:keyWidth="10%p" />
<Key <Key
android:codes="@integer/key_space" android:codes="@integer/key_space"
android:keyIcon="@drawable/sym_bkeyboard_space" android:keyIcon="@drawable/sym_bkeyboard_space"
@ -291,8 +437,7 @@
android:isRepeatable="true" /> android:isRepeatable="true" />
<Key <Key
android:keyLabel="." android:keyLabel="."
android:popupKeyboard="@xml/popup_punctuation" android:popupKeyboard="@xml/popup_punctuation" />
android:keyWidth="10%p" />
<Key <Key
android:keyLabel=":-)" android:keyLabel=":-)"
android:keyOutputText=":-) " android:keyOutputText=":-) "
@ -301,7 +446,8 @@
android:keyEdgeFlags="right" /> android:keyEdgeFlags="right" />
</Row> </Row>
<Row <Row
android:keyboardMode="@+id/mode_webentry" android:keyboardMode="@+id/mode_webentry_with_settings_key"
android:keyWidth="10%p"
android:rowEdgeFlags="bottom" android:rowEdgeFlags="bottom"
> >
<Key <Key
@ -312,13 +458,11 @@
<Key <Key
android:codes="@integer/key_settings" android:codes="@integer/key_settings"
android:keyIcon="@drawable/sym_bkeyboard_settings" android:keyIcon="@drawable/sym_bkeyboard_settings"
android:iconPreview="@drawable/sym_keyboard_feedback_settings" android:iconPreview="@drawable/sym_keyboard_feedback_settings" />
android:keyWidth="10%p" />
<Key <Key
android:codes="@integer/key_f1" android:codes="@integer/key_f1"
android:keyIcon="@drawable/sym_bkeyboard_mic" android:keyIcon="@drawable/sym_bkeyboard_mic"
android:iconPreview="@drawable/sym_keyboard_feedback_mic" android:iconPreview="@drawable/sym_keyboard_feedback_mic" />
android:keyWidth="10%p" />
<Key <Key
android:codes="@integer/key_space" android:codes="@integer/key_space"
android:keyIcon="@drawable/sym_bkeyboard_space" android:keyIcon="@drawable/sym_bkeyboard_space"
@ -328,12 +472,10 @@
<Key <Key
android:codes="@integer/key_tab" android:codes="@integer/key_tab"
android:keyIcon="@drawable/sym_bkeyboard_tab" android:keyIcon="@drawable/sym_bkeyboard_tab"
android:iconPreview="@drawable/sym_keyboard_feedback_tab" android:iconPreview="@drawable/sym_keyboard_feedback_tab" />
android:keyWidth="10%p" />
<Key <Key
android:keyLabel="." android:keyLabel="."
android:popupKeyboard="@xml/popup_punctuation" android:popupKeyboard="@xml/popup_punctuation" />
android:keyWidth="10%p" />
<Key <Key
android:codes="@integer/key_return" android:codes="@integer/key_return"
android:keyIcon="@drawable/sym_bkeyboard_return" android:keyIcon="@drawable/sym_bkeyboard_return"

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

@ -144,48 +144,184 @@
</Row> </Row>
<Row <Row
android:keyboardMode="@+id/mode_normal" android:keyboardMode="@+id/mode_normal"
android:keyWidth="10%p"
android:rowEdgeFlags="bottom" android:rowEdgeFlags="bottom"
> >
<Key <Key
android:codes="@integer/key_symbol" android:codes="@integer/key_symbol"
android:keyLabel="@string/label_symbol_key" android:keyLabel="@string/label_symbol_key"
android:keyWidth="15%p" android:keyWidth="20%p"
android:isModifier="true" android:isModifier="true"
android:keyEdgeFlags="left" /> android:keyEdgeFlags="left" />
<Key
android:codes="@integer/key_settings"
android:keyIcon="@drawable/sym_keyboard_settings"
android:iconPreview="@drawable/sym_keyboard_feedback_settings"
android:keyWidth="10%p"
android:isModifier="true" />
<Key <Key
android:codes="@integer/key_f1" android:codes="@integer/key_f1"
android:keyIcon="@drawable/sym_keyboard_mic" android:keyIcon="@drawable/sym_keyboard_mic"
android:iconPreview="@drawable/sym_keyboard_feedback_mic" android:iconPreview="@drawable/sym_keyboard_feedback_mic"
android:keyWidth="10%p"
android:isModifier="true" /> android:isModifier="true" />
<Key <Key
android:codes="@integer/key_space" android:codes="@integer/key_space"
android:keyIcon="@drawable/sym_keyboard_space" android:keyIcon="@drawable/sym_keyboard_space"
android:iconPreview="@drawable/sym_keyboard_feedback_space" android:iconPreview="@drawable/sym_keyboard_feedback_space"
android:keyWidth="30%p" android:keyWidth="40%p"
android:isModifier="true" android:isModifier="true"
android:isRepeatable="true" /> android:isRepeatable="true" />
<Key <Key
android:keyLabel="." android:keyLabel="."
android:popupKeyboard="@xml/popup_punctuation" android:popupKeyboard="@xml/popup_punctuation"
android:keyWidth="10%p"
android:isModifier="true" /> android:isModifier="true" />
<Key <Key
android:codes="@integer/key_return" android:codes="@integer/key_return"
android:keyIcon="@drawable/sym_keyboard_return" android:keyIcon="@drawable/sym_keyboard_return"
android:iconPreview="@drawable/sym_keyboard_feedback_return" android:iconPreview="@drawable/sym_keyboard_feedback_return"
android:keyWidth="25%p" android:keyWidth="20%p"
android:isModifier="true" android:isModifier="true"
android:keyEdgeFlags="right" /> android:keyEdgeFlags="right" />
</Row> </Row>
<Row <Row
android:keyboardMode="@+id/mode_url" android:keyboardMode="@+id/mode_url"
android:keyWidth="10%p"
android:rowEdgeFlags="bottom"
>
<Key
android:codes="@integer/key_symbol"
android:keyLabel="@string/label_symbol_key"
android:keyWidth="20%p"
android:isModifier="true"
android:keyEdgeFlags="left" />
<Key
android:keyLabel="/"
android:isModifier="true" />
<Key
android:codes="@integer/key_space"
android:keyIcon="@drawable/sym_keyboard_space"
android:iconPreview="@drawable/sym_keyboard_feedback_space"
android:keyWidth="40%p"
android:isModifier="true"
android:isRepeatable="true" />
<Key
android:keyLabel="."
android:popupKeyboard="@xml/popup_punctuation"
android:isModifier="true" />
<Key
android:codes="@integer/key_return"
android:keyIcon="@drawable/sym_keyboard_return"
android:iconPreview="@drawable/sym_keyboard_feedback_return"
android:keyWidth="20%p"
android:isModifier="true"
android:keyEdgeFlags="right" />
</Row>
<Row
android:keyboardMode="@+id/mode_email"
android:keyWidth="10%p"
android:rowEdgeFlags="bottom"
>
<Key
android:codes="@integer/key_symbol"
android:keyLabel="@string/label_symbol_key"
android:keyWidth="20%p"
android:isModifier="true"
android:keyEdgeFlags="left" />
<Key
android:keyLabel="\@"
android:isModifier="true" />
<Key
android:codes="@integer/key_space"
android:keyIcon="@drawable/sym_keyboard_space"
android:iconPreview="@drawable/sym_keyboard_feedback_space"
android:keyWidth="40%p"
android:isModifier="true"
android:isRepeatable="true" />
<Key
android:keyLabel="."
android:popupKeyboard="@xml/popup_punctuation"
android:isModifier="true" />
<Key
android:codes="@integer/key_return"
android:keyIcon="@drawable/sym_keyboard_return"
android:iconPreview="@drawable/sym_keyboard_feedback_return"
android:keyWidth="20%p"
android:isModifier="true"
android:keyEdgeFlags="right" />
</Row>
<Row
android:keyboardMode="@+id/mode_im"
android:keyWidth="10%p"
android:rowEdgeFlags="bottom"
>
<Key
android:codes="@integer/key_symbol"
android:keyLabel="@string/label_symbol_key"
android:keyWidth="20%p"
android:isModifier="true"
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"
android:keyIcon="@drawable/sym_keyboard_space"
android:iconPreview="@drawable/sym_keyboard_feedback_space"
android:keyWidth="40%p"
android:isModifier="true"
android:isRepeatable="true" />
<Key
android:keyLabel="."
android:popupKeyboard="@xml/popup_punctuation"
android:isModifier="true" />
<Key
android:keyLabel=":-)"
android:keyOutputText=":-) "
android:popupKeyboard="@xml/popup_smileys"
android:keyWidth="20%p"
android:isModifier="true"
android:keyEdgeFlags="right" />
</Row>
<Row
android:keyboardMode="@+id/mode_webentry"
android:keyWidth="10%p"
android:rowEdgeFlags="bottom"
>
<Key
android:codes="@integer/key_symbol"
android:keyLabel="@string/label_symbol_key"
android:keyWidth="20%p"
android:isModifier="true"
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"
android:keyIcon="@drawable/sym_keyboard_space"
android:iconPreview="@drawable/sym_keyboard_feedback_space"
android:keyWidth="20%p"
android:isModifier="true"
android:isRepeatable="true" />
<Key
android:codes="@integer/key_tab"
android:keyIcon="@drawable/sym_keyboard_tab"
android:iconPreview="@drawable/sym_keyboard_feedback_tab"
android:keyWidth="20%p"
android:isModifier="true" />
<Key
android:keyLabel="."
android:popupKeyboard="@xml/popup_punctuation"
android:isModifier="true" />
<Key
android:codes="@integer/key_return"
android:keyIcon="@drawable/sym_keyboard_return"
android:iconPreview="@drawable/sym_keyboard_feedback_return"
android:keyWidth="20%p"
android:isModifier="true"
android:keyEdgeFlags="right" />
</Row>
<Row
android:keyboardMode="@+id/mode_normal_with_settings_key"
android:keyWidth="10%p"
android:rowEdgeFlags="bottom" android:rowEdgeFlags="bottom"
> >
<Key <Key
@ -198,11 +334,11 @@
android:codes="@integer/key_settings" android:codes="@integer/key_settings"
android:keyIcon="@drawable/sym_keyboard_settings" android:keyIcon="@drawable/sym_keyboard_settings"
android:iconPreview="@drawable/sym_keyboard_feedback_settings" android:iconPreview="@drawable/sym_keyboard_feedback_settings"
android:keyWidth="10%p"
android:isModifier="true" /> android:isModifier="true" />
<Key <Key
android:keyLabel="/" android:codes="@integer/key_f1"
android:keyWidth="10%p" android:keyIcon="@drawable/sym_keyboard_mic"
android:iconPreview="@drawable/sym_keyboard_feedback_mic"
android:isModifier="true" /> android:isModifier="true" />
<Key <Key
android:codes="@integer/key_space" android:codes="@integer/key_space"
@ -214,7 +350,6 @@
<Key <Key
android:keyLabel="." android:keyLabel="."
android:popupKeyboard="@xml/popup_punctuation" android:popupKeyboard="@xml/popup_punctuation"
android:keyWidth="10%p"
android:isModifier="true" /> android:isModifier="true" />
<Key <Key
android:codes="@integer/key_return" android:codes="@integer/key_return"
@ -225,7 +360,8 @@
android:keyEdgeFlags="right" /> android:keyEdgeFlags="right" />
</Row> </Row>
<Row <Row
android:keyboardMode="@+id/mode_email" android:keyboardMode="@+id/mode_url_with_settings_key"
android:keyWidth="10%p"
android:rowEdgeFlags="bottom" android:rowEdgeFlags="bottom"
> >
<Key <Key
@ -238,7 +374,44 @@
android:codes="@integer/key_settings" android:codes="@integer/key_settings"
android:keyIcon="@drawable/sym_keyboard_settings" android:keyIcon="@drawable/sym_keyboard_settings"
android:iconPreview="@drawable/sym_keyboard_feedback_settings" android:iconPreview="@drawable/sym_keyboard_feedback_settings"
android:isModifier="true" />
<Key
android:keyLabel="/"
android:isModifier="true" />
<Key
android:codes="@integer/key_space"
android:keyIcon="@drawable/sym_keyboard_space"
android:iconPreview="@drawable/sym_keyboard_feedback_space"
android:keyWidth="30%p"
android:isModifier="true"
android:isRepeatable="true" />
<Key
android:keyLabel="."
android:popupKeyboard="@xml/popup_punctuation"
android:isModifier="true" />
<Key
android:codes="@integer/key_return"
android:keyIcon="@drawable/sym_keyboard_return"
android:iconPreview="@drawable/sym_keyboard_feedback_return"
android:keyWidth="25%p"
android:isModifier="true"
android:keyEdgeFlags="right" />
</Row>
<Row
android:keyboardMode="@+id/mode_email_with_settings_key"
android:keyWidth="10%p" android:keyWidth="10%p"
android:rowEdgeFlags="bottom"
>
<Key
android:codes="@integer/key_symbol"
android:keyLabel="@string/label_symbol_key"
android:keyWidth="15%p"
android:isModifier="true"
android:keyEdgeFlags="left" />
<Key
android:codes="@integer/key_settings"
android:keyIcon="@drawable/sym_keyboard_settings"
android:iconPreview="@drawable/sym_keyboard_feedback_settings"
android:isModifier="true" /> android:isModifier="true" />
<Key <Key
android:keyLabel="\@" android:keyLabel="\@"
@ -263,7 +436,8 @@
android:keyEdgeFlags="right" /> android:keyEdgeFlags="right" />
</Row> </Row>
<Row <Row
android:keyboardMode="@+id/mode_im" android:keyboardMode="@+id/mode_im_with_settings_key"
android:keyWidth="10%p"
android:rowEdgeFlags="bottom" android:rowEdgeFlags="bottom"
> >
<Key <Key
@ -276,13 +450,11 @@
android:codes="@integer/key_settings" android:codes="@integer/key_settings"
android:keyIcon="@drawable/sym_keyboard_settings" android:keyIcon="@drawable/sym_keyboard_settings"
android:iconPreview="@drawable/sym_keyboard_feedback_settings" android:iconPreview="@drawable/sym_keyboard_feedback_settings"
android:keyWidth="10%p"
android:isModifier="true" /> android:isModifier="true" />
<Key <Key
android:codes="@integer/key_f1" android:codes="@integer/key_f1"
android:keyIcon="@drawable/sym_keyboard_mic" android:keyIcon="@drawable/sym_keyboard_mic"
android:iconPreview="@drawable/sym_keyboard_feedback_mic" android:iconPreview="@drawable/sym_keyboard_feedback_mic"
android:keyWidth="10%p"
android:isModifier="true" /> android:isModifier="true" />
<Key <Key
android:codes="@integer/key_space" android:codes="@integer/key_space"
@ -294,7 +466,6 @@
<Key <Key
android:keyLabel="." android:keyLabel="."
android:popupKeyboard="@xml/popup_punctuation" android:popupKeyboard="@xml/popup_punctuation"
android:keyWidth="10%p"
android:isModifier="true" /> android:isModifier="true" />
<Key <Key
android:keyLabel=":-)" android:keyLabel=":-)"
@ -305,7 +476,8 @@
android:keyEdgeFlags="right" /> android:keyEdgeFlags="right" />
</Row> </Row>
<Row <Row
android:keyboardMode="@+id/mode_webentry" android:keyboardMode="@+id/mode_webentry_with_settings_key"
android:keyWidth="10%p"
android:rowEdgeFlags="bottom" android:rowEdgeFlags="bottom"
> >
<Key <Key
@ -318,13 +490,11 @@
android:codes="@integer/key_settings" android:codes="@integer/key_settings"
android:keyIcon="@drawable/sym_keyboard_settings" android:keyIcon="@drawable/sym_keyboard_settings"
android:iconPreview="@drawable/sym_keyboard_feedback_settings" android:iconPreview="@drawable/sym_keyboard_feedback_settings"
android:keyWidth="10%p"
android:isModifier="true" /> android:isModifier="true" />
<Key <Key
android:codes="@integer/key_f1" android:codes="@integer/key_f1"
android:keyIcon="@drawable/sym_keyboard_mic" android:keyIcon="@drawable/sym_keyboard_mic"
android:iconPreview="@drawable/sym_keyboard_feedback_mic" android:iconPreview="@drawable/sym_keyboard_feedback_mic"
android:keyWidth="10%p"
android:isModifier="true" /> android:isModifier="true" />
<Key <Key
android:codes="@integer/key_space" android:codes="@integer/key_space"
@ -337,12 +507,10 @@
android:codes="@integer/key_tab" android:codes="@integer/key_tab"
android:keyIcon="@drawable/sym_keyboard_tab" android:keyIcon="@drawable/sym_keyboard_tab"
android:iconPreview="@drawable/sym_keyboard_feedback_tab" android:iconPreview="@drawable/sym_keyboard_feedback_tab"
android:keyWidth="10%p"
android:isModifier="true" /> android:isModifier="true" />
<Key <Key
android:keyLabel="." android:keyLabel="."
android:popupKeyboard="@xml/popup_punctuation" android:popupKeyboard="@xml/popup_punctuation"
android:keyWidth="10%p"
android:isModifier="true" /> android:isModifier="true" />
<Key <Key
android:codes="@integer/key_return" android:codes="@integer/key_return"

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

@ -143,42 +143,158 @@
</Row> </Row>
<Row <Row
android:keyboardMode="@+id/mode_normal" android:keyboardMode="@+id/mode_normal"
android:keyWidth="10%p"
android:rowEdgeFlags="bottom" android:rowEdgeFlags="bottom"
> >
<Key <Key
android:codes="@integer/key_symbol" android:codes="@integer/key_symbol"
android:keyLabel="@string/label_symbol_key" android:keyLabel="@string/label_symbol_key"
android:keyWidth="15%p" android:keyWidth="20%p"
android:keyEdgeFlags="left" /> android:keyEdgeFlags="left" />
<Key
android:codes="@integer/key_settings"
android:keyIcon="@drawable/sym_bkeyboard_settings"
android:iconPreview="@drawable/sym_keyboard_feedback_settings"
android:keyWidth="10%p" />
<Key <Key
android:codes="@integer/key_f1" android:codes="@integer/key_f1"
android:keyIcon="@drawable/sym_bkeyboard_mic" android:keyIcon="@drawable/sym_bkeyboard_mic"
android:iconPreview="@drawable/sym_keyboard_feedback_mic" android:iconPreview="@drawable/sym_keyboard_feedback_mic" />
android:keyWidth="10%p" />
<Key <Key
android:codes="@integer/key_space" android:codes="@integer/key_space"
android:keyIcon="@drawable/sym_bkeyboard_space" android:keyIcon="@drawable/sym_bkeyboard_space"
android:iconPreview="@drawable/sym_keyboard_feedback_space" android:iconPreview="@drawable/sym_keyboard_feedback_space"
android:keyWidth="30%p" android:keyWidth="40%p"
android:isRepeatable="true" /> android:isRepeatable="true" />
<Key <Key
android:keyLabel="." android:keyLabel="."
android:popupKeyboard="@xml/popup_punctuation" android:popupKeyboard="@xml/popup_punctuation" />
android:keyWidth="10%p" />
<Key <Key
android:codes="@integer/key_return" android:codes="@integer/key_return"
android:keyIcon="@drawable/sym_bkeyboard_return" android:keyIcon="@drawable/sym_bkeyboard_return"
android:iconPreview="@drawable/sym_keyboard_feedback_return" android:iconPreview="@drawable/sym_keyboard_feedback_return"
android:keyWidth="25%p" android:keyWidth="20%p"
android:keyEdgeFlags="right" /> android:keyEdgeFlags="right" />
</Row> </Row>
<Row <Row
android:keyboardMode="@+id/mode_url" android:keyboardMode="@+id/mode_url"
android:keyWidth="10%p"
android:rowEdgeFlags="bottom"
>
<Key
android:codes="@integer/key_symbol"
android:keyLabel="@string/label_symbol_key"
android:keyWidth="20%p"
android:keyEdgeFlags="left" />
<Key
android:keyLabel="/" />
<Key
android:codes="@integer/key_space"
android:keyIcon="@drawable/sym_bkeyboard_space"
android:iconPreview="@drawable/sym_keyboard_feedback_space"
android:keyWidth="40%p"
android:isRepeatable="true" />
<Key
android:keyLabel="."
android:popupKeyboard="@xml/popup_punctuation" />
<Key
android:codes="@integer/key_return"
android:keyIcon="@drawable/sym_bkeyboard_return"
android:iconPreview="@drawable/sym_keyboard_feedback_return"
android:keyWidth="20%p"
android:keyEdgeFlags="right" />
</Row>
<Row
android:keyboardMode="@+id/mode_email"
android:keyWidth="10%p"
android:rowEdgeFlags="bottom"
>
<Key
android:codes="@integer/key_symbol"
android:keyLabel="@string/label_symbol_key"
android:keyWidth="20%p"
android:keyEdgeFlags="left" />
<Key
android:keyLabel="\@" />
<Key
android:codes="@integer/key_space"
android:keyIcon="@drawable/sym_bkeyboard_space"
android:iconPreview="@drawable/sym_keyboard_feedback_space"
android:keyWidth="40%p"
android:isRepeatable="true" />
<Key
android:keyLabel="."
android:popupKeyboard="@xml/popup_punctuation" />
<Key
android:codes="@integer/key_return"
android:keyIcon="@drawable/sym_bkeyboard_return"
android:iconPreview="@drawable/sym_keyboard_feedback_return"
android:keyWidth="20%p"
android:keyEdgeFlags="right" />
</Row>
<Row
android:keyboardMode="@+id/mode_im"
android:keyWidth="10%p"
android:rowEdgeFlags="bottom"
>
<Key
android:codes="@integer/key_symbol"
android:keyLabel="@string/label_symbol_key"
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" />
<Key
android:codes="@integer/key_space"
android:keyIcon="@drawable/sym_bkeyboard_space"
android:iconPreview="@drawable/sym_keyboard_feedback_space"
android:keyWidth="40%p"
android:isRepeatable="true" />
<Key
android:keyLabel="."
android:popupKeyboard="@xml/popup_punctuation" />
<Key
android:keyLabel=":-)"
android:keyOutputText=":-) "
android:popupKeyboard="@xml/popup_smileys"
android:keyWidth="20%p"
android:keyEdgeFlags="right" />
</Row>
<Row
android:keyboardMode="@+id/mode_webentry"
android:keyWidth="10%p"
android:rowEdgeFlags="bottom"
>
<Key
android:codes="@integer/key_symbol"
android:keyLabel="@string/label_symbol_key"
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" />
<Key
android:codes="@integer/key_space"
android:keyIcon="@drawable/sym_bkeyboard_space"
android:iconPreview="@drawable/sym_keyboard_feedback_space"
android:keyWidth="20%p"
android:isRepeatable="true" />
<Key
android:codes="@integer/key_tab"
android:keyIcon="@drawable/sym_bkeyboard_tab"
android:iconPreview="@drawable/sym_keyboard_feedback_tab"
android:keyWidth="20%p" />
<Key
android:keyLabel="."
android:popupKeyboard="@xml/popup_punctuation" />
<Key
android:codes="@integer/key_return"
android:keyIcon="@drawable/sym_bkeyboard_return"
android:iconPreview="@drawable/sym_keyboard_feedback_return"
android:keyWidth="20%p"
android:keyEdgeFlags="right" />
</Row>
<Row
android:keyboardMode="@+id/mode_normal_with_settings_key"
android:keyWidth="10%p"
android:rowEdgeFlags="bottom" android:rowEdgeFlags="bottom"
> >
<Key <Key
@ -189,11 +305,11 @@
<Key <Key
android:codes="@integer/key_settings" android:codes="@integer/key_settings"
android:keyIcon="@drawable/sym_bkeyboard_settings" android:keyIcon="@drawable/sym_bkeyboard_settings"
android:iconPreview="@drawable/sym_keyboard_feedback_settings" android:iconPreview="@drawable/sym_keyboard_feedback_settings" />
android:keyWidth="10%p" />
<Key <Key
android:keyLabel="/" android:codes="@integer/key_f1"
android:keyWidth="10%p" /> android:keyIcon="@drawable/sym_bkeyboard_mic"
android:iconPreview="@drawable/sym_keyboard_feedback_mic" />
<Key <Key
android:codes="@integer/key_space" android:codes="@integer/key_space"
android:keyIcon="@drawable/sym_bkeyboard_space" android:keyIcon="@drawable/sym_bkeyboard_space"
@ -202,8 +318,7 @@
android:isRepeatable="true" /> android:isRepeatable="true" />
<Key <Key
android:keyLabel="." android:keyLabel="."
android:popupKeyboard="@xml/popup_punctuation" android:popupKeyboard="@xml/popup_punctuation" />
android:keyWidth="10%p" />
<Key <Key
android:codes="@integer/key_return" android:codes="@integer/key_return"
android:keyIcon="@drawable/sym_bkeyboard_return" android:keyIcon="@drawable/sym_bkeyboard_return"
@ -212,7 +327,8 @@
android:keyEdgeFlags="right" /> android:keyEdgeFlags="right" />
</Row> </Row>
<Row <Row
android:keyboardMode="@+id/mode_email" android:keyboardMode="@+id/mode_url_with_settings_key"
android:keyWidth="10%p"
android:rowEdgeFlags="bottom" android:rowEdgeFlags="bottom"
> >
<Key <Key
@ -223,8 +339,39 @@
<Key <Key
android:codes="@integer/key_settings" android:codes="@integer/key_settings"
android:keyIcon="@drawable/sym_bkeyboard_settings" android:keyIcon="@drawable/sym_bkeyboard_settings"
android:iconPreview="@drawable/sym_keyboard_feedback_settings" android:iconPreview="@drawable/sym_keyboard_feedback_settings" />
android:keyWidth="10%p" /> <Key
android:keyLabel="/" />
<Key
android:codes="@integer/key_space"
android:keyIcon="@drawable/sym_bkeyboard_space"
android:iconPreview="@drawable/sym_keyboard_feedback_space"
android:keyWidth="30%p"
android:isRepeatable="true" />
<Key
android:keyLabel="."
android:popupKeyboard="@xml/popup_punctuation" />
<Key
android:codes="@integer/key_return"
android:keyIcon="@drawable/sym_bkeyboard_return"
android:iconPreview="@drawable/sym_keyboard_feedback_return"
android:keyWidth="25%p"
android:keyEdgeFlags="right" />
</Row>
<Row
android:keyboardMode="@+id/mode_email_with_settings_key"
android:keyWidth="10%p"
android:rowEdgeFlags="bottom"
>
<Key
android:codes="@integer/key_symbol"
android:keyLabel="@string/label_symbol_key"
android:keyWidth="15%p"
android:keyEdgeFlags="left" />
<Key
android:codes="@integer/key_settings"
android:keyIcon="@drawable/sym_bkeyboard_settings"
android:iconPreview="@drawable/sym_keyboard_feedback_settings" />
<Key <Key
android:keyLabel="\@" /> android:keyLabel="\@" />
<Key <Key
@ -244,7 +391,8 @@
android:keyEdgeFlags="right" /> android:keyEdgeFlags="right" />
</Row> </Row>
<Row <Row
android:keyboardMode="@+id/mode_im" android:keyboardMode="@+id/mode_im_with_settings_key"
android:keyWidth="10%p"
android:rowEdgeFlags="bottom" android:rowEdgeFlags="bottom"
> >
<Key <Key
@ -255,13 +403,11 @@
<Key <Key
android:codes="@integer/key_settings" android:codes="@integer/key_settings"
android:keyIcon="@drawable/sym_bkeyboard_settings" android:keyIcon="@drawable/sym_bkeyboard_settings"
android:iconPreview="@drawable/sym_keyboard_feedback_settings" android:iconPreview="@drawable/sym_keyboard_feedback_settings" />
android:keyWidth="10%p" />
<Key <Key
android:codes="@integer/key_f1" android:codes="@integer/key_f1"
android:keyIcon="@drawable/sym_bkeyboard_mic" android:keyIcon="@drawable/sym_bkeyboard_mic"
android:iconPreview="@drawable/sym_keyboard_feedback_mic" android:iconPreview="@drawable/sym_keyboard_feedback_mic" />
android:keyWidth="10%p" />
<Key <Key
android:codes="@integer/key_space" android:codes="@integer/key_space"
android:keyIcon="@drawable/sym_bkeyboard_space" android:keyIcon="@drawable/sym_bkeyboard_space"
@ -270,8 +416,7 @@
android:isRepeatable="true" /> android:isRepeatable="true" />
<Key <Key
android:keyLabel="." android:keyLabel="."
android:popupKeyboard="@xml/popup_punctuation" android:popupKeyboard="@xml/popup_punctuation" />
android:keyWidth="10%p" />
<Key <Key
android:keyLabel=":-)" android:keyLabel=":-)"
android:keyOutputText=":-) " android:keyOutputText=":-) "
@ -280,7 +425,8 @@
android:keyEdgeFlags="right" /> android:keyEdgeFlags="right" />
</Row> </Row>
<Row <Row
android:keyboardMode="@+id/mode_webentry" android:keyboardMode="@+id/mode_webentry_with_settings_key"
android:keyWidth="10%p"
android:rowEdgeFlags="bottom" android:rowEdgeFlags="bottom"
> >
<Key <Key
@ -291,13 +437,11 @@
<Key <Key
android:codes="@integer/key_settings" android:codes="@integer/key_settings"
android:keyIcon="@drawable/sym_bkeyboard_settings" android:keyIcon="@drawable/sym_bkeyboard_settings"
android:iconPreview="@drawable/sym_keyboard_feedback_settings" android:iconPreview="@drawable/sym_keyboard_feedback_settings" />
android:keyWidth="10%p" />
<Key <Key
android:codes="@integer/key_f1" android:codes="@integer/key_f1"
android:keyIcon="@drawable/sym_bkeyboard_mic" android:keyIcon="@drawable/sym_bkeyboard_mic"
android:iconPreview="@drawable/sym_keyboard_feedback_mic" android:iconPreview="@drawable/sym_keyboard_feedback_mic" />
android:keyWidth="10%p" />
<Key <Key
android:codes="@integer/key_space" android:codes="@integer/key_space"
android:keyIcon="@drawable/sym_bkeyboard_space" android:keyIcon="@drawable/sym_bkeyboard_space"
@ -307,12 +451,10 @@
<Key <Key
android:codes="@integer/key_tab" android:codes="@integer/key_tab"
android:keyIcon="@drawable/sym_bkeyboard_tab" android:keyIcon="@drawable/sym_bkeyboard_tab"
android:iconPreview="@drawable/sym_keyboard_feedback_tab" android:iconPreview="@drawable/sym_keyboard_feedback_tab" />
android:keyWidth="10%p" />
<Key <Key
android:keyLabel="." android:keyLabel="."
android:popupKeyboard="@xml/popup_punctuation" android:popupKeyboard="@xml/popup_punctuation" />
android:keyWidth="10%p" />
<Key <Key
android:codes="@integer/key_return" android:codes="@integer/key_return"
android:keyIcon="@drawable/sym_bkeyboard_return" android:keyIcon="@drawable/sym_bkeyboard_return"

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

@ -145,48 +145,184 @@
</Row> </Row>
<Row <Row
android:keyboardMode="@+id/mode_normal" android:keyboardMode="@+id/mode_normal"
android:keyWidth="10%p"
android:rowEdgeFlags="bottom" android:rowEdgeFlags="bottom"
> >
<Key <Key
android:codes="@integer/key_symbol" android:codes="@integer/key_symbol"
android:keyLabel="@string/label_symbol_key" android:keyLabel="@string/label_symbol_key"
android:keyWidth="15%p" android:keyWidth="20%p"
android:isModifier="true" android:isModifier="true"
android:keyEdgeFlags="left" /> android:keyEdgeFlags="left" />
<Key
android:codes="@integer/key_settings"
android:keyIcon="@drawable/sym_keyboard_settings"
android:iconPreview="@drawable/sym_keyboard_feedback_settings"
android:keyWidth="10%p"
android:isModifier="true" />
<Key <Key
android:codes="@integer/key_f1" android:codes="@integer/key_f1"
android:keyIcon="@drawable/sym_keyboard_mic" android:keyIcon="@drawable/sym_keyboard_mic"
android:iconPreview="@drawable/sym_keyboard_feedback_mic" android:iconPreview="@drawable/sym_keyboard_feedback_mic"
android:keyWidth="10%p"
android:isModifier="true" /> android:isModifier="true" />
<Key <Key
android:codes="@integer/key_space" android:codes="@integer/key_space"
android:keyIcon="@drawable/sym_keyboard_space" android:keyIcon="@drawable/sym_keyboard_space"
android:iconPreview="@drawable/sym_keyboard_feedback_space" android:iconPreview="@drawable/sym_keyboard_feedback_space"
android:keyWidth="30%p" android:keyWidth="40%p"
android:isModifier="true" android:isModifier="true"
android:isRepeatable="true" /> android:isRepeatable="true" />
<Key <Key
android:keyLabel="." android:keyLabel="."
android:popupKeyboard="@xml/popup_punctuation" android:popupKeyboard="@xml/popup_punctuation"
android:keyWidth="10%p"
android:isModifier="true" /> android:isModifier="true" />
<Key <Key
android:codes="@integer/key_return" android:codes="@integer/key_return"
android:keyIcon="@drawable/sym_keyboard_return" android:keyIcon="@drawable/sym_keyboard_return"
android:iconPreview="@drawable/sym_keyboard_feedback_return" android:iconPreview="@drawable/sym_keyboard_feedback_return"
android:keyWidth="25%p" android:keyWidth="20%p"
android:isModifier="true" android:isModifier="true"
android:keyEdgeFlags="right" /> android:keyEdgeFlags="right" />
</Row> </Row>
<Row <Row
android:keyboardMode="@+id/mode_url" android:keyboardMode="@+id/mode_url"
android:keyWidth="10%p"
android:rowEdgeFlags="bottom"
>
<Key
android:codes="@integer/key_symbol"
android:keyLabel="@string/label_symbol_key"
android:keyWidth="20%p"
android:isModifier="true"
android:keyEdgeFlags="left" />
<Key
android:keyLabel="/"
android:isModifier="true" />
<Key
android:codes="@integer/key_space"
android:keyIcon="@drawable/sym_keyboard_space"
android:iconPreview="@drawable/sym_keyboard_feedback_space"
android:keyWidth="40%p"
android:isModifier="true"
android:isRepeatable="true" />
<Key
android:keyLabel="."
android:popupKeyboard="@xml/popup_punctuation"
android:isModifier="true" />
<Key
android:codes="@integer/key_return"
android:keyIcon="@drawable/sym_keyboard_return"
android:iconPreview="@drawable/sym_keyboard_feedback_return"
android:keyWidth="20%p"
android:isModifier="true"
android:keyEdgeFlags="right" />
</Row>
<Row
android:keyboardMode="@+id/mode_email"
android:keyWidth="10%p"
android:rowEdgeFlags="bottom"
>
<Key
android:codes="@integer/key_symbol"
android:keyLabel="@string/label_symbol_key"
android:keyWidth="20%p"
android:isModifier="true"
android:keyEdgeFlags="left" />
<Key
android:keyLabel="\@"
android:isModifier="true" />
<Key
android:codes="@integer/key_space"
android:keyIcon="@drawable/sym_keyboard_space"
android:iconPreview="@drawable/sym_keyboard_feedback_space"
android:keyWidth="40%p"
android:isModifier="true"
android:isRepeatable="true" />
<Key
android:keyLabel="."
android:popupKeyboard="@xml/popup_punctuation"
android:isModifier="true" />
<Key
android:codes="@integer/key_return"
android:keyIcon="@drawable/sym_keyboard_return"
android:iconPreview="@drawable/sym_keyboard_feedback_return"
android:keyWidth="20%p"
android:isModifier="true"
android:keyEdgeFlags="right" />
</Row>
<Row
android:keyboardMode="@+id/mode_im"
android:keyWidth="10%p"
android:rowEdgeFlags="bottom"
>
<Key
android:codes="@integer/key_symbol"
android:keyLabel="@string/label_symbol_key"
android:keyWidth="20%p"
android:isModifier="true"
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"
android:keyIcon="@drawable/sym_keyboard_space"
android:iconPreview="@drawable/sym_keyboard_feedback_space"
android:keyWidth="40%p"
android:isModifier="true"
android:isRepeatable="true" />
<Key
android:keyLabel="."
android:popupKeyboard="@xml/popup_punctuation"
android:isModifier="true" />
<Key
android:keyLabel=":-)"
android:keyOutputText=":-) "
android:popupKeyboard="@xml/popup_smileys"
android:keyWidth="20%p"
android:isModifier="true"
android:keyEdgeFlags="right" />
</Row>
<Row
android:keyboardMode="@+id/mode_webentry"
android:keyWidth="10%p"
android:rowEdgeFlags="bottom"
>
<Key
android:codes="@integer/key_symbol"
android:keyLabel="@string/label_symbol_key"
android:keyWidth="20%p"
android:isModifier="true"
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"
android:keyIcon="@drawable/sym_keyboard_space"
android:iconPreview="@drawable/sym_keyboard_feedback_space"
android:keyWidth="20%p"
android:isModifier="true"
android:isRepeatable="true" />
<Key
android:codes="@integer/key_tab"
android:keyIcon="@drawable/sym_keyboard_tab"
android:iconPreview="@drawable/sym_keyboard_feedback_tab"
android:keyWidth="20%p"
android:isModifier="true" />
<Key
android:keyLabel="."
android:popupKeyboard="@xml/popup_punctuation"
android:isModifier="true" />
<Key
android:codes="@integer/key_return"
android:keyIcon="@drawable/sym_keyboard_return"
android:iconPreview="@drawable/sym_keyboard_feedback_return"
android:keyWidth="20%p"
android:isModifier="true"
android:keyEdgeFlags="right" />
</Row>
<Row
android:keyboardMode="@+id/mode_normal_with_settings_key"
android:keyWidth="10%p"
android:rowEdgeFlags="bottom" android:rowEdgeFlags="bottom"
> >
<Key <Key
@ -199,11 +335,11 @@
android:codes="@integer/key_settings" android:codes="@integer/key_settings"
android:keyIcon="@drawable/sym_keyboard_settings" android:keyIcon="@drawable/sym_keyboard_settings"
android:iconPreview="@drawable/sym_keyboard_feedback_settings" android:iconPreview="@drawable/sym_keyboard_feedback_settings"
android:keyWidth="10%p"
android:isModifier="true" /> android:isModifier="true" />
<Key <Key
android:keyLabel="/" android:codes="@integer/key_f1"
android:keyWidth="10%p" android:keyIcon="@drawable/sym_keyboard_mic"
android:iconPreview="@drawable/sym_keyboard_feedback_mic"
android:isModifier="true" /> android:isModifier="true" />
<Key <Key
android:codes="@integer/key_space" android:codes="@integer/key_space"
@ -215,7 +351,6 @@
<Key <Key
android:keyLabel="." android:keyLabel="."
android:popupKeyboard="@xml/popup_punctuation" android:popupKeyboard="@xml/popup_punctuation"
android:keyWidth="10%p"
android:isModifier="true" /> android:isModifier="true" />
<Key <Key
android:codes="@integer/key_return" android:codes="@integer/key_return"
@ -226,7 +361,8 @@
android:keyEdgeFlags="right" /> android:keyEdgeFlags="right" />
</Row> </Row>
<Row <Row
android:keyboardMode="@+id/mode_email" android:keyboardMode="@+id/mode_url_with_settings_key"
android:keyWidth="10%p"
android:rowEdgeFlags="bottom" android:rowEdgeFlags="bottom"
> >
<Key <Key
@ -239,7 +375,44 @@
android:codes="@integer/key_settings" android:codes="@integer/key_settings"
android:keyIcon="@drawable/sym_keyboard_settings" android:keyIcon="@drawable/sym_keyboard_settings"
android:iconPreview="@drawable/sym_keyboard_feedback_settings" android:iconPreview="@drawable/sym_keyboard_feedback_settings"
android:isModifier="true" />
<Key
android:keyLabel="/"
android:isModifier="true" />
<Key
android:codes="@integer/key_space"
android:keyIcon="@drawable/sym_keyboard_space"
android:iconPreview="@drawable/sym_keyboard_feedback_space"
android:keyWidth="30%p"
android:isModifier="true"
android:isRepeatable="true" />
<Key
android:keyLabel="."
android:popupKeyboard="@xml/popup_punctuation"
android:isModifier="true" />
<Key
android:codes="@integer/key_return"
android:keyIcon="@drawable/sym_keyboard_return"
android:iconPreview="@drawable/sym_keyboard_feedback_return"
android:keyWidth="25%p"
android:isModifier="true"
android:keyEdgeFlags="right" />
</Row>
<Row
android:keyboardMode="@+id/mode_email_with_settings_key"
android:keyWidth="10%p" android:keyWidth="10%p"
android:rowEdgeFlags="bottom"
>
<Key
android:codes="@integer/key_symbol"
android:keyLabel="@string/label_symbol_key"
android:keyWidth="15%p"
android:isModifier="true"
android:keyEdgeFlags="left" />
<Key
android:codes="@integer/key_settings"
android:keyIcon="@drawable/sym_keyboard_settings"
android:iconPreview="@drawable/sym_keyboard_feedback_settings"
android:isModifier="true" /> android:isModifier="true" />
<Key <Key
android:keyLabel="\@" android:keyLabel="\@"
@ -264,7 +437,8 @@
android:keyEdgeFlags="right" /> android:keyEdgeFlags="right" />
</Row> </Row>
<Row <Row
android:keyboardMode="@+id/mode_im" android:keyboardMode="@+id/mode_im_with_settings_key"
android:keyWidth="10%p"
android:rowEdgeFlags="bottom" android:rowEdgeFlags="bottom"
> >
<Key <Key
@ -277,13 +451,11 @@
android:codes="@integer/key_settings" android:codes="@integer/key_settings"
android:keyIcon="@drawable/sym_keyboard_settings" android:keyIcon="@drawable/sym_keyboard_settings"
android:iconPreview="@drawable/sym_keyboard_feedback_settings" android:iconPreview="@drawable/sym_keyboard_feedback_settings"
android:keyWidth="10%p"
android:isModifier="true" /> android:isModifier="true" />
<Key <Key
android:codes="@integer/key_f1" android:codes="@integer/key_f1"
android:keyIcon="@drawable/sym_keyboard_mic" android:keyIcon="@drawable/sym_keyboard_mic"
android:iconPreview="@drawable/sym_keyboard_feedback_mic" android:iconPreview="@drawable/sym_keyboard_feedback_mic"
android:keyWidth="10%p"
android:isModifier="true" /> android:isModifier="true" />
<Key <Key
android:codes="@integer/key_space" android:codes="@integer/key_space"
@ -295,7 +467,6 @@
<Key <Key
android:keyLabel="." android:keyLabel="."
android:popupKeyboard="@xml/popup_punctuation" android:popupKeyboard="@xml/popup_punctuation"
android:keyWidth="10%p"
android:isModifier="true" /> android:isModifier="true" />
<Key <Key
android:keyLabel=":-)" android:keyLabel=":-)"
@ -306,7 +477,8 @@
android:keyEdgeFlags="right" /> android:keyEdgeFlags="right" />
</Row> </Row>
<Row <Row
android:keyboardMode="@+id/mode_webentry" android:keyboardMode="@+id/mode_webentry_with_settings_key"
android:keyWidth="10%p"
android:rowEdgeFlags="bottom" android:rowEdgeFlags="bottom"
> >
<Key <Key
@ -319,13 +491,11 @@
android:codes="@integer/key_settings" android:codes="@integer/key_settings"
android:keyIcon="@drawable/sym_keyboard_settings" android:keyIcon="@drawable/sym_keyboard_settings"
android:iconPreview="@drawable/sym_keyboard_feedback_settings" android:iconPreview="@drawable/sym_keyboard_feedback_settings"
android:keyWidth="10%p"
android:isModifier="true" /> android:isModifier="true" />
<Key <Key
android:codes="@integer/key_f1" android:codes="@integer/key_f1"
android:keyIcon="@drawable/sym_keyboard_mic" android:keyIcon="@drawable/sym_keyboard_mic"
android:iconPreview="@drawable/sym_keyboard_feedback_mic" android:iconPreview="@drawable/sym_keyboard_feedback_mic"
android:keyWidth="10%p"
android:isModifier="true" /> android:isModifier="true" />
<Key <Key
android:codes="@integer/key_space" android:codes="@integer/key_space"
@ -338,12 +508,10 @@
android:codes="@integer/key_tab" android:codes="@integer/key_tab"
android:keyIcon="@drawable/sym_keyboard_tab" android:keyIcon="@drawable/sym_keyboard_tab"
android:iconPreview="@drawable/sym_keyboard_feedback_tab" android:iconPreview="@drawable/sym_keyboard_feedback_tab"
android:keyWidth="10%p"
android:isModifier="true" /> android:isModifier="true" />
<Key <Key
android:keyLabel="." android:keyLabel="."
android:popupKeyboard="@xml/popup_punctuation" android:popupKeyboard="@xml/popup_punctuation"
android:keyWidth="10%p"
android:isModifier="true" /> android:isModifier="true" />
<Key <Key
android:codes="@integer/key_return" android:codes="@integer/key_return"

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

@ -144,42 +144,158 @@
</Row> </Row>
<Row <Row
android:keyboardMode="@+id/mode_normal" android:keyboardMode="@+id/mode_normal"
android:keyWidth="10%p"
android:rowEdgeFlags="bottom" android:rowEdgeFlags="bottom"
> >
<Key <Key
android:codes="@integer/key_symbol" android:codes="@integer/key_symbol"
android:keyLabel="@string/label_symbol_key" android:keyLabel="@string/label_symbol_key"
android:keyWidth="15%p" android:keyWidth="20%p"
android:keyEdgeFlags="left" /> android:keyEdgeFlags="left" />
<Key
android:codes="@integer/key_settings"
android:keyIcon="@drawable/sym_bkeyboard_settings"
android:iconPreview="@drawable/sym_keyboard_feedback_settings"
android:keyWidth="10%p" />
<Key <Key
android:codes="@integer/key_f1" android:codes="@integer/key_f1"
android:keyIcon="@drawable/sym_bkeyboard_mic" android:keyIcon="@drawable/sym_bkeyboard_mic"
android:iconPreview="@drawable/sym_keyboard_feedback_mic" android:iconPreview="@drawable/sym_keyboard_feedback_mic" />
android:keyWidth="10%p" />
<Key <Key
android:codes="@integer/key_space" android:codes="@integer/key_space"
android:keyIcon="@drawable/sym_bkeyboard_space" android:keyIcon="@drawable/sym_bkeyboard_space"
android:iconPreview="@drawable/sym_keyboard_feedback_space" android:iconPreview="@drawable/sym_keyboard_feedback_space"
android:keyWidth="30%p" android:keyWidth="40%p"
android:isRepeatable="true" /> android:isRepeatable="true" />
<Key <Key
android:keyLabel="." android:keyLabel="."
android:popupKeyboard="@xml/popup_punctuation" android:popupKeyboard="@xml/popup_punctuation" />
android:keyWidth="10%p" />
<Key <Key
android:codes="@integer/key_return" android:codes="@integer/key_return"
android:keyIcon="@drawable/sym_bkeyboard_return" android:keyIcon="@drawable/sym_bkeyboard_return"
android:iconPreview="@drawable/sym_keyboard_feedback_return" android:iconPreview="@drawable/sym_keyboard_feedback_return"
android:keyWidth="25%p" android:keyWidth="20%p"
android:keyEdgeFlags="right" /> android:keyEdgeFlags="right" />
</Row> </Row>
<Row <Row
android:keyboardMode="@+id/mode_url" android:keyboardMode="@+id/mode_url"
android:keyWidth="10%p"
android:rowEdgeFlags="bottom"
>
<Key
android:codes="@integer/key_symbol"
android:keyLabel="@string/label_symbol_key"
android:keyWidth="20%p"
android:keyEdgeFlags="left" />
<Key
android:keyLabel="/" />
<Key
android:codes="@integer/key_space"
android:keyIcon="@drawable/sym_bkeyboard_space"
android:iconPreview="@drawable/sym_keyboard_feedback_space"
android:keyWidth="40%p"
android:isRepeatable="true" />
<Key
android:keyLabel="."
android:popupKeyboard="@xml/popup_punctuation" />
<Key
android:codes="@integer/key_return"
android:keyIcon="@drawable/sym_bkeyboard_return"
android:iconPreview="@drawable/sym_keyboard_feedback_return"
android:keyWidth="20%p"
android:keyEdgeFlags="right" />
</Row>
<Row
android:keyboardMode="@+id/mode_email"
android:keyWidth="10%p"
android:rowEdgeFlags="bottom"
>
<Key
android:codes="@integer/key_symbol"
android:keyLabel="@string/label_symbol_key"
android:keyWidth="20%p"
android:keyEdgeFlags="left" />
<Key
android:keyLabel="\@" />
<Key
android:codes="@integer/key_space"
android:keyIcon="@drawable/sym_bkeyboard_space"
android:iconPreview="@drawable/sym_keyboard_feedback_space"
android:keyWidth="40%p"
android:isRepeatable="true" />
<Key
android:keyLabel="."
android:popupKeyboard="@xml/popup_punctuation" />
<Key
android:codes="@integer/key_return"
android:keyIcon="@drawable/sym_bkeyboard_return"
android:iconPreview="@drawable/sym_keyboard_feedback_return"
android:keyWidth="20%p"
android:keyEdgeFlags="right" />
</Row>
<Row
android:keyboardMode="@+id/mode_im"
android:keyWidth="10%p"
android:rowEdgeFlags="bottom"
>
<Key
android:codes="@integer/key_symbol"
android:keyLabel="@string/label_symbol_key"
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" />
<Key
android:codes="@integer/key_space"
android:keyIcon="@drawable/sym_bkeyboard_space"
android:iconPreview="@drawable/sym_keyboard_feedback_space"
android:keyWidth="40%p"
android:isRepeatable="true" />
<Key
android:keyLabel="."
android:popupKeyboard="@xml/popup_punctuation" />
<Key
android:keyLabel=":-)"
android:keyOutputText=":-) "
android:popupKeyboard="@xml/popup_smileys"
android:keyWidth="20%p"
android:keyEdgeFlags="right" />
</Row>
<Row
android:keyboardMode="@+id/mode_webentry"
android:keyWidth="10%p"
android:rowEdgeFlags="bottom"
>
<Key
android:codes="@integer/key_symbol"
android:keyLabel="@string/label_symbol_key"
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" />
<Key
android:codes="@integer/key_space"
android:keyIcon="@drawable/sym_bkeyboard_space"
android:iconPreview="@drawable/sym_keyboard_feedback_space"
android:keyWidth="20%p"
android:isRepeatable="true" />
<Key
android:codes="@integer/key_tab"
android:keyIcon="@drawable/sym_bkeyboard_tab"
android:iconPreview="@drawable/sym_keyboard_feedback_tab"
android:keyWidth="20%p" />
<Key
android:keyLabel="."
android:popupKeyboard="@xml/popup_punctuation" />
<Key
android:codes="@integer/key_return"
android:keyIcon="@drawable/sym_bkeyboard_return"
android:iconPreview="@drawable/sym_keyboard_feedback_return"
android:keyWidth="20%p"
android:keyEdgeFlags="right" />
</Row>
<Row
android:keyboardMode="@+id/mode_normal_with_settings_key"
android:keyWidth="10%p"
android:rowEdgeFlags="bottom" android:rowEdgeFlags="bottom"
> >
<Key <Key
@ -190,11 +306,11 @@
<Key <Key
android:codes="@integer/key_settings" android:codes="@integer/key_settings"
android:keyIcon="@drawable/sym_bkeyboard_settings" android:keyIcon="@drawable/sym_bkeyboard_settings"
android:iconPreview="@drawable/sym_keyboard_feedback_settings" android:iconPreview="@drawable/sym_keyboard_feedback_settings" />
android:keyWidth="10%p" />
<Key <Key
android:keyLabel="/" android:codes="@integer/key_f1"
android:keyWidth="10%p" /> android:keyIcon="@drawable/sym_bkeyboard_mic"
android:iconPreview="@drawable/sym_keyboard_feedback_mic" />
<Key <Key
android:codes="@integer/key_space" android:codes="@integer/key_space"
android:keyIcon="@drawable/sym_bkeyboard_space" android:keyIcon="@drawable/sym_bkeyboard_space"
@ -203,8 +319,7 @@
android:isRepeatable="true" /> android:isRepeatable="true" />
<Key <Key
android:keyLabel="." android:keyLabel="."
android:popupKeyboard="@xml/popup_punctuation" android:popupKeyboard="@xml/popup_punctuation" />
android:keyWidth="10%p" />
<Key <Key
android:codes="@integer/key_return" android:codes="@integer/key_return"
android:keyIcon="@drawable/sym_bkeyboard_return" android:keyIcon="@drawable/sym_bkeyboard_return"
@ -213,7 +328,8 @@
android:keyEdgeFlags="right" /> android:keyEdgeFlags="right" />
</Row> </Row>
<Row <Row
android:keyboardMode="@+id/mode_email" android:keyboardMode="@+id/mode_url_with_settings_key"
android:keyWidth="10%p"
android:rowEdgeFlags="bottom" android:rowEdgeFlags="bottom"
> >
<Key <Key
@ -224,8 +340,39 @@
<Key <Key
android:codes="@integer/key_settings" android:codes="@integer/key_settings"
android:keyIcon="@drawable/sym_bkeyboard_settings" android:keyIcon="@drawable/sym_bkeyboard_settings"
android:iconPreview="@drawable/sym_keyboard_feedback_settings" android:iconPreview="@drawable/sym_keyboard_feedback_settings" />
android:keyWidth="10%p" /> <Key
android:keyLabel="/" />
<Key
android:codes="@integer/key_space"
android:keyIcon="@drawable/sym_bkeyboard_space"
android:iconPreview="@drawable/sym_keyboard_feedback_space"
android:keyWidth="30%p"
android:isRepeatable="true" />
<Key
android:keyLabel="."
android:popupKeyboard="@xml/popup_punctuation" />
<Key
android:codes="@integer/key_return"
android:keyIcon="@drawable/sym_bkeyboard_return"
android:iconPreview="@drawable/sym_keyboard_feedback_return"
android:keyWidth="25%p"
android:keyEdgeFlags="right" />
</Row>
<Row
android:keyboardMode="@+id/mode_email_with_settings_key"
android:keyWidth="10%p"
android:rowEdgeFlags="bottom"
>
<Key
android:codes="@integer/key_symbol"
android:keyLabel="@string/label_symbol_key"
android:keyWidth="15%p"
android:keyEdgeFlags="left" />
<Key
android:codes="@integer/key_settings"
android:keyIcon="@drawable/sym_bkeyboard_settings"
android:iconPreview="@drawable/sym_keyboard_feedback_settings" />
<Key <Key
android:keyLabel="\@" /> android:keyLabel="\@" />
<Key <Key
@ -245,7 +392,8 @@
android:keyEdgeFlags="right" /> android:keyEdgeFlags="right" />
</Row> </Row>
<Row <Row
android:keyboardMode="@+id/mode_im" android:keyboardMode="@+id/mode_im_with_settings_key"
android:keyWidth="10%p"
android:rowEdgeFlags="bottom" android:rowEdgeFlags="bottom"
> >
<Key <Key
@ -256,13 +404,11 @@
<Key <Key
android:codes="@integer/key_settings" android:codes="@integer/key_settings"
android:keyIcon="@drawable/sym_bkeyboard_settings" android:keyIcon="@drawable/sym_bkeyboard_settings"
android:iconPreview="@drawable/sym_keyboard_feedback_settings" android:iconPreview="@drawable/sym_keyboard_feedback_settings" />
android:keyWidth="10%p" />
<Key <Key
android:codes="@integer/key_f1" android:codes="@integer/key_f1"
android:keyIcon="@drawable/sym_bkeyboard_mic" android:keyIcon="@drawable/sym_bkeyboard_mic"
android:iconPreview="@drawable/sym_keyboard_feedback_mic" android:iconPreview="@drawable/sym_keyboard_feedback_mic" />
android:keyWidth="10%p" />
<Key <Key
android:codes="@integer/key_space" android:codes="@integer/key_space"
android:keyIcon="@drawable/sym_bkeyboard_space" android:keyIcon="@drawable/sym_bkeyboard_space"
@ -271,8 +417,7 @@
android:isRepeatable="true" /> android:isRepeatable="true" />
<Key <Key
android:keyLabel="." android:keyLabel="."
android:popupKeyboard="@xml/popup_punctuation" android:popupKeyboard="@xml/popup_punctuation" />
android:keyWidth="10%p" />
<Key <Key
android:keyLabel=":-)" android:keyLabel=":-)"
android:keyOutputText=":-) " android:keyOutputText=":-) "
@ -281,7 +426,8 @@
android:keyEdgeFlags="right" /> android:keyEdgeFlags="right" />
</Row> </Row>
<Row <Row
android:keyboardMode="@+id/mode_webentry" android:keyboardMode="@+id/mode_webentry_with_settings_key"
android:keyWidth="10%p"
android:rowEdgeFlags="bottom" android:rowEdgeFlags="bottom"
> >
<Key <Key
@ -292,13 +438,11 @@
<Key <Key
android:codes="@integer/key_settings" android:codes="@integer/key_settings"
android:keyIcon="@drawable/sym_bkeyboard_settings" android:keyIcon="@drawable/sym_bkeyboard_settings"
android:iconPreview="@drawable/sym_keyboard_feedback_settings" android:iconPreview="@drawable/sym_keyboard_feedback_settings" />
android:keyWidth="10%p" />
<Key <Key
android:codes="@integer/key_f1" android:codes="@integer/key_f1"
android:keyIcon="@drawable/sym_bkeyboard_mic" android:keyIcon="@drawable/sym_bkeyboard_mic"
android:iconPreview="@drawable/sym_keyboard_feedback_mic" android:iconPreview="@drawable/sym_keyboard_feedback_mic" />
android:keyWidth="10%p" />
<Key <Key
android:codes="@integer/key_space" android:codes="@integer/key_space"
android:keyIcon="@drawable/sym_bkeyboard_space" android:keyIcon="@drawable/sym_bkeyboard_space"
@ -308,12 +452,10 @@
<Key <Key
android:codes="@integer/key_tab" android:codes="@integer/key_tab"
android:keyIcon="@drawable/sym_bkeyboard_tab" android:keyIcon="@drawable/sym_bkeyboard_tab"
android:iconPreview="@drawable/sym_keyboard_feedback_tab" android:iconPreview="@drawable/sym_keyboard_feedback_tab" />
android:keyWidth="10%p" />
<Key <Key
android:keyLabel="." android:keyLabel="."
android:popupKeyboard="@xml/popup_punctuation" android:popupKeyboard="@xml/popup_punctuation" />
android:keyWidth="10%p" />
<Key <Key
android:codes="@integer/key_return" android:codes="@integer/key_return"
android:keyIcon="@drawable/sym_bkeyboard_return" android:keyIcon="@drawable/sym_bkeyboard_return"

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

@ -103,48 +103,184 @@
</Row> </Row>
<Row <Row
android:keyboardMode="@+id/mode_normal" android:keyboardMode="@+id/mode_normal"
android:keyWidth="10%p"
android:rowEdgeFlags="bottom" android:rowEdgeFlags="bottom"
> >
<Key <Key
android:codes="@integer/key_symbol" android:codes="@integer/key_symbol"
android:keyLabel="@string/label_symbol_key" android:keyLabel="@string/label_symbol_key"
android:keyWidth="15%p" android:keyWidth="20%p"
android:isModifier="true" android:isModifier="true"
android:keyEdgeFlags="left" /> android:keyEdgeFlags="left" />
<Key
android:codes="@integer/key_settings"
android:keyIcon="@drawable/sym_keyboard_settings"
android:iconPreview="@drawable/sym_keyboard_feedback_settings"
android:keyWidth="10%p"
android:isModifier="true" />
<Key <Key
android:codes="@integer/key_f1" android:codes="@integer/key_f1"
android:keyIcon="@drawable/sym_keyboard_mic" android:keyIcon="@drawable/sym_keyboard_mic"
android:iconPreview="@drawable/sym_keyboard_feedback_mic" android:iconPreview="@drawable/sym_keyboard_feedback_mic"
android:keyWidth="10%p"
android:isModifier="true" /> android:isModifier="true" />
<Key <Key
android:codes="@integer/key_space" android:codes="@integer/key_space"
android:keyIcon="@drawable/sym_keyboard_space" android:keyIcon="@drawable/sym_keyboard_space"
android:iconPreview="@drawable/sym_keyboard_feedback_space" android:iconPreview="@drawable/sym_keyboard_feedback_space"
android:keyWidth="30%p" android:keyWidth="40%p"
android:isModifier="true" android:isModifier="true"
android:isRepeatable="true" /> android:isRepeatable="true" />
<Key <Key
android:keyLabel="." android:keyLabel="."
android:popupKeyboard="@xml/popup_punctuation" android:popupKeyboard="@xml/popup_punctuation"
android:keyWidth="10%p"
android:isModifier="true" /> android:isModifier="true" />
<Key <Key
android:codes="@integer/key_return" android:codes="@integer/key_return"
android:keyIcon="@drawable/sym_keyboard_return" android:keyIcon="@drawable/sym_keyboard_return"
android:iconPreview="@drawable/sym_keyboard_feedback_return" android:iconPreview="@drawable/sym_keyboard_feedback_return"
android:keyWidth="25%p" android:keyWidth="20%p"
android:isModifier="true" android:isModifier="true"
android:keyEdgeFlags="right" /> android:keyEdgeFlags="right" />
</Row> </Row>
<Row <Row
android:keyboardMode="@+id/mode_url" android:keyboardMode="@+id/mode_url"
android:keyWidth="10%p"
android:rowEdgeFlags="bottom"
>
<Key
android:codes="@integer/key_symbol"
android:keyLabel="@string/label_symbol_key"
android:keyWidth="20%p"
android:isModifier="true"
android:keyEdgeFlags="left" />
<Key
android:keyLabel="/"
android:isModifier="true" />
<Key
android:codes="@integer/key_space"
android:keyIcon="@drawable/sym_keyboard_space"
android:iconPreview="@drawable/sym_keyboard_feedback_space"
android:keyWidth="40%p"
android:isModifier="true"
android:isRepeatable="true" />
<Key
android:keyLabel="."
android:popupKeyboard="@xml/popup_punctuation"
android:isModifier="true" />
<Key
android:codes="@integer/key_return"
android:keyIcon="@drawable/sym_keyboard_return"
android:iconPreview="@drawable/sym_keyboard_feedback_return"
android:keyWidth="20%p"
android:isModifier="true"
android:keyEdgeFlags="right" />
</Row>
<Row
android:keyboardMode="@+id/mode_email"
android:keyWidth="10%p"
android:rowEdgeFlags="bottom"
>
<Key
android:codes="@integer/key_symbol"
android:keyLabel="@string/label_symbol_key"
android:keyWidth="20%p"
android:isModifier="true"
android:keyEdgeFlags="left" />
<Key
android:keyLabel="\@"
android:isModifier="true" />
<Key
android:codes="@integer/key_space"
android:keyIcon="@drawable/sym_keyboard_space"
android:iconPreview="@drawable/sym_keyboard_feedback_space"
android:keyWidth="40%p"
android:isModifier="true"
android:isRepeatable="true" />
<Key
android:keyLabel="."
android:popupKeyboard="@xml/popup_punctuation"
android:isModifier="true" />
<Key
android:codes="@integer/key_return"
android:keyIcon="@drawable/sym_keyboard_return"
android:iconPreview="@drawable/sym_keyboard_feedback_return"
android:keyWidth="20%p"
android:isModifier="true"
android:keyEdgeFlags="right" />
</Row>
<Row
android:keyboardMode="@+id/mode_im"
android:keyWidth="10%p"
android:rowEdgeFlags="bottom"
>
<Key
android:codes="@integer/key_symbol"
android:keyLabel="@string/label_symbol_key"
android:keyWidth="20%p"
android:isModifier="true"
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"
android:keyIcon="@drawable/sym_keyboard_space"
android:iconPreview="@drawable/sym_keyboard_feedback_space"
android:keyWidth="40%p"
android:isModifier="true"
android:isRepeatable="true" />
<Key
android:keyLabel="."
android:popupKeyboard="@xml/popup_punctuation"
android:isModifier="true" />
<Key
android:keyLabel=":-)"
android:keyOutputText=":-) "
android:popupKeyboard="@xml/popup_smileys"
android:keyWidth="20%p"
android:isModifier="true"
android:keyEdgeFlags="right" />
</Row>
<Row
android:keyboardMode="@+id/mode_webentry"
android:keyWidth="10%p"
android:rowEdgeFlags="bottom"
>
<Key
android:codes="@integer/key_symbol"
android:keyLabel="@string/label_symbol_key"
android:keyWidth="20%p"
android:isModifier="true"
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"
android:keyIcon="@drawable/sym_keyboard_space"
android:iconPreview="@drawable/sym_keyboard_feedback_space"
android:keyWidth="20%p"
android:isModifier="true"
android:isRepeatable="true" />
<Key
android:codes="@integer/key_tab"
android:keyIcon="@drawable/sym_keyboard_tab"
android:iconPreview="@drawable/sym_keyboard_feedback_tab"
android:keyWidth="20%p"
android:isModifier="true" />
<Key
android:keyLabel="."
android:popupKeyboard="@xml/popup_punctuation"
android:isModifier="true" />
<Key
android:codes="@integer/key_return"
android:keyIcon="@drawable/sym_keyboard_return"
android:iconPreview="@drawable/sym_keyboard_feedback_return"
android:keyWidth="20%p"
android:isModifier="true"
android:keyEdgeFlags="right" />
</Row>
<Row
android:keyboardMode="@+id/mode_normal_with_settings_key"
android:keyWidth="10%p"
android:rowEdgeFlags="bottom" android:rowEdgeFlags="bottom"
> >
<Key <Key
@ -157,11 +293,11 @@
android:codes="@integer/key_settings" android:codes="@integer/key_settings"
android:keyIcon="@drawable/sym_keyboard_settings" android:keyIcon="@drawable/sym_keyboard_settings"
android:iconPreview="@drawable/sym_keyboard_feedback_settings" android:iconPreview="@drawable/sym_keyboard_feedback_settings"
android:keyWidth="10%p"
android:isModifier="true" /> android:isModifier="true" />
<Key <Key
android:keyLabel="/" android:codes="@integer/key_f1"
android:keyWidth="10%p" android:keyIcon="@drawable/sym_keyboard_mic"
android:iconPreview="@drawable/sym_keyboard_feedback_mic"
android:isModifier="true" /> android:isModifier="true" />
<Key <Key
android:codes="@integer/key_space" android:codes="@integer/key_space"
@ -173,7 +309,6 @@
<Key <Key
android:keyLabel="." android:keyLabel="."
android:popupKeyboard="@xml/popup_punctuation" android:popupKeyboard="@xml/popup_punctuation"
android:keyWidth="10%p"
android:isModifier="true" /> android:isModifier="true" />
<Key <Key
android:codes="@integer/key_return" android:codes="@integer/key_return"
@ -184,20 +319,58 @@
android:keyEdgeFlags="right" /> android:keyEdgeFlags="right" />
</Row> </Row>
<Row <Row
android:keyboardMode="@+id/mode_email" android:keyboardMode="@+id/mode_url_with_settings_key"
android:keyWidth="10%p"
android:rowEdgeFlags="bottom" android:rowEdgeFlags="bottom"
> >
<Key <Key
android:codes="@integer/key_symbol" android:codes="@integer/key_symbol"
android:keyLabel="@string/label_symbol_key" android:keyLabel="@string/label_symbol_key"
android:keyWidth="15%p" android:keyWidth="15%p"
android:keyEdgeFlags="left" android:isModifier="true"
android:isModifier="true" /> android:keyEdgeFlags="left" />
<Key <Key
android:codes="@integer/key_settings" android:codes="@integer/key_settings"
android:keyIcon="@drawable/sym_keyboard_settings" android:keyIcon="@drawable/sym_keyboard_settings"
android:iconPreview="@drawable/sym_keyboard_feedback_settings" android:iconPreview="@drawable/sym_keyboard_feedback_settings"
android:isModifier="true" />
<Key
android:keyLabel="/"
android:isModifier="true" />
<Key
android:codes="@integer/key_space"
android:keyIcon="@drawable/sym_keyboard_space"
android:iconPreview="@drawable/sym_keyboard_feedback_space"
android:keyWidth="30%p"
android:isModifier="true"
android:isRepeatable="true" />
<Key
android:keyLabel="."
android:popupKeyboard="@xml/popup_punctuation"
android:isModifier="true" />
<Key
android:codes="@integer/key_return"
android:keyIcon="@drawable/sym_keyboard_return"
android:iconPreview="@drawable/sym_keyboard_feedback_return"
android:keyWidth="25%p"
android:isModifier="true"
android:keyEdgeFlags="right" />
</Row>
<Row
android:keyboardMode="@+id/mode_email_with_settings_key"
android:keyWidth="10%p" android:keyWidth="10%p"
android:rowEdgeFlags="bottom"
>
<Key
android:codes="@integer/key_symbol"
android:keyLabel="@string/label_symbol_key"
android:keyWidth="15%p"
android:isModifier="true"
android:keyEdgeFlags="left" />
<Key
android:codes="@integer/key_settings"
android:keyIcon="@drawable/sym_keyboard_settings"
android:iconPreview="@drawable/sym_keyboard_feedback_settings"
android:isModifier="true" /> android:isModifier="true" />
<Key <Key
android:keyLabel="\@" android:keyLabel="\@"
@ -222,7 +395,8 @@
android:keyEdgeFlags="right" /> android:keyEdgeFlags="right" />
</Row> </Row>
<Row <Row
android:keyboardMode="@+id/mode_im" android:keyboardMode="@+id/mode_im_with_settings_key"
android:keyWidth="10%p"
android:rowEdgeFlags="bottom" android:rowEdgeFlags="bottom"
> >
<Key <Key
@ -235,13 +409,11 @@
android:codes="@integer/key_settings" android:codes="@integer/key_settings"
android:keyIcon="@drawable/sym_keyboard_settings" android:keyIcon="@drawable/sym_keyboard_settings"
android:iconPreview="@drawable/sym_keyboard_feedback_settings" android:iconPreview="@drawable/sym_keyboard_feedback_settings"
android:keyWidth="10%p"
android:isModifier="true" /> android:isModifier="true" />
<Key <Key
android:codes="@integer/key_f1" android:codes="@integer/key_f1"
android:keyIcon="@drawable/sym_keyboard_mic" android:keyIcon="@drawable/sym_keyboard_mic"
android:iconPreview="@drawable/sym_keyboard_feedback_mic" android:iconPreview="@drawable/sym_keyboard_feedback_mic"
android:keyWidth="10%p"
android:isModifier="true" /> android:isModifier="true" />
<Key <Key
android:codes="@integer/key_space" android:codes="@integer/key_space"
@ -253,7 +425,6 @@
<Key <Key
android:keyLabel="." android:keyLabel="."
android:popupKeyboard="@xml/popup_punctuation" android:popupKeyboard="@xml/popup_punctuation"
android:keyWidth="10%p"
android:isModifier="true" /> android:isModifier="true" />
<Key <Key
android:keyLabel=":-)" android:keyLabel=":-)"
@ -264,7 +435,8 @@
android:keyEdgeFlags="right" /> android:keyEdgeFlags="right" />
</Row> </Row>
<Row <Row
android:keyboardMode="@+id/mode_webentry" android:keyboardMode="@+id/mode_webentry_with_settings_key"
android:keyWidth="10%p"
android:rowEdgeFlags="bottom" android:rowEdgeFlags="bottom"
> >
<Key <Key
@ -277,13 +449,11 @@
android:codes="@integer/key_settings" android:codes="@integer/key_settings"
android:keyIcon="@drawable/sym_keyboard_settings" android:keyIcon="@drawable/sym_keyboard_settings"
android:iconPreview="@drawable/sym_keyboard_feedback_settings" android:iconPreview="@drawable/sym_keyboard_feedback_settings"
android:keyWidth="10%p"
android:isModifier="true" /> android:isModifier="true" />
<Key <Key
android:codes="@integer/key_f1" android:codes="@integer/key_f1"
android:keyIcon="@drawable/sym_keyboard_mic" android:keyIcon="@drawable/sym_keyboard_mic"
android:iconPreview="@drawable/sym_keyboard_feedback_mic" android:iconPreview="@drawable/sym_keyboard_feedback_mic"
android:keyWidth="10%p"
android:isModifier="true" /> android:isModifier="true" />
<Key <Key
android:codes="@integer/key_space" android:codes="@integer/key_space"
@ -296,12 +466,10 @@
android:codes="@integer/key_tab" android:codes="@integer/key_tab"
android:keyIcon="@drawable/sym_keyboard_tab" android:keyIcon="@drawable/sym_keyboard_tab"
android:iconPreview="@drawable/sym_keyboard_feedback_tab" android:iconPreview="@drawable/sym_keyboard_feedback_tab"
android:keyWidth="10%p"
android:isModifier="true" /> android:isModifier="true" />
<Key <Key
android:keyLabel="." android:keyLabel="."
android:popupKeyboard="@xml/popup_punctuation" android:popupKeyboard="@xml/popup_punctuation"
android:keyWidth="10%p"
android:isModifier="true" /> android:isModifier="true" />
<Key <Key
android:codes="@integer/key_return" android:codes="@integer/key_return"

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

@ -102,42 +102,158 @@
</Row> </Row>
<Row <Row
android:keyboardMode="@+id/mode_normal" android:keyboardMode="@+id/mode_normal"
android:keyWidth="10%p"
android:rowEdgeFlags="bottom" android:rowEdgeFlags="bottom"
> >
<Key <Key
android:codes="@integer/key_symbol" android:codes="@integer/key_symbol"
android:keyLabel="@string/label_symbol_key" android:keyLabel="@string/label_symbol_key"
android:keyWidth="15%p" android:keyWidth="20%p"
android:keyEdgeFlags="left" /> android:keyEdgeFlags="left" />
<Key
android:codes="@integer/key_settings"
android:keyIcon="@drawable/sym_bkeyboard_settings"
android:iconPreview="@drawable/sym_keyboard_feedback_settings"
android:keyWidth="10%p" />
<Key <Key
android:codes="@integer/key_f1" android:codes="@integer/key_f1"
android:keyIcon="@drawable/sym_bkeyboard_mic" android:keyIcon="@drawable/sym_bkeyboard_mic"
android:iconPreview="@drawable/sym_keyboard_feedback_mic" android:iconPreview="@drawable/sym_keyboard_feedback_mic" />
android:keyWidth="10%p" />
<Key <Key
android:codes="@integer/key_space" android:codes="@integer/key_space"
android:keyIcon="@drawable/sym_bkeyboard_space" android:keyIcon="@drawable/sym_bkeyboard_space"
android:iconPreview="@drawable/sym_keyboard_feedback_space" android:iconPreview="@drawable/sym_keyboard_feedback_space"
android:keyWidth="30%p" android:keyWidth="40%p"
android:isRepeatable="true" /> android:isRepeatable="true" />
<Key <Key
android:keyLabel="." android:keyLabel="."
android:popupKeyboard="@xml/popup_punctuation" android:popupKeyboard="@xml/popup_punctuation" />
android:keyWidth="10%p" />
<Key <Key
android:codes="@integer/key_return" android:codes="@integer/key_return"
android:keyIcon="@drawable/sym_bkeyboard_return" android:keyIcon="@drawable/sym_bkeyboard_return"
android:iconPreview="@drawable/sym_keyboard_feedback_return" android:iconPreview="@drawable/sym_keyboard_feedback_return"
android:keyWidth="25%p" android:keyWidth="20%p"
android:keyEdgeFlags="right" /> android:keyEdgeFlags="right" />
</Row> </Row>
<Row <Row
android:keyboardMode="@+id/mode_url" android:keyboardMode="@+id/mode_url"
android:keyWidth="10%p"
android:rowEdgeFlags="bottom"
>
<Key
android:codes="@integer/key_symbol"
android:keyLabel="@string/label_symbol_key"
android:keyWidth="20%p"
android:keyEdgeFlags="left" />
<Key
android:keyLabel="/" />
<Key
android:codes="@integer/key_space"
android:keyIcon="@drawable/sym_bkeyboard_space"
android:iconPreview="@drawable/sym_keyboard_feedback_space"
android:keyWidth="40%p"
android:isRepeatable="true" />
<Key
android:keyLabel="."
android:popupKeyboard="@xml/popup_punctuation" />
<Key
android:codes="@integer/key_return"
android:keyIcon="@drawable/sym_bkeyboard_return"
android:iconPreview="@drawable/sym_keyboard_feedback_return"
android:keyWidth="20%p"
android:keyEdgeFlags="right" />
</Row>
<Row
android:keyboardMode="@+id/mode_email"
android:keyWidth="10%p"
android:rowEdgeFlags="bottom"
>
<Key
android:codes="@integer/key_symbol"
android:keyLabel="@string/label_symbol_key"
android:keyWidth="20%p"
android:keyEdgeFlags="left" />
<Key
android:keyLabel="\@" />
<Key
android:codes="@integer/key_space"
android:keyIcon="@drawable/sym_bkeyboard_space"
android:iconPreview="@drawable/sym_keyboard_feedback_space"
android:keyWidth="40%p"
android:isRepeatable="true" />
<Key
android:keyLabel="."
android:popupKeyboard="@xml/popup_punctuation" />
<Key
android:codes="@integer/key_return"
android:keyIcon="@drawable/sym_bkeyboard_return"
android:iconPreview="@drawable/sym_keyboard_feedback_return"
android:keyWidth="20%p"
android:keyEdgeFlags="right" />
</Row>
<Row
android:keyboardMode="@+id/mode_im"
android:keyWidth="10%p"
android:rowEdgeFlags="bottom"
>
<Key
android:codes="@integer/key_symbol"
android:keyLabel="@string/label_symbol_key"
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" />
<Key
android:codes="@integer/key_space"
android:keyIcon="@drawable/sym_bkeyboard_space"
android:iconPreview="@drawable/sym_keyboard_feedback_space"
android:keyWidth="40%p"
android:isRepeatable="true" />
<Key
android:keyLabel="."
android:popupKeyboard="@xml/popup_punctuation" />
<Key
android:keyLabel=":-)"
android:keyOutputText=":-) "
android:popupKeyboard="@xml/popup_smileys"
android:keyWidth="20%p"
android:keyEdgeFlags="right" />
</Row>
<Row
android:keyboardMode="@+id/mode_webentry"
android:keyWidth="10%p"
android:rowEdgeFlags="bottom"
>
<Key
android:codes="@integer/key_symbol"
android:keyLabel="@string/label_symbol_key"
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" />
<Key
android:codes="@integer/key_space"
android:keyIcon="@drawable/sym_bkeyboard_space"
android:iconPreview="@drawable/sym_keyboard_feedback_space"
android:keyWidth="20%p"
android:isRepeatable="true" />
<Key
android:codes="@integer/key_tab"
android:keyIcon="@drawable/sym_bkeyboard_tab"
android:iconPreview="@drawable/sym_keyboard_feedback_tab"
android:keyWidth="20%p" />
<Key
android:keyLabel="."
android:popupKeyboard="@xml/popup_punctuation" />
<Key
android:codes="@integer/key_return"
android:keyIcon="@drawable/sym_bkeyboard_return"
android:iconPreview="@drawable/sym_keyboard_feedback_return"
android:keyWidth="20%p"
android:keyEdgeFlags="right" />
</Row>
<Row
android:keyboardMode="@+id/mode_normal_with_settings_key"
android:keyWidth="10%p"
android:rowEdgeFlags="bottom" android:rowEdgeFlags="bottom"
> >
<Key <Key
@ -148,11 +264,11 @@
<Key <Key
android:codes="@integer/key_settings" android:codes="@integer/key_settings"
android:keyIcon="@drawable/sym_bkeyboard_settings" android:keyIcon="@drawable/sym_bkeyboard_settings"
android:iconPreview="@drawable/sym_keyboard_feedback_settings" android:iconPreview="@drawable/sym_keyboard_feedback_settings" />
android:keyWidth="10%p" />
<Key <Key
android:keyLabel="/" android:codes="@integer/key_f1"
android:keyWidth="10%p" /> android:keyIcon="@drawable/sym_bkeyboard_mic"
android:iconPreview="@drawable/sym_keyboard_feedback_mic" />
<Key <Key
android:codes="@integer/key_space" android:codes="@integer/key_space"
android:keyIcon="@drawable/sym_bkeyboard_space" android:keyIcon="@drawable/sym_bkeyboard_space"
@ -161,8 +277,7 @@
android:isRepeatable="true" /> android:isRepeatable="true" />
<Key <Key
android:keyLabel="." android:keyLabel="."
android:popupKeyboard="@xml/popup_punctuation" android:popupKeyboard="@xml/popup_punctuation" />
android:keyWidth="10%p" />
<Key <Key
android:codes="@integer/key_return" android:codes="@integer/key_return"
android:keyIcon="@drawable/sym_bkeyboard_return" android:keyIcon="@drawable/sym_bkeyboard_return"
@ -171,7 +286,8 @@
android:keyEdgeFlags="right" /> android:keyEdgeFlags="right" />
</Row> </Row>
<Row <Row
android:keyboardMode="@+id/mode_email" android:keyboardMode="@+id/mode_url_with_settings_key"
android:keyWidth="10%p"
android:rowEdgeFlags="bottom" android:rowEdgeFlags="bottom"
> >
<Key <Key
@ -182,8 +298,39 @@
<Key <Key
android:codes="@integer/key_settings" android:codes="@integer/key_settings"
android:keyIcon="@drawable/sym_bkeyboard_settings" android:keyIcon="@drawable/sym_bkeyboard_settings"
android:iconPreview="@drawable/sym_keyboard_feedback_settings" android:iconPreview="@drawable/sym_keyboard_feedback_settings" />
android:keyWidth="10%p" /> <Key
android:keyLabel="/" />
<Key
android:codes="@integer/key_space"
android:keyIcon="@drawable/sym_bkeyboard_space"
android:iconPreview="@drawable/sym_keyboard_feedback_space"
android:keyWidth="30%p"
android:isRepeatable="true" />
<Key
android:keyLabel="."
android:popupKeyboard="@xml/popup_punctuation" />
<Key
android:codes="@integer/key_return"
android:keyIcon="@drawable/sym_bkeyboard_return"
android:iconPreview="@drawable/sym_keyboard_feedback_return"
android:keyWidth="25%p"
android:keyEdgeFlags="right" />
</Row>
<Row
android:keyboardMode="@+id/mode_email_with_settings_key"
android:keyWidth="10%p"
android:rowEdgeFlags="bottom"
>
<Key
android:codes="@integer/key_symbol"
android:keyLabel="@string/label_symbol_key"
android:keyWidth="15%p"
android:keyEdgeFlags="left" />
<Key
android:codes="@integer/key_settings"
android:keyIcon="@drawable/sym_bkeyboard_settings"
android:iconPreview="@drawable/sym_keyboard_feedback_settings" />
<Key <Key
android:keyLabel="\@" /> android:keyLabel="\@" />
<Key <Key
@ -203,7 +350,8 @@
android:keyEdgeFlags="right" /> android:keyEdgeFlags="right" />
</Row> </Row>
<Row <Row
android:keyboardMode="@+id/mode_im" android:keyboardMode="@+id/mode_im_with_settings_key"
android:keyWidth="10%p"
android:rowEdgeFlags="bottom" android:rowEdgeFlags="bottom"
> >
<Key <Key
@ -214,13 +362,11 @@
<Key <Key
android:codes="@integer/key_settings" android:codes="@integer/key_settings"
android:keyIcon="@drawable/sym_bkeyboard_settings" android:keyIcon="@drawable/sym_bkeyboard_settings"
android:iconPreview="@drawable/sym_keyboard_feedback_settings" android:iconPreview="@drawable/sym_keyboard_feedback_settings" />
android:keyWidth="10%p" />
<Key <Key
android:codes="@integer/key_f1" android:codes="@integer/key_f1"
android:keyIcon="@drawable/sym_bkeyboard_mic" android:keyIcon="@drawable/sym_bkeyboard_mic"
android:iconPreview="@drawable/sym_keyboard_feedback_mic" android:iconPreview="@drawable/sym_keyboard_feedback_mic" />
android:keyWidth="10%p" />
<Key <Key
android:codes="@integer/key_space" android:codes="@integer/key_space"
android:keyIcon="@drawable/sym_bkeyboard_space" android:keyIcon="@drawable/sym_bkeyboard_space"
@ -229,8 +375,7 @@
android:isRepeatable="true" /> android:isRepeatable="true" />
<Key <Key
android:keyLabel="." android:keyLabel="."
android:popupKeyboard="@xml/popup_punctuation" android:popupKeyboard="@xml/popup_punctuation" />
android:keyWidth="10%p" />
<Key <Key
android:keyLabel=":-)" android:keyLabel=":-)"
android:keyOutputText=":-) " android:keyOutputText=":-) "
@ -239,7 +384,8 @@
android:keyEdgeFlags="right" /> android:keyEdgeFlags="right" />
</Row> </Row>
<Row <Row
android:keyboardMode="@+id/mode_webentry" android:keyboardMode="@+id/mode_webentry_with_settings_key"
android:keyWidth="10%p"
android:rowEdgeFlags="bottom" android:rowEdgeFlags="bottom"
> >
<Key <Key
@ -250,13 +396,11 @@
<Key <Key
android:codes="@integer/key_settings" android:codes="@integer/key_settings"
android:keyIcon="@drawable/sym_bkeyboard_settings" android:keyIcon="@drawable/sym_bkeyboard_settings"
android:iconPreview="@drawable/sym_keyboard_feedback_settings" android:iconPreview="@drawable/sym_keyboard_feedback_settings" />
android:keyWidth="10%p" />
<Key <Key
android:codes="@integer/key_f1" android:codes="@integer/key_f1"
android:keyIcon="@drawable/sym_bkeyboard_mic" android:keyIcon="@drawable/sym_bkeyboard_mic"
android:iconPreview="@drawable/sym_keyboard_feedback_mic" android:iconPreview="@drawable/sym_keyboard_feedback_mic" />
android:keyWidth="10%p" />
<Key <Key
android:codes="@integer/key_space" android:codes="@integer/key_space"
android:keyIcon="@drawable/sym_bkeyboard_space" android:keyIcon="@drawable/sym_bkeyboard_space"
@ -266,12 +410,10 @@
<Key <Key
android:codes="@integer/key_tab" android:codes="@integer/key_tab"
android:keyIcon="@drawable/sym_bkeyboard_tab" android:keyIcon="@drawable/sym_bkeyboard_tab"
android:iconPreview="@drawable/sym_keyboard_feedback_tab" android:iconPreview="@drawable/sym_keyboard_feedback_tab" />
android:keyWidth="10%p" />
<Key <Key
android:keyLabel="." android:keyLabel="."
android:popupKeyboard="@xml/popup_punctuation" android:popupKeyboard="@xml/popup_punctuation" />
android:keyWidth="10%p" />
<Key <Key
android:codes="@integer/key_return" android:codes="@integer/key_return"
android:keyIcon="@drawable/sym_bkeyboard_return" android:keyIcon="@drawable/sym_bkeyboard_return"

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

@ -165,48 +165,184 @@
</Row> </Row>
<Row <Row
android:keyboardMode="@+id/mode_normal" android:keyboardMode="@+id/mode_normal"
android:keyWidth="10%p"
android:rowEdgeFlags="bottom" android:rowEdgeFlags="bottom"
> >
<Key <Key
android:codes="@integer/key_symbol" android:codes="@integer/key_symbol"
android:keyLabel="@string/label_symbol_key" android:keyLabel="@string/label_symbol_key"
android:keyWidth="15%p" android:keyWidth="20%p"
android:isModifier="true" android:isModifier="true"
android:keyEdgeFlags="left" /> android:keyEdgeFlags="left" />
<Key
android:codes="@integer/key_settings"
android:keyIcon="@drawable/sym_keyboard_settings"
android:iconPreview="@drawable/sym_keyboard_feedback_settings"
android:keyWidth="10%p"
android:isModifier="true" />
<Key <Key
android:codes="@integer/key_f1" android:codes="@integer/key_f1"
android:keyIcon="@drawable/sym_keyboard_mic" android:keyIcon="@drawable/sym_keyboard_mic"
android:iconPreview="@drawable/sym_keyboard_feedback_mic" android:iconPreview="@drawable/sym_keyboard_feedback_mic"
android:keyWidth="10%p"
android:isModifier="true" /> android:isModifier="true" />
<Key <Key
android:codes="@integer/key_space" android:codes="@integer/key_space"
android:keyIcon="@drawable/sym_keyboard_space" android:keyIcon="@drawable/sym_keyboard_space"
android:iconPreview="@drawable/sym_keyboard_feedback_space" android:iconPreview="@drawable/sym_keyboard_feedback_space"
android:keyWidth="30%p" android:keyWidth="40%p"
android:isModifier="true" android:isModifier="true"
android:isRepeatable="true" /> android:isRepeatable="true" />
<Key <Key
android:keyLabel="." android:keyLabel="."
android:popupKeyboard="@xml/popup_punctuation" android:popupKeyboard="@xml/popup_punctuation"
android:keyWidth="10%p"
android:isModifier="true" /> android:isModifier="true" />
<Key <Key
android:codes="@integer/key_return" android:codes="@integer/key_return"
android:keyIcon="@drawable/sym_keyboard_return" android:keyIcon="@drawable/sym_keyboard_return"
android:iconPreview="@drawable/sym_keyboard_feedback_return" android:iconPreview="@drawable/sym_keyboard_feedback_return"
android:keyWidth="25%p" android:keyWidth="20%p"
android:isModifier="true" android:isModifier="true"
android:keyEdgeFlags="right" /> android:keyEdgeFlags="right" />
</Row> </Row>
<Row <Row
android:keyboardMode="@+id/mode_url" android:keyboardMode="@+id/mode_url"
android:keyWidth="10%p"
android:rowEdgeFlags="bottom"
>
<Key
android:codes="@integer/key_symbol"
android:keyLabel="@string/label_symbol_key"
android:keyWidth="20%p"
android:isModifier="true"
android:keyEdgeFlags="left" />
<Key
android:keyLabel="/"
android:isModifier="true" />
<Key
android:codes="@integer/key_space"
android:keyIcon="@drawable/sym_keyboard_space"
android:iconPreview="@drawable/sym_keyboard_feedback_space"
android:keyWidth="40%p"
android:isModifier="true"
android:isRepeatable="true" />
<Key
android:keyLabel="."
android:popupKeyboard="@xml/popup_punctuation"
android:isModifier="true" />
<Key
android:codes="@integer/key_return"
android:keyIcon="@drawable/sym_keyboard_return"
android:iconPreview="@drawable/sym_keyboard_feedback_return"
android:keyWidth="20%p"
android:isModifier="true"
android:keyEdgeFlags="right" />
</Row>
<Row
android:keyboardMode="@+id/mode_email"
android:keyWidth="10%p"
android:rowEdgeFlags="bottom"
>
<Key
android:codes="@integer/key_symbol"
android:keyLabel="@string/label_symbol_key"
android:keyWidth="20%p"
android:isModifier="true"
android:keyEdgeFlags="left" />
<Key
android:keyLabel="\@"
android:isModifier="true" />
<Key
android:codes="@integer/key_space"
android:keyIcon="@drawable/sym_keyboard_space"
android:iconPreview="@drawable/sym_keyboard_feedback_space"
android:keyWidth="40%p"
android:isModifier="true"
android:isRepeatable="true" />
<Key
android:keyLabel="."
android:popupKeyboard="@xml/popup_punctuation"
android:isModifier="true" />
<Key
android:codes="@integer/key_return"
android:keyIcon="@drawable/sym_keyboard_return"
android:iconPreview="@drawable/sym_keyboard_feedback_return"
android:keyWidth="20%p"
android:isModifier="true"
android:keyEdgeFlags="right" />
</Row>
<Row
android:keyboardMode="@+id/mode_im"
android:keyWidth="10%p"
android:rowEdgeFlags="bottom"
>
<Key
android:codes="@integer/key_symbol"
android:keyLabel="@string/label_symbol_key"
android:keyWidth="20%p"
android:isModifier="true"
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"
android:keyIcon="@drawable/sym_keyboard_space"
android:iconPreview="@drawable/sym_keyboard_feedback_space"
android:keyWidth="40%p"
android:isModifier="true"
android:isRepeatable="true" />
<Key
android:keyLabel="."
android:popupKeyboard="@xml/popup_punctuation"
android:isModifier="true" />
<Key
android:keyLabel=":-)"
android:keyOutputText=":-) "
android:popupKeyboard="@xml/popup_smileys"
android:keyWidth="20%p"
android:isModifier="true"
android:keyEdgeFlags="right" />
</Row>
<Row
android:keyboardMode="@+id/mode_webentry"
android:keyWidth="10%p"
android:rowEdgeFlags="bottom"
>
<Key
android:codes="@integer/key_symbol"
android:keyLabel="@string/label_symbol_key"
android:keyWidth="20%p"
android:isModifier="true"
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"
android:keyIcon="@drawable/sym_keyboard_space"
android:iconPreview="@drawable/sym_keyboard_feedback_space"
android:keyWidth="20%p"
android:isModifier="true"
android:isRepeatable="true" />
<Key
android:codes="@integer/key_tab"
android:keyIcon="@drawable/sym_keyboard_tab"
android:iconPreview="@drawable/sym_keyboard_feedback_tab"
android:keyWidth="20%p"
android:isModifier="true" />
<Key
android:keyLabel="."
android:popupKeyboard="@xml/popup_punctuation"
android:isModifier="true" />
<Key
android:codes="@integer/key_return"
android:keyIcon="@drawable/sym_keyboard_return"
android:iconPreview="@drawable/sym_keyboard_feedback_return"
android:keyWidth="20%p"
android:isModifier="true"
android:keyEdgeFlags="right" />
</Row>
<Row
android:keyboardMode="@+id/mode_normal_with_settings_key"
android:keyWidth="10%p"
android:rowEdgeFlags="bottom" android:rowEdgeFlags="bottom"
> >
<Key <Key
@ -219,11 +355,11 @@
android:codes="@integer/key_settings" android:codes="@integer/key_settings"
android:keyIcon="@drawable/sym_keyboard_settings" android:keyIcon="@drawable/sym_keyboard_settings"
android:iconPreview="@drawable/sym_keyboard_feedback_settings" android:iconPreview="@drawable/sym_keyboard_feedback_settings"
android:keyWidth="10%p"
android:isModifier="true" /> android:isModifier="true" />
<Key <Key
android:keyLabel="/" android:codes="@integer/key_f1"
android:keyWidth="10%p" android:keyIcon="@drawable/sym_keyboard_mic"
android:iconPreview="@drawable/sym_keyboard_feedback_mic"
android:isModifier="true" /> android:isModifier="true" />
<Key <Key
android:codes="@integer/key_space" android:codes="@integer/key_space"
@ -235,7 +371,6 @@
<Key <Key
android:keyLabel="." android:keyLabel="."
android:popupKeyboard="@xml/popup_punctuation" android:popupKeyboard="@xml/popup_punctuation"
android:keyWidth="10%p"
android:isModifier="true" /> android:isModifier="true" />
<Key <Key
android:codes="@integer/key_return" android:codes="@integer/key_return"
@ -246,7 +381,8 @@
android:keyEdgeFlags="right" /> android:keyEdgeFlags="right" />
</Row> </Row>
<Row <Row
android:keyboardMode="@+id/mode_email" android:keyboardMode="@+id/mode_url_with_settings_key"
android:keyWidth="10%p"
android:rowEdgeFlags="bottom" android:rowEdgeFlags="bottom"
> >
<Key <Key
@ -259,7 +395,44 @@
android:codes="@integer/key_settings" android:codes="@integer/key_settings"
android:keyIcon="@drawable/sym_keyboard_settings" android:keyIcon="@drawable/sym_keyboard_settings"
android:iconPreview="@drawable/sym_keyboard_feedback_settings" android:iconPreview="@drawable/sym_keyboard_feedback_settings"
android:isModifier="true" />
<Key
android:keyLabel="/"
android:isModifier="true" />
<Key
android:codes="@integer/key_space"
android:keyIcon="@drawable/sym_keyboard_space"
android:iconPreview="@drawable/sym_keyboard_feedback_space"
android:keyWidth="30%p"
android:isModifier="true"
android:isRepeatable="true" />
<Key
android:keyLabel="."
android:popupKeyboard="@xml/popup_punctuation"
android:isModifier="true" />
<Key
android:codes="@integer/key_return"
android:keyIcon="@drawable/sym_keyboard_return"
android:iconPreview="@drawable/sym_keyboard_feedback_return"
android:keyWidth="25%p"
android:isModifier="true"
android:keyEdgeFlags="right" />
</Row>
<Row
android:keyboardMode="@+id/mode_email_with_settings_key"
android:keyWidth="10%p" android:keyWidth="10%p"
android:rowEdgeFlags="bottom"
>
<Key
android:codes="@integer/key_symbol"
android:keyLabel="@string/label_symbol_key"
android:keyWidth="15%p"
android:isModifier="true"
android:keyEdgeFlags="left" />
<Key
android:codes="@integer/key_settings"
android:keyIcon="@drawable/sym_keyboard_settings"
android:iconPreview="@drawable/sym_keyboard_feedback_settings"
android:isModifier="true" /> android:isModifier="true" />
<Key <Key
android:keyLabel="\@" android:keyLabel="\@"
@ -284,7 +457,8 @@
android:keyEdgeFlags="right" /> android:keyEdgeFlags="right" />
</Row> </Row>
<Row <Row
android:keyboardMode="@+id/mode_im" android:keyboardMode="@+id/mode_im_with_settings_key"
android:keyWidth="10%p"
android:rowEdgeFlags="bottom" android:rowEdgeFlags="bottom"
> >
<Key <Key
@ -297,13 +471,11 @@
android:codes="@integer/key_settings" android:codes="@integer/key_settings"
android:keyIcon="@drawable/sym_keyboard_settings" android:keyIcon="@drawable/sym_keyboard_settings"
android:iconPreview="@drawable/sym_keyboard_feedback_settings" android:iconPreview="@drawable/sym_keyboard_feedback_settings"
android:keyWidth="10%p"
android:isModifier="true" /> android:isModifier="true" />
<Key <Key
android:codes="@integer/key_f1" android:codes="@integer/key_f1"
android:keyIcon="@drawable/sym_keyboard_mic" android:keyIcon="@drawable/sym_keyboard_mic"
android:iconPreview="@drawable/sym_keyboard_feedback_mic" android:iconPreview="@drawable/sym_keyboard_feedback_mic"
android:keyWidth="10%p"
android:isModifier="true" /> android:isModifier="true" />
<Key <Key
android:codes="@integer/key_space" android:codes="@integer/key_space"
@ -315,7 +487,6 @@
<Key <Key
android:keyLabel="." android:keyLabel="."
android:popupKeyboard="@xml/popup_punctuation" android:popupKeyboard="@xml/popup_punctuation"
android:keyWidth="10%p"
android:isModifier="true" /> android:isModifier="true" />
<Key <Key
android:keyLabel=":-)" android:keyLabel=":-)"
@ -326,7 +497,8 @@
android:keyEdgeFlags="right" /> android:keyEdgeFlags="right" />
</Row> </Row>
<Row <Row
android:keyboardMode="@+id/mode_webentry" android:keyboardMode="@+id/mode_webentry_with_settings_key"
android:keyWidth="10%p"
android:rowEdgeFlags="bottom" android:rowEdgeFlags="bottom"
> >
<Key <Key
@ -339,13 +511,11 @@
android:codes="@integer/key_settings" android:codes="@integer/key_settings"
android:keyIcon="@drawable/sym_keyboard_settings" android:keyIcon="@drawable/sym_keyboard_settings"
android:iconPreview="@drawable/sym_keyboard_feedback_settings" android:iconPreview="@drawable/sym_keyboard_feedback_settings"
android:keyWidth="10%p"
android:isModifier="true" /> android:isModifier="true" />
<Key <Key
android:codes="@integer/key_f1" android:codes="@integer/key_f1"
android:keyIcon="@drawable/sym_keyboard_mic" android:keyIcon="@drawable/sym_keyboard_mic"
android:iconPreview="@drawable/sym_keyboard_feedback_mic" android:iconPreview="@drawable/sym_keyboard_feedback_mic"
android:keyWidth="10%p"
android:isModifier="true" /> android:isModifier="true" />
<Key <Key
android:codes="@integer/key_space" android:codes="@integer/key_space"
@ -358,12 +528,10 @@
android:codes="@integer/key_tab" android:codes="@integer/key_tab"
android:keyIcon="@drawable/sym_keyboard_tab" android:keyIcon="@drawable/sym_keyboard_tab"
android:iconPreview="@drawable/sym_keyboard_feedback_tab" android:iconPreview="@drawable/sym_keyboard_feedback_tab"
android:keyWidth="10%p"
android:isModifier="true" /> android:isModifier="true" />
<Key <Key
android:keyLabel="." android:keyLabel="."
android:popupKeyboard="@xml/popup_punctuation" android:popupKeyboard="@xml/popup_punctuation"
android:keyWidth="10%p"
android:isModifier="true" /> android:isModifier="true" />
<Key <Key
android:codes="@integer/key_return" android:codes="@integer/key_return"

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

@ -164,42 +164,158 @@
</Row> </Row>
<Row <Row
android:keyboardMode="@+id/mode_normal" android:keyboardMode="@+id/mode_normal"
android:keyWidth="10%p"
android:rowEdgeFlags="bottom" android:rowEdgeFlags="bottom"
> >
<Key <Key
android:codes="@integer/key_symbol" android:codes="@integer/key_symbol"
android:keyLabel="@string/label_symbol_key" android:keyLabel="@string/label_symbol_key"
android:keyWidth="15%p" android:keyWidth="20%p"
android:keyEdgeFlags="left" /> android:keyEdgeFlags="left" />
<Key
android:codes="@integer/key_settings"
android:keyIcon="@drawable/sym_bkeyboard_settings"
android:iconPreview="@drawable/sym_keyboard_feedback_settings"
android:keyWidth="10%p" />
<Key <Key
android:codes="@integer/key_f1" android:codes="@integer/key_f1"
android:keyIcon="@drawable/sym_bkeyboard_mic" android:keyIcon="@drawable/sym_bkeyboard_mic"
android:iconPreview="@drawable/sym_keyboard_feedback_mic" android:iconPreview="@drawable/sym_keyboard_feedback_mic" />
android:keyWidth="10%p" />
<Key <Key
android:codes="@integer/key_space" android:codes="@integer/key_space"
android:keyIcon="@drawable/sym_bkeyboard_space" android:keyIcon="@drawable/sym_bkeyboard_space"
android:iconPreview="@drawable/sym_keyboard_feedback_space" android:iconPreview="@drawable/sym_keyboard_feedback_space"
android:keyWidth="30%p" android:keyWidth="40%p"
android:isRepeatable="true" /> android:isRepeatable="true" />
<Key <Key
android:keyLabel="." android:keyLabel="."
android:popupKeyboard="@xml/popup_punctuation" android:popupKeyboard="@xml/popup_punctuation" />
android:keyWidth="10%p" />
<Key <Key
android:codes="@integer/key_return" android:codes="@integer/key_return"
android:keyIcon="@drawable/sym_bkeyboard_return" android:keyIcon="@drawable/sym_bkeyboard_return"
android:iconPreview="@drawable/sym_keyboard_feedback_return" android:iconPreview="@drawable/sym_keyboard_feedback_return"
android:keyWidth="25%p" android:keyWidth="20%p"
android:keyEdgeFlags="right" /> android:keyEdgeFlags="right" />
</Row> </Row>
<Row <Row
android:keyboardMode="@+id/mode_url" android:keyboardMode="@+id/mode_url"
android:keyWidth="10%p"
android:rowEdgeFlags="bottom"
>
<Key
android:codes="@integer/key_symbol"
android:keyLabel="@string/label_symbol_key"
android:keyWidth="20%p"
android:keyEdgeFlags="left" />
<Key
android:keyLabel="/" />
<Key
android:codes="@integer/key_space"
android:keyIcon="@drawable/sym_bkeyboard_space"
android:iconPreview="@drawable/sym_keyboard_feedback_space"
android:keyWidth="40%p"
android:isRepeatable="true" />
<Key
android:keyLabel="."
android:popupKeyboard="@xml/popup_punctuation" />
<Key
android:codes="@integer/key_return"
android:keyIcon="@drawable/sym_bkeyboard_return"
android:iconPreview="@drawable/sym_keyboard_feedback_return"
android:keyWidth="20%p"
android:keyEdgeFlags="right" />
</Row>
<Row
android:keyboardMode="@+id/mode_email"
android:keyWidth="10%p"
android:rowEdgeFlags="bottom"
>
<Key
android:codes="@integer/key_symbol"
android:keyLabel="@string/label_symbol_key"
android:keyWidth="20%p"
android:keyEdgeFlags="left" />
<Key
android:keyLabel="\@" />
<Key
android:codes="@integer/key_space"
android:keyIcon="@drawable/sym_bkeyboard_space"
android:iconPreview="@drawable/sym_keyboard_feedback_space"
android:keyWidth="40%p"
android:isRepeatable="true" />
<Key
android:keyLabel="."
android:popupKeyboard="@xml/popup_punctuation" />
<Key
android:codes="@integer/key_return"
android:keyIcon="@drawable/sym_bkeyboard_return"
android:iconPreview="@drawable/sym_keyboard_feedback_return"
android:keyWidth="20%p"
android:keyEdgeFlags="right" />
</Row>
<Row
android:keyboardMode="@+id/mode_im"
android:keyWidth="10%p"
android:rowEdgeFlags="bottom"
>
<Key
android:codes="@integer/key_symbol"
android:keyLabel="@string/label_symbol_key"
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" />
<Key
android:codes="@integer/key_space"
android:keyIcon="@drawable/sym_bkeyboard_space"
android:iconPreview="@drawable/sym_keyboard_feedback_space"
android:keyWidth="40%p"
android:isRepeatable="true" />
<Key
android:keyLabel="."
android:popupKeyboard="@xml/popup_punctuation" />
<Key
android:keyLabel=":-)"
android:keyOutputText=":-) "
android:popupKeyboard="@xml/popup_smileys"
android:keyWidth="20%p"
android:keyEdgeFlags="right" />
</Row>
<Row
android:keyboardMode="@+id/mode_webentry"
android:keyWidth="10%p"
android:rowEdgeFlags="bottom"
>
<Key
android:codes="@integer/key_symbol"
android:keyLabel="@string/label_symbol_key"
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" />
<Key
android:codes="@integer/key_space"
android:keyIcon="@drawable/sym_bkeyboard_space"
android:iconPreview="@drawable/sym_keyboard_feedback_space"
android:keyWidth="20%p"
android:isRepeatable="true" />
<Key
android:codes="@integer/key_tab"
android:keyIcon="@drawable/sym_bkeyboard_tab"
android:iconPreview="@drawable/sym_keyboard_feedback_tab"
android:keyWidth="20%p" />
<Key
android:keyLabel="."
android:popupKeyboard="@xml/popup_punctuation" />
<Key
android:codes="@integer/key_return"
android:keyIcon="@drawable/sym_bkeyboard_return"
android:iconPreview="@drawable/sym_keyboard_feedback_return"
android:keyWidth="20%p"
android:keyEdgeFlags="right" />
</Row>
<Row
android:keyboardMode="@+id/mode_normal_with_settings_key"
android:keyWidth="10%p"
android:rowEdgeFlags="bottom" android:rowEdgeFlags="bottom"
> >
<Key <Key
@ -210,11 +326,11 @@
<Key <Key
android:codes="@integer/key_settings" android:codes="@integer/key_settings"
android:keyIcon="@drawable/sym_bkeyboard_settings" android:keyIcon="@drawable/sym_bkeyboard_settings"
android:iconPreview="@drawable/sym_keyboard_feedback_settings" android:iconPreview="@drawable/sym_keyboard_feedback_settings" />
android:keyWidth="10%p" />
<Key <Key
android:keyLabel="/" android:codes="@integer/key_f1"
android:keyWidth="10%p" /> android:keyIcon="@drawable/sym_bkeyboard_mic"
android:iconPreview="@drawable/sym_keyboard_feedback_mic" />
<Key <Key
android:codes="@integer/key_space" android:codes="@integer/key_space"
android:keyIcon="@drawable/sym_bkeyboard_space" android:keyIcon="@drawable/sym_bkeyboard_space"
@ -223,8 +339,7 @@
android:isRepeatable="true" /> android:isRepeatable="true" />
<Key <Key
android:keyLabel="." android:keyLabel="."
android:popupKeyboard="@xml/popup_punctuation" android:popupKeyboard="@xml/popup_punctuation" />
android:keyWidth="10%p" />
<Key <Key
android:codes="@integer/key_return" android:codes="@integer/key_return"
android:keyIcon="@drawable/sym_bkeyboard_return" android:keyIcon="@drawable/sym_bkeyboard_return"
@ -233,7 +348,8 @@
android:keyEdgeFlags="right" /> android:keyEdgeFlags="right" />
</Row> </Row>
<Row <Row
android:keyboardMode="@+id/mode_email" android:keyboardMode="@+id/mode_url_with_settings_key"
android:keyWidth="10%p"
android:rowEdgeFlags="bottom" android:rowEdgeFlags="bottom"
> >
<Key <Key
@ -244,8 +360,39 @@
<Key <Key
android:codes="@integer/key_settings" android:codes="@integer/key_settings"
android:keyIcon="@drawable/sym_bkeyboard_settings" android:keyIcon="@drawable/sym_bkeyboard_settings"
android:iconPreview="@drawable/sym_keyboard_feedback_settings" android:iconPreview="@drawable/sym_keyboard_feedback_settings" />
android:keyWidth="10%p" /> <Key
android:keyLabel="/" />
<Key
android:codes="@integer/key_space"
android:keyIcon="@drawable/sym_bkeyboard_space"
android:iconPreview="@drawable/sym_keyboard_feedback_space"
android:keyWidth="30%p"
android:isRepeatable="true" />
<Key
android:keyLabel="."
android:popupKeyboard="@xml/popup_punctuation" />
<Key
android:codes="@integer/key_return"
android:keyIcon="@drawable/sym_bkeyboard_return"
android:iconPreview="@drawable/sym_keyboard_feedback_return"
android:keyWidth="25%p"
android:keyEdgeFlags="right" />
</Row>
<Row
android:keyboardMode="@+id/mode_email_with_settings_key"
android:keyWidth="10%p"
android:rowEdgeFlags="bottom"
>
<Key
android:codes="@integer/key_symbol"
android:keyLabel="@string/label_symbol_key"
android:keyWidth="15%p"
android:keyEdgeFlags="left" />
<Key
android:codes="@integer/key_settings"
android:keyIcon="@drawable/sym_bkeyboard_settings"
android:iconPreview="@drawable/sym_keyboard_feedback_settings" />
<Key <Key
android:keyLabel="\@" /> android:keyLabel="\@" />
<Key <Key
@ -265,7 +412,8 @@
android:keyEdgeFlags="right" /> android:keyEdgeFlags="right" />
</Row> </Row>
<Row <Row
android:keyboardMode="@+id/mode_im" android:keyboardMode="@+id/mode_im_with_settings_key"
android:keyWidth="10%p"
android:rowEdgeFlags="bottom" android:rowEdgeFlags="bottom"
> >
<Key <Key
@ -276,13 +424,11 @@
<Key <Key
android:codes="@integer/key_settings" android:codes="@integer/key_settings"
android:keyIcon="@drawable/sym_bkeyboard_settings" android:keyIcon="@drawable/sym_bkeyboard_settings"
android:iconPreview="@drawable/sym_keyboard_feedback_settings" android:iconPreview="@drawable/sym_keyboard_feedback_settings" />
android:keyWidth="10%p" />
<Key <Key
android:codes="@integer/key_f1" android:codes="@integer/key_f1"
android:keyIcon="@drawable/sym_bkeyboard_mic" android:keyIcon="@drawable/sym_bkeyboard_mic"
android:iconPreview="@drawable/sym_keyboard_feedback_mic" android:iconPreview="@drawable/sym_keyboard_feedback_mic" />
android:keyWidth="10%p" />
<Key <Key
android:codes="@integer/key_space" android:codes="@integer/key_space"
android:keyIcon="@drawable/sym_bkeyboard_space" android:keyIcon="@drawable/sym_bkeyboard_space"
@ -291,8 +437,7 @@
android:isRepeatable="true" /> android:isRepeatable="true" />
<Key <Key
android:keyLabel="." android:keyLabel="."
android:popupKeyboard="@xml/popup_punctuation" android:popupKeyboard="@xml/popup_punctuation" />
android:keyWidth="10%p" />
<Key <Key
android:keyLabel=":-)" android:keyLabel=":-)"
android:keyOutputText=":-) " android:keyOutputText=":-) "
@ -301,7 +446,8 @@
android:keyEdgeFlags="right" /> android:keyEdgeFlags="right" />
</Row> </Row>
<Row <Row
android:keyboardMode="@+id/mode_webentry" android:keyboardMode="@+id/mode_webentry_with_settings_key"
android:keyWidth="10%p"
android:rowEdgeFlags="bottom" android:rowEdgeFlags="bottom"
> >
<Key <Key
@ -312,13 +458,11 @@
<Key <Key
android:codes="@integer/key_settings" android:codes="@integer/key_settings"
android:keyIcon="@drawable/sym_bkeyboard_settings" android:keyIcon="@drawable/sym_bkeyboard_settings"
android:iconPreview="@drawable/sym_keyboard_feedback_settings" android:iconPreview="@drawable/sym_keyboard_feedback_settings" />
android:keyWidth="10%p" />
<Key <Key
android:codes="@integer/key_f1" android:codes="@integer/key_f1"
android:keyIcon="@drawable/sym_bkeyboard_mic" android:keyIcon="@drawable/sym_bkeyboard_mic"
android:iconPreview="@drawable/sym_keyboard_feedback_mic" android:iconPreview="@drawable/sym_keyboard_feedback_mic" />
android:keyWidth="10%p" />
<Key <Key
android:codes="@integer/key_space" android:codes="@integer/key_space"
android:keyIcon="@drawable/sym_bkeyboard_space" android:keyIcon="@drawable/sym_bkeyboard_space"
@ -328,12 +472,10 @@
<Key <Key
android:codes="@integer/key_tab" android:codes="@integer/key_tab"
android:keyIcon="@drawable/sym_bkeyboard_tab" android:keyIcon="@drawable/sym_bkeyboard_tab"
android:iconPreview="@drawable/sym_keyboard_feedback_tab" android:iconPreview="@drawable/sym_keyboard_feedback_tab" />
android:keyWidth="10%p" />
<Key <Key
android:keyLabel="." android:keyLabel="."
android:popupKeyboard="@xml/popup_punctuation" android:popupKeyboard="@xml/popup_punctuation" />
android:keyWidth="10%p" />
<Key <Key
android:codes="@integer/key_return" android:codes="@integer/key_return"
android:keyIcon="@drawable/sym_bkeyboard_return" android:keyIcon="@drawable/sym_bkeyboard_return"

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

@ -143,48 +143,184 @@
</Row> </Row>
<Row <Row
android:keyboardMode="@+id/mode_normal" android:keyboardMode="@+id/mode_normal"
android:keyWidth="10%p"
android:rowEdgeFlags="bottom" android:rowEdgeFlags="bottom"
> >
<Key <Key
android:codes="@integer/key_symbol" android:codes="@integer/key_symbol"
android:keyLabel="@string/label_symbol_key" android:keyLabel="@string/label_symbol_key"
android:keyWidth="15%p" android:keyWidth="20%p"
android:isModifier="true" android:isModifier="true"
android:keyEdgeFlags="left" /> android:keyEdgeFlags="left" />
<Key
android:codes="@integer/key_settings"
android:keyIcon="@drawable/sym_keyboard_settings"
android:iconPreview="@drawable/sym_keyboard_feedback_settings"
android:keyWidth="10%p"
android:isModifier="true" />
<Key <Key
android:codes="@integer/key_f1" android:codes="@integer/key_f1"
android:keyIcon="@drawable/sym_keyboard_mic" android:keyIcon="@drawable/sym_keyboard_mic"
android:iconPreview="@drawable/sym_keyboard_feedback_mic" android:iconPreview="@drawable/sym_keyboard_feedback_mic"
android:keyWidth="10%p"
android:isModifier="true" /> android:isModifier="true" />
<Key <Key
android:codes="@integer/key_space" android:codes="@integer/key_space"
android:keyIcon="@drawable/sym_keyboard_space" android:keyIcon="@drawable/sym_keyboard_space"
android:iconPreview="@drawable/sym_keyboard_feedback_space" android:iconPreview="@drawable/sym_keyboard_feedback_space"
android:keyWidth="30%p" android:keyWidth="40%p"
android:isModifier="true" android:isModifier="true"
android:isRepeatable="true" /> android:isRepeatable="true" />
<Key <Key
android:keyLabel="." android:keyLabel="."
android:popupKeyboard="@xml/popup_punctuation" android:popupKeyboard="@xml/popup_punctuation"
android:keyWidth="10%p"
android:isModifier="true" /> android:isModifier="true" />
<Key <Key
android:codes="@integer/key_return" android:codes="@integer/key_return"
android:keyIcon="@drawable/sym_keyboard_return" android:keyIcon="@drawable/sym_keyboard_return"
android:iconPreview="@drawable/sym_keyboard_feedback_return" android:iconPreview="@drawable/sym_keyboard_feedback_return"
android:keyWidth="25%p" android:keyWidth="20%p"
android:isModifier="true" android:isModifier="true"
android:keyEdgeFlags="right" /> android:keyEdgeFlags="right" />
</Row> </Row>
<Row <Row
android:keyboardMode="@+id/mode_url" android:keyboardMode="@+id/mode_url"
android:keyWidth="10%p"
android:rowEdgeFlags="bottom"
>
<Key
android:codes="@integer/key_symbol"
android:keyLabel="@string/label_symbol_key"
android:keyWidth="20%p"
android:isModifier="true"
android:keyEdgeFlags="left" />
<Key
android:keyLabel="/"
android:isModifier="true" />
<Key
android:codes="@integer/key_space"
android:keyIcon="@drawable/sym_keyboard_space"
android:iconPreview="@drawable/sym_keyboard_feedback_space"
android:keyWidth="40%p"
android:isModifier="true"
android:isRepeatable="true" />
<Key
android:keyLabel="."
android:popupKeyboard="@xml/popup_punctuation"
android:isModifier="true" />
<Key
android:codes="@integer/key_return"
android:keyIcon="@drawable/sym_keyboard_return"
android:iconPreview="@drawable/sym_keyboard_feedback_return"
android:keyWidth="20%p"
android:isModifier="true"
android:keyEdgeFlags="right" />
</Row>
<Row
android:keyboardMode="@+id/mode_email"
android:keyWidth="10%p"
android:rowEdgeFlags="bottom"
>
<Key
android:codes="@integer/key_symbol"
android:keyLabel="@string/label_symbol_key"
android:keyWidth="20%p"
android:isModifier="true"
android:keyEdgeFlags="left" />
<Key
android:keyLabel="\@"
android:isModifier="true" />
<Key
android:codes="@integer/key_space"
android:keyIcon="@drawable/sym_keyboard_space"
android:iconPreview="@drawable/sym_keyboard_feedback_space"
android:keyWidth="40%p"
android:isModifier="true"
android:isRepeatable="true" />
<Key
android:keyLabel="."
android:popupKeyboard="@xml/popup_punctuation"
android:isModifier="true" />
<Key
android:codes="@integer/key_return"
android:keyIcon="@drawable/sym_keyboard_return"
android:iconPreview="@drawable/sym_keyboard_feedback_return"
android:keyWidth="20%p"
android:isModifier="true"
android:keyEdgeFlags="right" />
</Row>
<Row
android:keyboardMode="@+id/mode_im"
android:keyWidth="10%p"
android:rowEdgeFlags="bottom"
>
<Key
android:codes="@integer/key_symbol"
android:keyLabel="@string/label_symbol_key"
android:keyWidth="20%p"
android:isModifier="true"
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"
android:keyIcon="@drawable/sym_keyboard_space"
android:iconPreview="@drawable/sym_keyboard_feedback_space"
android:keyWidth="40%p"
android:isModifier="true"
android:isRepeatable="true" />
<Key
android:keyLabel="."
android:popupKeyboard="@xml/popup_punctuation"
android:isModifier="true" />
<Key
android:keyLabel=":-)"
android:keyOutputText=":-) "
android:popupKeyboard="@xml/popup_smileys"
android:keyWidth="20%p"
android:isModifier="true"
android:keyEdgeFlags="right" />
</Row>
<Row
android:keyboardMode="@+id/mode_webentry"
android:keyWidth="10%p"
android:rowEdgeFlags="bottom"
>
<Key
android:codes="@integer/key_symbol"
android:keyLabel="@string/label_symbol_key"
android:keyWidth="20%p"
android:isModifier="true"
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"
android:keyIcon="@drawable/sym_keyboard_space"
android:iconPreview="@drawable/sym_keyboard_feedback_space"
android:keyWidth="20%p"
android:isModifier="true"
android:isRepeatable="true" />
<Key
android:codes="@integer/key_tab"
android:keyIcon="@drawable/sym_keyboard_tab"
android:iconPreview="@drawable/sym_keyboard_feedback_tab"
android:keyWidth="20%p"
android:isModifier="true" />
<Key
android:keyLabel="."
android:popupKeyboard="@xml/popup_punctuation"
android:isModifier="true" />
<Key
android:codes="@integer/key_return"
android:keyIcon="@drawable/sym_keyboard_return"
android:iconPreview="@drawable/sym_keyboard_feedback_return"
android:keyWidth="20%p"
android:isModifier="true"
android:keyEdgeFlags="right" />
</Row>
<Row
android:keyboardMode="@+id/mode_normal_with_settings_key"
android:keyWidth="10%p"
android:rowEdgeFlags="bottom" android:rowEdgeFlags="bottom"
> >
<Key <Key
@ -197,11 +333,11 @@
android:codes="@integer/key_settings" android:codes="@integer/key_settings"
android:keyIcon="@drawable/sym_keyboard_settings" android:keyIcon="@drawable/sym_keyboard_settings"
android:iconPreview="@drawable/sym_keyboard_feedback_settings" android:iconPreview="@drawable/sym_keyboard_feedback_settings"
android:keyWidth="10%p"
android:isModifier="true" /> android:isModifier="true" />
<Key <Key
android:keyLabel="/" android:codes="@integer/key_f1"
android:keyWidth="10%p" android:keyIcon="@drawable/sym_keyboard_mic"
android:iconPreview="@drawable/sym_keyboard_feedback_mic"
android:isModifier="true" /> android:isModifier="true" />
<Key <Key
android:codes="@integer/key_space" android:codes="@integer/key_space"
@ -213,7 +349,6 @@
<Key <Key
android:keyLabel="." android:keyLabel="."
android:popupKeyboard="@xml/popup_punctuation" android:popupKeyboard="@xml/popup_punctuation"
android:keyWidth="10%p"
android:isModifier="true" /> android:isModifier="true" />
<Key <Key
android:codes="@integer/key_return" android:codes="@integer/key_return"
@ -224,7 +359,8 @@
android:keyEdgeFlags="right" /> android:keyEdgeFlags="right" />
</Row> </Row>
<Row <Row
android:keyboardMode="@+id/mode_email" android:keyboardMode="@+id/mode_url_with_settings_key"
android:keyWidth="10%p"
android:rowEdgeFlags="bottom" android:rowEdgeFlags="bottom"
> >
<Key <Key
@ -237,7 +373,44 @@
android:codes="@integer/key_settings" android:codes="@integer/key_settings"
android:keyIcon="@drawable/sym_keyboard_settings" android:keyIcon="@drawable/sym_keyboard_settings"
android:iconPreview="@drawable/sym_keyboard_feedback_settings" android:iconPreview="@drawable/sym_keyboard_feedback_settings"
android:isModifier="true" />
<Key
android:keyLabel="/"
android:isModifier="true" />
<Key
android:codes="@integer/key_space"
android:keyIcon="@drawable/sym_keyboard_space"
android:iconPreview="@drawable/sym_keyboard_feedback_space"
android:keyWidth="30%p"
android:isModifier="true"
android:isRepeatable="true" />
<Key
android:keyLabel="."
android:popupKeyboard="@xml/popup_punctuation"
android:isModifier="true" />
<Key
android:codes="@integer/key_return"
android:keyIcon="@drawable/sym_keyboard_return"
android:iconPreview="@drawable/sym_keyboard_feedback_return"
android:keyWidth="25%p"
android:isModifier="true"
android:keyEdgeFlags="right" />
</Row>
<Row
android:keyboardMode="@+id/mode_email_with_settings_key"
android:keyWidth="10%p" android:keyWidth="10%p"
android:rowEdgeFlags="bottom"
>
<Key
android:codes="@integer/key_symbol"
android:keyLabel="@string/label_symbol_key"
android:keyWidth="15%p"
android:isModifier="true"
android:keyEdgeFlags="left" />
<Key
android:codes="@integer/key_settings"
android:keyIcon="@drawable/sym_keyboard_settings"
android:iconPreview="@drawable/sym_keyboard_feedback_settings"
android:isModifier="true" /> android:isModifier="true" />
<Key <Key
android:keyLabel="\@" android:keyLabel="\@"
@ -262,7 +435,8 @@
android:keyEdgeFlags="right" /> android:keyEdgeFlags="right" />
</Row> </Row>
<Row <Row
android:keyboardMode="@+id/mode_im" android:keyboardMode="@+id/mode_im_with_settings_key"
android:keyWidth="10%p"
android:rowEdgeFlags="bottom" android:rowEdgeFlags="bottom"
> >
<Key <Key
@ -275,13 +449,11 @@
android:codes="@integer/key_settings" android:codes="@integer/key_settings"
android:keyIcon="@drawable/sym_keyboard_settings" android:keyIcon="@drawable/sym_keyboard_settings"
android:iconPreview="@drawable/sym_keyboard_feedback_settings" android:iconPreview="@drawable/sym_keyboard_feedback_settings"
android:keyWidth="10%p"
android:isModifier="true" /> android:isModifier="true" />
<Key <Key
android:codes="@integer/key_f1" android:codes="@integer/key_f1"
android:keyIcon="@drawable/sym_keyboard_mic" android:keyIcon="@drawable/sym_keyboard_mic"
android:iconPreview="@drawable/sym_keyboard_feedback_mic" android:iconPreview="@drawable/sym_keyboard_feedback_mic"
android:keyWidth="10%p"
android:isModifier="true" /> android:isModifier="true" />
<Key <Key
android:codes="@integer/key_space" android:codes="@integer/key_space"
@ -293,7 +465,6 @@
<Key <Key
android:keyLabel="." android:keyLabel="."
android:popupKeyboard="@xml/popup_punctuation" android:popupKeyboard="@xml/popup_punctuation"
android:keyWidth="10%p"
android:isModifier="true" /> android:isModifier="true" />
<Key <Key
android:keyLabel=":-)" android:keyLabel=":-)"
@ -304,7 +475,8 @@
android:keyEdgeFlags="right" /> android:keyEdgeFlags="right" />
</Row> </Row>
<Row <Row
android:keyboardMode="@+id/mode_webentry" android:keyboardMode="@+id/mode_webentry_with_settings_key"
android:keyWidth="10%p"
android:rowEdgeFlags="bottom" android:rowEdgeFlags="bottom"
> >
<Key <Key
@ -317,13 +489,11 @@
android:codes="@integer/key_settings" android:codes="@integer/key_settings"
android:keyIcon="@drawable/sym_keyboard_settings" android:keyIcon="@drawable/sym_keyboard_settings"
android:iconPreview="@drawable/sym_keyboard_feedback_settings" android:iconPreview="@drawable/sym_keyboard_feedback_settings"
android:keyWidth="10%p"
android:isModifier="true" /> android:isModifier="true" />
<Key <Key
android:codes="@integer/key_f1" android:codes="@integer/key_f1"
android:keyIcon="@drawable/sym_keyboard_mic" android:keyIcon="@drawable/sym_keyboard_mic"
android:iconPreview="@drawable/sym_keyboard_feedback_mic" android:iconPreview="@drawable/sym_keyboard_feedback_mic"
android:keyWidth="10%p"
android:isModifier="true" /> android:isModifier="true" />
<Key <Key
android:codes="@integer/key_space" android:codes="@integer/key_space"
@ -336,12 +506,10 @@
android:codes="@integer/key_tab" android:codes="@integer/key_tab"
android:keyIcon="@drawable/sym_keyboard_tab" android:keyIcon="@drawable/sym_keyboard_tab"
android:iconPreview="@drawable/sym_keyboard_feedback_tab" android:iconPreview="@drawable/sym_keyboard_feedback_tab"
android:keyWidth="10%p"
android:isModifier="true" /> android:isModifier="true" />
<Key <Key
android:keyLabel="." android:keyLabel="."
android:popupKeyboard="@xml/popup_punctuation" android:popupKeyboard="@xml/popup_punctuation"
android:keyWidth="10%p"
android:isModifier="true" /> android:isModifier="true" />
<Key <Key
android:codes="@integer/key_return" android:codes="@integer/key_return"

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

@ -142,42 +142,158 @@
</Row> </Row>
<Row <Row
android:keyboardMode="@+id/mode_normal" android:keyboardMode="@+id/mode_normal"
android:keyWidth="10%p"
android:rowEdgeFlags="bottom" android:rowEdgeFlags="bottom"
> >
<Key <Key
android:codes="@integer/key_symbol" android:codes="@integer/key_symbol"
android:keyLabel="@string/label_symbol_key" android:keyLabel="@string/label_symbol_key"
android:keyWidth="15%p" android:keyWidth="20%p"
android:keyEdgeFlags="left" /> android:keyEdgeFlags="left" />
<Key
android:codes="@integer/key_settings"
android:keyIcon="@drawable/sym_bkeyboard_settings"
android:iconPreview="@drawable/sym_keyboard_feedback_settings"
android:keyWidth="10%p" />
<Key <Key
android:codes="@integer/key_f1" android:codes="@integer/key_f1"
android:keyIcon="@drawable/sym_bkeyboard_mic" android:keyIcon="@drawable/sym_bkeyboard_mic"
android:iconPreview="@drawable/sym_keyboard_feedback_mic" android:iconPreview="@drawable/sym_keyboard_feedback_mic" />
android:keyWidth="10%p" />
<Key <Key
android:codes="@integer/key_space" android:codes="@integer/key_space"
android:keyIcon="@drawable/sym_bkeyboard_space" android:keyIcon="@drawable/sym_bkeyboard_space"
android:iconPreview="@drawable/sym_keyboard_feedback_space" android:iconPreview="@drawable/sym_keyboard_feedback_space"
android:keyWidth="30%p" android:keyWidth="40%p"
android:isRepeatable="true" /> android:isRepeatable="true" />
<Key <Key
android:keyLabel="." android:keyLabel="."
android:popupKeyboard="@xml/popup_punctuation" android:popupKeyboard="@xml/popup_punctuation" />
android:keyWidth="10%p" />
<Key <Key
android:codes="@integer/key_return" android:codes="@integer/key_return"
android:keyIcon="@drawable/sym_bkeyboard_return" android:keyIcon="@drawable/sym_bkeyboard_return"
android:iconPreview="@drawable/sym_keyboard_feedback_return" android:iconPreview="@drawable/sym_keyboard_feedback_return"
android:keyWidth="25%p" android:keyWidth="20%p"
android:keyEdgeFlags="right" /> android:keyEdgeFlags="right" />
</Row> </Row>
<Row <Row
android:keyboardMode="@+id/mode_url" android:keyboardMode="@+id/mode_url"
android:keyWidth="10%p"
android:rowEdgeFlags="bottom"
>
<Key
android:codes="@integer/key_symbol"
android:keyLabel="@string/label_symbol_key"
android:keyWidth="20%p"
android:keyEdgeFlags="left" />
<Key
android:keyLabel="/" />
<Key
android:codes="@integer/key_space"
android:keyIcon="@drawable/sym_bkeyboard_space"
android:iconPreview="@drawable/sym_keyboard_feedback_space"
android:keyWidth="40%p"
android:isRepeatable="true" />
<Key
android:keyLabel="."
android:popupKeyboard="@xml/popup_punctuation" />
<Key
android:codes="@integer/key_return"
android:keyIcon="@drawable/sym_bkeyboard_return"
android:iconPreview="@drawable/sym_keyboard_feedback_return"
android:keyWidth="20%p"
android:keyEdgeFlags="right" />
</Row>
<Row
android:keyboardMode="@+id/mode_email"
android:keyWidth="10%p"
android:rowEdgeFlags="bottom"
>
<Key
android:codes="@integer/key_symbol"
android:keyLabel="@string/label_symbol_key"
android:keyWidth="20%p"
android:keyEdgeFlags="left" />
<Key
android:keyLabel="\@" />
<Key
android:codes="@integer/key_space"
android:keyIcon="@drawable/sym_bkeyboard_space"
android:iconPreview="@drawable/sym_keyboard_feedback_space"
android:keyWidth="40%p"
android:isRepeatable="true" />
<Key
android:keyLabel="."
android:popupKeyboard="@xml/popup_punctuation" />
<Key
android:codes="@integer/key_return"
android:keyIcon="@drawable/sym_bkeyboard_return"
android:iconPreview="@drawable/sym_keyboard_feedback_return"
android:keyWidth="20%p"
android:keyEdgeFlags="right" />
</Row>
<Row
android:keyboardMode="@+id/mode_im"
android:keyWidth="10%p"
android:rowEdgeFlags="bottom"
>
<Key
android:codes="@integer/key_symbol"
android:keyLabel="@string/label_symbol_key"
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" />
<Key
android:codes="@integer/key_space"
android:keyIcon="@drawable/sym_bkeyboard_space"
android:iconPreview="@drawable/sym_keyboard_feedback_space"
android:keyWidth="40%p"
android:isRepeatable="true" />
<Key
android:keyLabel="."
android:popupKeyboard="@xml/popup_punctuation" />
<Key
android:keyLabel=":-)"
android:keyOutputText=":-) "
android:popupKeyboard="@xml/popup_smileys"
android:keyWidth="20%p"
android:keyEdgeFlags="right" />
</Row>
<Row
android:keyboardMode="@+id/mode_webentry"
android:keyWidth="10%p"
android:rowEdgeFlags="bottom"
>
<Key
android:codes="@integer/key_symbol"
android:keyLabel="@string/label_symbol_key"
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" />
<Key
android:codes="@integer/key_space"
android:keyIcon="@drawable/sym_bkeyboard_space"
android:iconPreview="@drawable/sym_keyboard_feedback_space"
android:keyWidth="20%p"
android:isRepeatable="true" />
<Key
android:codes="@integer/key_tab"
android:keyIcon="@drawable/sym_bkeyboard_tab"
android:iconPreview="@drawable/sym_keyboard_feedback_tab"
android:keyWidth="20%p" />
<Key
android:keyLabel="."
android:popupKeyboard="@xml/popup_punctuation" />
<Key
android:codes="@integer/key_return"
android:keyIcon="@drawable/sym_bkeyboard_return"
android:iconPreview="@drawable/sym_keyboard_feedback_return"
android:keyWidth="20%p"
android:keyEdgeFlags="right" />
</Row>
<Row
android:keyboardMode="@+id/mode_normal_with_settings_key"
android:keyWidth="10%p"
android:rowEdgeFlags="bottom" android:rowEdgeFlags="bottom"
> >
<Key <Key
@ -188,11 +304,11 @@
<Key <Key
android:codes="@integer/key_settings" android:codes="@integer/key_settings"
android:keyIcon="@drawable/sym_bkeyboard_settings" android:keyIcon="@drawable/sym_bkeyboard_settings"
android:iconPreview="@drawable/sym_keyboard_feedback_settings" android:iconPreview="@drawable/sym_keyboard_feedback_settings" />
android:keyWidth="10%p" />
<Key <Key
android:keyLabel="/" android:codes="@integer/key_f1"
android:keyWidth="10%p" /> android:keyIcon="@drawable/sym_bkeyboard_mic"
android:iconPreview="@drawable/sym_keyboard_feedback_mic" />
<Key <Key
android:codes="@integer/key_space" android:codes="@integer/key_space"
android:keyIcon="@drawable/sym_bkeyboard_space" android:keyIcon="@drawable/sym_bkeyboard_space"
@ -201,8 +317,7 @@
android:isRepeatable="true" /> android:isRepeatable="true" />
<Key <Key
android:keyLabel="." android:keyLabel="."
android:popupKeyboard="@xml/popup_punctuation" android:popupKeyboard="@xml/popup_punctuation" />
android:keyWidth="10%p" />
<Key <Key
android:codes="@integer/key_return" android:codes="@integer/key_return"
android:keyIcon="@drawable/sym_bkeyboard_return" android:keyIcon="@drawable/sym_bkeyboard_return"
@ -211,7 +326,8 @@
android:keyEdgeFlags="right" /> android:keyEdgeFlags="right" />
</Row> </Row>
<Row <Row
android:keyboardMode="@+id/mode_email" android:keyboardMode="@+id/mode_url_with_settings_key"
android:keyWidth="10%p"
android:rowEdgeFlags="bottom" android:rowEdgeFlags="bottom"
> >
<Key <Key
@ -222,8 +338,39 @@
<Key <Key
android:codes="@integer/key_settings" android:codes="@integer/key_settings"
android:keyIcon="@drawable/sym_bkeyboard_settings" android:keyIcon="@drawable/sym_bkeyboard_settings"
android:iconPreview="@drawable/sym_keyboard_feedback_settings" android:iconPreview="@drawable/sym_keyboard_feedback_settings" />
android:keyWidth="10%p" /> <Key
android:keyLabel="/" />
<Key
android:codes="@integer/key_space"
android:keyIcon="@drawable/sym_bkeyboard_space"
android:iconPreview="@drawable/sym_keyboard_feedback_space"
android:keyWidth="30%p"
android:isRepeatable="true" />
<Key
android:keyLabel="."
android:popupKeyboard="@xml/popup_punctuation" />
<Key
android:codes="@integer/key_return"
android:keyIcon="@drawable/sym_bkeyboard_return"
android:iconPreview="@drawable/sym_keyboard_feedback_return"
android:keyWidth="25%p"
android:keyEdgeFlags="right" />
</Row>
<Row
android:keyboardMode="@+id/mode_email_with_settings_key"
android:keyWidth="10%p"
android:rowEdgeFlags="bottom"
>
<Key
android:codes="@integer/key_symbol"
android:keyLabel="@string/label_symbol_key"
android:keyWidth="15%p"
android:keyEdgeFlags="left" />
<Key
android:codes="@integer/key_settings"
android:keyIcon="@drawable/sym_bkeyboard_settings"
android:iconPreview="@drawable/sym_keyboard_feedback_settings" />
<Key <Key
android:keyLabel="\@" /> android:keyLabel="\@" />
<Key <Key
@ -243,7 +390,8 @@
android:keyEdgeFlags="right" /> android:keyEdgeFlags="right" />
</Row> </Row>
<Row <Row
android:keyboardMode="@+id/mode_im" android:keyboardMode="@+id/mode_im_with_settings_key"
android:keyWidth="10%p"
android:rowEdgeFlags="bottom" android:rowEdgeFlags="bottom"
> >
<Key <Key
@ -254,13 +402,11 @@
<Key <Key
android:codes="@integer/key_settings" android:codes="@integer/key_settings"
android:keyIcon="@drawable/sym_bkeyboard_settings" android:keyIcon="@drawable/sym_bkeyboard_settings"
android:iconPreview="@drawable/sym_keyboard_feedback_settings" android:iconPreview="@drawable/sym_keyboard_feedback_settings" />
android:keyWidth="10%p" />
<Key <Key
android:codes="@integer/key_f1" android:codes="@integer/key_f1"
android:keyIcon="@drawable/sym_bkeyboard_mic" android:keyIcon="@drawable/sym_bkeyboard_mic"
android:iconPreview="@drawable/sym_keyboard_feedback_mic" android:iconPreview="@drawable/sym_keyboard_feedback_mic" />
android:keyWidth="10%p" />
<Key <Key
android:codes="@integer/key_space" android:codes="@integer/key_space"
android:keyIcon="@drawable/sym_bkeyboard_space" android:keyIcon="@drawable/sym_bkeyboard_space"
@ -269,8 +415,7 @@
android:isRepeatable="true" /> android:isRepeatable="true" />
<Key <Key
android:keyLabel="." android:keyLabel="."
android:popupKeyboard="@xml/popup_punctuation" android:popupKeyboard="@xml/popup_punctuation" />
android:keyWidth="10%p" />
<Key <Key
android:keyLabel=":-)" android:keyLabel=":-)"
android:keyOutputText=":-) " android:keyOutputText=":-) "
@ -279,7 +424,8 @@
android:keyEdgeFlags="right" /> android:keyEdgeFlags="right" />
</Row> </Row>
<Row <Row
android:keyboardMode="@+id/mode_webentry" android:keyboardMode="@+id/mode_webentry_with_settings_key"
android:keyWidth="10%p"
android:rowEdgeFlags="bottom" android:rowEdgeFlags="bottom"
> >
<Key <Key
@ -290,13 +436,11 @@
<Key <Key
android:codes="@integer/key_settings" android:codes="@integer/key_settings"
android:keyIcon="@drawable/sym_bkeyboard_settings" android:keyIcon="@drawable/sym_bkeyboard_settings"
android:iconPreview="@drawable/sym_keyboard_feedback_settings" android:iconPreview="@drawable/sym_keyboard_feedback_settings" />
android:keyWidth="10%p" />
<Key <Key
android:codes="@integer/key_f1" android:codes="@integer/key_f1"
android:keyIcon="@drawable/sym_bkeyboard_mic" android:keyIcon="@drawable/sym_bkeyboard_mic"
android:iconPreview="@drawable/sym_keyboard_feedback_mic" android:iconPreview="@drawable/sym_keyboard_feedback_mic" />
android:keyWidth="10%p" />
<Key <Key
android:codes="@integer/key_space" android:codes="@integer/key_space"
android:keyIcon="@drawable/sym_bkeyboard_space" android:keyIcon="@drawable/sym_bkeyboard_space"
@ -306,12 +450,10 @@
<Key <Key
android:codes="@integer/key_tab" android:codes="@integer/key_tab"
android:keyIcon="@drawable/sym_bkeyboard_tab" android:keyIcon="@drawable/sym_bkeyboard_tab"
android:iconPreview="@drawable/sym_keyboard_feedback_tab" android:iconPreview="@drawable/sym_keyboard_feedback_tab" />
android:keyWidth="10%p" />
<Key <Key
android:keyLabel="." android:keyLabel="."
android:popupKeyboard="@xml/popup_punctuation" android:popupKeyboard="@xml/popup_punctuation" />
android:keyWidth="10%p" />
<Key <Key
android:codes="@integer/key_return" android:codes="@integer/key_return"
android:keyIcon="@drawable/sym_bkeyboard_return" android:keyIcon="@drawable/sym_bkeyboard_return"

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

@ -136,48 +136,184 @@
</Row> </Row>
<Row <Row
android:keyboardMode="@+id/mode_normal" android:keyboardMode="@+id/mode_normal"
android:keyWidth="10%p"
android:rowEdgeFlags="bottom" android:rowEdgeFlags="bottom"
> >
<Key <Key
android:codes="@integer/key_symbol" android:codes="@integer/key_symbol"
android:keyLabel="@string/label_symbol_key" android:keyLabel="@string/label_symbol_key"
android:keyWidth="15%p" android:keyWidth="20%p"
android:isModifier="true" android:isModifier="true"
android:keyEdgeFlags="left" /> android:keyEdgeFlags="left" />
<Key
android:codes="@integer/key_settings"
android:keyIcon="@drawable/sym_keyboard_settings"
android:iconPreview="@drawable/sym_keyboard_feedback_settings"
android:keyWidth="10%p"
android:isModifier="true" />
<Key <Key
android:codes="@integer/key_f1" android:codes="@integer/key_f1"
android:keyIcon="@drawable/sym_keyboard_mic" android:keyIcon="@drawable/sym_keyboard_mic"
android:iconPreview="@drawable/sym_keyboard_feedback_mic" android:iconPreview="@drawable/sym_keyboard_feedback_mic"
android:keyWidth="10%p"
android:isModifier="true" /> android:isModifier="true" />
<Key <Key
android:codes="@integer/key_space" android:codes="@integer/key_space"
android:keyIcon="@drawable/sym_keyboard_space" android:keyIcon="@drawable/sym_keyboard_space"
android:iconPreview="@drawable/sym_keyboard_feedback_space" android:iconPreview="@drawable/sym_keyboard_feedback_space"
android:keyWidth="30%p" android:keyWidth="40%p"
android:isModifier="true" android:isModifier="true"
android:isRepeatable="true" /> android:isRepeatable="true" />
<Key <Key
android:keyLabel="." android:keyLabel="."
android:popupKeyboard="@xml/popup_punctuation" android:popupKeyboard="@xml/popup_punctuation"
android:keyWidth="10%p"
android:isModifier="true" /> android:isModifier="true" />
<Key <Key
android:codes="@integer/key_return" android:codes="@integer/key_return"
android:keyIcon="@drawable/sym_keyboard_return" android:keyIcon="@drawable/sym_keyboard_return"
android:iconPreview="@drawable/sym_keyboard_feedback_return" android:iconPreview="@drawable/sym_keyboard_feedback_return"
android:keyWidth="25%p" android:keyWidth="20%p"
android:isModifier="true" android:isModifier="true"
android:keyEdgeFlags="right" /> android:keyEdgeFlags="right" />
</Row> </Row>
<Row <Row
android:keyboardMode="@+id/mode_url" android:keyboardMode="@+id/mode_url"
android:keyWidth="10%p"
android:rowEdgeFlags="bottom"
>
<Key
android:codes="@integer/key_symbol"
android:keyLabel="@string/label_symbol_key"
android:keyWidth="20%p"
android:isModifier="true"
android:keyEdgeFlags="left" />
<Key
android:keyLabel="/"
android:isModifier="true" />
<Key
android:codes="@integer/key_space"
android:keyIcon="@drawable/sym_keyboard_space"
android:iconPreview="@drawable/sym_keyboard_feedback_space"
android:keyWidth="40%p"
android:isModifier="true"
android:isRepeatable="true" />
<Key
android:keyLabel="."
android:popupKeyboard="@xml/popup_punctuation"
android:isModifier="true" />
<Key
android:codes="@integer/key_return"
android:keyIcon="@drawable/sym_keyboard_return"
android:iconPreview="@drawable/sym_keyboard_feedback_return"
android:keyWidth="20%p"
android:isModifier="true"
android:keyEdgeFlags="right" />
</Row>
<Row
android:keyboardMode="@+id/mode_email"
android:keyWidth="10%p"
android:rowEdgeFlags="bottom"
>
<Key
android:codes="@integer/key_symbol"
android:keyLabel="@string/label_symbol_key"
android:keyWidth="20%p"
android:isModifier="true"
android:keyEdgeFlags="left" />
<Key
android:keyLabel="\@"
android:isModifier="true" />
<Key
android:codes="@integer/key_space"
android:keyIcon="@drawable/sym_keyboard_space"
android:iconPreview="@drawable/sym_keyboard_feedback_space"
android:keyWidth="40%p"
android:isModifier="true"
android:isRepeatable="true" />
<Key
android:keyLabel="."
android:popupKeyboard="@xml/popup_punctuation"
android:isModifier="true" />
<Key
android:codes="@integer/key_return"
android:keyIcon="@drawable/sym_keyboard_return"
android:iconPreview="@drawable/sym_keyboard_feedback_return"
android:keyWidth="20%p"
android:isModifier="true"
android:keyEdgeFlags="right" />
</Row>
<Row
android:keyboardMode="@+id/mode_im"
android:keyWidth="10%p"
android:rowEdgeFlags="bottom"
>
<Key
android:codes="@integer/key_symbol"
android:keyLabel="@string/label_symbol_key"
android:keyWidth="20%p"
android:isModifier="true"
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"
android:keyIcon="@drawable/sym_keyboard_space"
android:iconPreview="@drawable/sym_keyboard_feedback_space"
android:keyWidth="40%p"
android:isModifier="true"
android:isRepeatable="true" />
<Key
android:keyLabel="."
android:popupKeyboard="@xml/popup_punctuation"
android:isModifier="true" />
<Key
android:keyLabel=":-)"
android:keyOutputText=":-) "
android:popupKeyboard="@xml/popup_smileys"
android:keyWidth="20%p"
android:isModifier="true"
android:keyEdgeFlags="right" />
</Row>
<Row
android:keyboardMode="@+id/mode_webentry"
android:keyWidth="10%p"
android:rowEdgeFlags="bottom"
>
<Key
android:codes="@integer/key_symbol"
android:keyLabel="@string/label_symbol_key"
android:keyWidth="20%p"
android:isModifier="true"
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"
android:keyIcon="@drawable/sym_keyboard_space"
android:iconPreview="@drawable/sym_keyboard_feedback_space"
android:keyWidth="20%p"
android:isModifier="true"
android:isRepeatable="true" />
<Key
android:codes="@integer/key_tab"
android:keyIcon="@drawable/sym_keyboard_tab"
android:iconPreview="@drawable/sym_keyboard_feedback_tab"
android:keyWidth="20%p"
android:isModifier="true" />
<Key
android:keyLabel="."
android:popupKeyboard="@xml/popup_punctuation"
android:isModifier="true" />
<Key
android:codes="@integer/key_return"
android:keyIcon="@drawable/sym_keyboard_return"
android:iconPreview="@drawable/sym_keyboard_feedback_return"
android:keyWidth="20%p"
android:isModifier="true"
android:keyEdgeFlags="right" />
</Row>
<Row
android:keyboardMode="@+id/mode_normal_with_settings_key"
android:keyWidth="10%p"
android:rowEdgeFlags="bottom" android:rowEdgeFlags="bottom"
> >
<Key <Key
@ -190,11 +326,11 @@
android:codes="@integer/key_settings" android:codes="@integer/key_settings"
android:keyIcon="@drawable/sym_keyboard_settings" android:keyIcon="@drawable/sym_keyboard_settings"
android:iconPreview="@drawable/sym_keyboard_feedback_settings" android:iconPreview="@drawable/sym_keyboard_feedback_settings"
android:keyWidth="10%p"
android:isModifier="true" /> android:isModifier="true" />
<Key <Key
android:keyLabel="/" android:codes="@integer/key_f1"
android:keyWidth="10%p" android:keyIcon="@drawable/sym_keyboard_mic"
android:iconPreview="@drawable/sym_keyboard_feedback_mic"
android:isModifier="true" /> android:isModifier="true" />
<Key <Key
android:codes="@integer/key_space" android:codes="@integer/key_space"
@ -206,7 +342,6 @@
<Key <Key
android:keyLabel="." android:keyLabel="."
android:popupKeyboard="@xml/popup_punctuation" android:popupKeyboard="@xml/popup_punctuation"
android:keyWidth="10%p"
android:isModifier="true" /> android:isModifier="true" />
<Key <Key
android:codes="@integer/key_return" android:codes="@integer/key_return"
@ -217,7 +352,8 @@
android:keyEdgeFlags="right" /> android:keyEdgeFlags="right" />
</Row> </Row>
<Row <Row
android:keyboardMode="@+id/mode_email" android:keyboardMode="@+id/mode_url_with_settings_key"
android:keyWidth="10%p"
android:rowEdgeFlags="bottom" android:rowEdgeFlags="bottom"
> >
<Key <Key
@ -230,7 +366,44 @@
android:codes="@integer/key_settings" android:codes="@integer/key_settings"
android:keyIcon="@drawable/sym_keyboard_settings" android:keyIcon="@drawable/sym_keyboard_settings"
android:iconPreview="@drawable/sym_keyboard_feedback_settings" android:iconPreview="@drawable/sym_keyboard_feedback_settings"
android:isModifier="true" />
<Key
android:keyLabel="/"
android:isModifier="true" />
<Key
android:codes="@integer/key_space"
android:keyIcon="@drawable/sym_keyboard_space"
android:iconPreview="@drawable/sym_keyboard_feedback_space"
android:keyWidth="30%p"
android:isModifier="true"
android:isRepeatable="true" />
<Key
android:keyLabel="."
android:popupKeyboard="@xml/popup_punctuation"
android:isModifier="true" />
<Key
android:codes="@integer/key_return"
android:keyIcon="@drawable/sym_keyboard_return"
android:iconPreview="@drawable/sym_keyboard_feedback_return"
android:keyWidth="25%p"
android:isModifier="true"
android:keyEdgeFlags="right" />
</Row>
<Row
android:keyboardMode="@+id/mode_email_with_settings_key"
android:keyWidth="10%p" android:keyWidth="10%p"
android:rowEdgeFlags="bottom"
>
<Key
android:codes="@integer/key_symbol"
android:keyLabel="@string/label_symbol_key"
android:keyWidth="15%p"
android:isModifier="true"
android:keyEdgeFlags="left" />
<Key
android:codes="@integer/key_settings"
android:keyIcon="@drawable/sym_keyboard_settings"
android:iconPreview="@drawable/sym_keyboard_feedback_settings"
android:isModifier="true" /> android:isModifier="true" />
<Key <Key
android:keyLabel="\@" android:keyLabel="\@"
@ -255,49 +428,8 @@
android:keyEdgeFlags="right" /> android:keyEdgeFlags="right" />
</Row> </Row>
<Row <Row
android:keyboardMode="@+id/mode_im" android:keyboardMode="@+id/mode_im_with_settings_key"
android:rowEdgeFlags="bottom"
>
<Key
android:codes="@integer/key_symbol"
android:keyLabel="@string/label_symbol_key"
android:keyWidth="15%p"
android:keyEdgeFlags="left"
android:isModifier="true" />
<Key
android:codes="@integer/key_settings"
android:keyIcon="@drawable/sym_keyboard_settings"
android:iconPreview="@drawable/sym_keyboard_feedback_settings"
android:keyWidth="10%p" android:keyWidth="10%p"
android:isModifier="true" />
<Key
android:codes="@integer/key_f1"
android:keyIcon="@drawable/sym_keyboard_mic"
android:iconPreview="@drawable/sym_keyboard_feedback_mic"
android:keyWidth="10%p"
android:isModifier="true" />
<Key
android:codes="@integer/key_space"
android:keyIcon="@drawable/sym_keyboard_space"
android:iconPreview="@drawable/sym_keyboard_feedback_space"
android:keyWidth="30%p"
android:isModifier="true"
android:isRepeatable="true" />
<Key
android:keyLabel="."
android:popupKeyboard="@xml/popup_punctuation"
android:keyWidth="10%p"
android:isModifier="true" />
<Key
android:keyLabel=":-)"
android:keyOutputText=":-) "
android:popupKeyboard="@xml/popup_smileys"
android:keyWidth="25%p"
android:isModifier="true"
android:keyEdgeFlags="right" />
</Row>
<Row
android:keyboardMode="@+id/mode_webentry"
android:rowEdgeFlags="bottom" android:rowEdgeFlags="bottom"
> >
<Key <Key
@ -310,13 +442,51 @@
android:codes="@integer/key_settings" android:codes="@integer/key_settings"
android:keyIcon="@drawable/sym_keyboard_settings" android:keyIcon="@drawable/sym_keyboard_settings"
android:iconPreview="@drawable/sym_keyboard_feedback_settings" android:iconPreview="@drawable/sym_keyboard_feedback_settings"
android:keyWidth="10%p"
android:isModifier="true" /> android:isModifier="true" />
<Key <Key
android:codes="@integer/key_f1" android:codes="@integer/key_f1"
android:keyIcon="@drawable/sym_keyboard_mic" android:keyIcon="@drawable/sym_keyboard_mic"
android:iconPreview="@drawable/sym_keyboard_feedback_mic" android:iconPreview="@drawable/sym_keyboard_feedback_mic"
android:isModifier="true" />
<Key
android:codes="@integer/key_space"
android:keyIcon="@drawable/sym_keyboard_space"
android:iconPreview="@drawable/sym_keyboard_feedback_space"
android:keyWidth="30%p"
android:isModifier="true"
android:isRepeatable="true" />
<Key
android:keyLabel="."
android:popupKeyboard="@xml/popup_punctuation"
android:isModifier="true" />
<Key
android:keyLabel=":-)"
android:keyOutputText=":-) "
android:popupKeyboard="@xml/popup_smileys"
android:keyWidth="25%p"
android:isModifier="true"
android:keyEdgeFlags="right" />
</Row>
<Row
android:keyboardMode="@+id/mode_webentry_with_settings_key"
android:keyWidth="10%p" android:keyWidth="10%p"
android:rowEdgeFlags="bottom"
>
<Key
android:codes="@integer/key_symbol"
android:keyLabel="@string/label_symbol_key"
android:keyWidth="15%p"
android:isModifier="true"
android:keyEdgeFlags="left" />
<Key
android:codes="@integer/key_settings"
android:keyIcon="@drawable/sym_keyboard_settings"
android:iconPreview="@drawable/sym_keyboard_feedback_settings"
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" /> android:isModifier="true" />
<Key <Key
android:codes="@integer/key_space" android:codes="@integer/key_space"
@ -329,12 +499,10 @@
android:codes="@integer/key_tab" android:codes="@integer/key_tab"
android:keyIcon="@drawable/sym_keyboard_tab" android:keyIcon="@drawable/sym_keyboard_tab"
android:iconPreview="@drawable/sym_keyboard_feedback_tab" android:iconPreview="@drawable/sym_keyboard_feedback_tab"
android:keyWidth="10%p"
android:isModifier="true" /> android:isModifier="true" />
<Key <Key
android:keyLabel="." android:keyLabel="."
android:popupKeyboard="@xml/popup_punctuation" android:popupKeyboard="@xml/popup_punctuation"
android:keyWidth="10%p"
android:isModifier="true" /> android:isModifier="true" />
<Key <Key
android:codes="@integer/key_return" android:codes="@integer/key_return"

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

@ -135,42 +135,158 @@
</Row> </Row>
<Row <Row
android:keyboardMode="@+id/mode_normal" android:keyboardMode="@+id/mode_normal"
android:keyWidth="10%p"
android:rowEdgeFlags="bottom" android:rowEdgeFlags="bottom"
> >
<Key <Key
android:codes="@integer/key_symbol" android:codes="@integer/key_symbol"
android:keyLabel="@string/label_symbol_key" android:keyLabel="@string/label_symbol_key"
android:keyWidth="15%p" android:keyWidth="20%p"
android:keyEdgeFlags="left" /> android:keyEdgeFlags="left" />
<Key
android:codes="@integer/key_settings"
android:keyIcon="@drawable/sym_bkeyboard_settings"
android:iconPreview="@drawable/sym_keyboard_feedback_settings"
android:keyWidth="10%p" />
<Key <Key
android:codes="@integer/key_f1" android:codes="@integer/key_f1"
android:keyIcon="@drawable/sym_bkeyboard_mic" android:keyIcon="@drawable/sym_bkeyboard_mic"
android:iconPreview="@drawable/sym_keyboard_feedback_mic" android:iconPreview="@drawable/sym_keyboard_feedback_mic" />
android:keyWidth="10%p" />
<Key <Key
android:codes="@integer/key_space" android:codes="@integer/key_space"
android:keyIcon="@drawable/sym_bkeyboard_space" android:keyIcon="@drawable/sym_bkeyboard_space"
android:iconPreview="@drawable/sym_keyboard_feedback_space" android:iconPreview="@drawable/sym_keyboard_feedback_space"
android:keyWidth="30%p" android:keyWidth="40%p"
android:isRepeatable="true" /> android:isRepeatable="true" />
<Key <Key
android:keyLabel="." android:keyLabel="."
android:popupKeyboard="@xml/popup_punctuation" android:popupKeyboard="@xml/popup_punctuation" />
android:keyWidth="10%p" />
<Key <Key
android:codes="@integer/key_return" android:codes="@integer/key_return"
android:keyIcon="@drawable/sym_bkeyboard_return" android:keyIcon="@drawable/sym_bkeyboard_return"
android:iconPreview="@drawable/sym_keyboard_feedback_return" android:iconPreview="@drawable/sym_keyboard_feedback_return"
android:keyWidth="25%p" android:keyWidth="20%p"
android:keyEdgeFlags="right" /> android:keyEdgeFlags="right" />
</Row> </Row>
<Row <Row
android:keyboardMode="@+id/mode_url" android:keyboardMode="@+id/mode_url"
android:keyWidth="10%p"
android:rowEdgeFlags="bottom"
>
<Key
android:codes="@integer/key_symbol"
android:keyLabel="@string/label_symbol_key"
android:keyWidth="20%p"
android:keyEdgeFlags="left" />
<Key
android:keyLabel="/" />
<Key
android:codes="@integer/key_space"
android:keyIcon="@drawable/sym_bkeyboard_space"
android:iconPreview="@drawable/sym_keyboard_feedback_space"
android:keyWidth="40%p"
android:isRepeatable="true" />
<Key
android:keyLabel="."
android:popupKeyboard="@xml/popup_punctuation" />
<Key
android:codes="@integer/key_return"
android:keyIcon="@drawable/sym_bkeyboard_return"
android:iconPreview="@drawable/sym_keyboard_feedback_return"
android:keyWidth="20%p"
android:keyEdgeFlags="right" />
</Row>
<Row
android:keyboardMode="@+id/mode_email"
android:keyWidth="10%p"
android:rowEdgeFlags="bottom"
>
<Key
android:codes="@integer/key_symbol"
android:keyLabel="@string/label_symbol_key"
android:keyWidth="20%p"
android:keyEdgeFlags="left" />
<Key
android:keyLabel="\@" />
<Key
android:codes="@integer/key_space"
android:keyIcon="@drawable/sym_bkeyboard_space"
android:iconPreview="@drawable/sym_keyboard_feedback_space"
android:keyWidth="40%p"
android:isRepeatable="true" />
<Key
android:keyLabel="."
android:popupKeyboard="@xml/popup_punctuation" />
<Key
android:codes="@integer/key_return"
android:keyIcon="@drawable/sym_bkeyboard_return"
android:iconPreview="@drawable/sym_keyboard_feedback_return"
android:keyWidth="20%p"
android:keyEdgeFlags="right" />
</Row>
<Row
android:keyboardMode="@+id/mode_im"
android:keyWidth="10%p"
android:rowEdgeFlags="bottom"
>
<Key
android:codes="@integer/key_symbol"
android:keyLabel="@string/label_symbol_key"
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" />
<Key
android:codes="@integer/key_space"
android:keyIcon="@drawable/sym_bkeyboard_space"
android:iconPreview="@drawable/sym_keyboard_feedback_space"
android:keyWidth="40%p"
android:isRepeatable="true" />
<Key
android:keyLabel="."
android:popupKeyboard="@xml/popup_punctuation" />
<Key
android:keyLabel=":-)"
android:keyOutputText=":-) "
android:popupKeyboard="@xml/popup_smileys"
android:keyWidth="20%p"
android:keyEdgeFlags="right" />
</Row>
<Row
android:keyboardMode="@+id/mode_webentry"
android:keyWidth="10%p"
android:rowEdgeFlags="bottom"
>
<Key
android:codes="@integer/key_symbol"
android:keyLabel="@string/label_symbol_key"
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" />
<Key
android:codes="@integer/key_space"
android:keyIcon="@drawable/sym_bkeyboard_space"
android:iconPreview="@drawable/sym_keyboard_feedback_space"
android:keyWidth="20%p"
android:isRepeatable="true" />
<Key
android:codes="@integer/key_tab"
android:keyIcon="@drawable/sym_bkeyboard_tab"
android:iconPreview="@drawable/sym_keyboard_feedback_tab"
android:keyWidth="20%p" />
<Key
android:keyLabel="."
android:popupKeyboard="@xml/popup_punctuation" />
<Key
android:codes="@integer/key_return"
android:keyIcon="@drawable/sym_bkeyboard_return"
android:iconPreview="@drawable/sym_keyboard_feedback_return"
android:keyWidth="20%p"
android:keyEdgeFlags="right" />
</Row>
<Row
android:keyboardMode="@+id/mode_normal_with_settings_key"
android:keyWidth="10%p"
android:rowEdgeFlags="bottom" android:rowEdgeFlags="bottom"
> >
<Key <Key
@ -181,11 +297,11 @@
<Key <Key
android:codes="@integer/key_settings" android:codes="@integer/key_settings"
android:keyIcon="@drawable/sym_bkeyboard_settings" android:keyIcon="@drawable/sym_bkeyboard_settings"
android:iconPreview="@drawable/sym_keyboard_feedback_settings" android:iconPreview="@drawable/sym_keyboard_feedback_settings" />
android:keyWidth="10%p" />
<Key <Key
android:keyLabel="/" android:codes="@integer/key_f1"
android:keyWidth="10%p" /> android:keyIcon="@drawable/sym_bkeyboard_mic"
android:iconPreview="@drawable/sym_keyboard_feedback_mic" />
<Key <Key
android:codes="@integer/key_space" android:codes="@integer/key_space"
android:keyIcon="@drawable/sym_bkeyboard_space" android:keyIcon="@drawable/sym_bkeyboard_space"
@ -194,8 +310,7 @@
android:isRepeatable="true" /> android:isRepeatable="true" />
<Key <Key
android:keyLabel="." android:keyLabel="."
android:popupKeyboard="@xml/popup_punctuation" android:popupKeyboard="@xml/popup_punctuation" />
android:keyWidth="10%p" />
<Key <Key
android:codes="@integer/key_return" android:codes="@integer/key_return"
android:keyIcon="@drawable/sym_bkeyboard_return" android:keyIcon="@drawable/sym_bkeyboard_return"
@ -204,7 +319,8 @@
android:keyEdgeFlags="right" /> android:keyEdgeFlags="right" />
</Row> </Row>
<Row <Row
android:keyboardMode="@+id/mode_email" android:keyboardMode="@+id/mode_url_with_settings_key"
android:keyWidth="10%p"
android:rowEdgeFlags="bottom" android:rowEdgeFlags="bottom"
> >
<Key <Key
@ -215,8 +331,39 @@
<Key <Key
android:codes="@integer/key_settings" android:codes="@integer/key_settings"
android:keyIcon="@drawable/sym_bkeyboard_settings" android:keyIcon="@drawable/sym_bkeyboard_settings"
android:iconPreview="@drawable/sym_keyboard_feedback_settings" android:iconPreview="@drawable/sym_keyboard_feedback_settings" />
android:keyWidth="10%p" /> <Key
android:keyLabel="/" />
<Key
android:codes="@integer/key_space"
android:keyIcon="@drawable/sym_bkeyboard_space"
android:iconPreview="@drawable/sym_keyboard_feedback_space"
android:keyWidth="30%p"
android:isRepeatable="true" />
<Key
android:keyLabel="."
android:popupKeyboard="@xml/popup_punctuation" />
<Key
android:codes="@integer/key_return"
android:keyIcon="@drawable/sym_bkeyboard_return"
android:iconPreview="@drawable/sym_keyboard_feedback_return"
android:keyWidth="25%p"
android:keyEdgeFlags="right" />
</Row>
<Row
android:keyboardMode="@+id/mode_email_with_settings_key"
android:keyWidth="10%p"
android:rowEdgeFlags="bottom"
>
<Key
android:codes="@integer/key_symbol"
android:keyLabel="@string/label_symbol_key"
android:keyWidth="15%p"
android:keyEdgeFlags="left" />
<Key
android:codes="@integer/key_settings"
android:keyIcon="@drawable/sym_bkeyboard_settings"
android:iconPreview="@drawable/sym_keyboard_feedback_settings" />
<Key <Key
android:keyLabel="\@" /> android:keyLabel="\@" />
<Key <Key
@ -236,7 +383,8 @@
android:keyEdgeFlags="right" /> android:keyEdgeFlags="right" />
</Row> </Row>
<Row <Row
android:keyboardMode="@+id/mode_im" android:keyboardMode="@+id/mode_im_with_settings_key"
android:keyWidth="10%p"
android:rowEdgeFlags="bottom" android:rowEdgeFlags="bottom"
> >
<Key <Key
@ -247,13 +395,11 @@
<Key <Key
android:codes="@integer/key_settings" android:codes="@integer/key_settings"
android:keyIcon="@drawable/sym_bkeyboard_settings" android:keyIcon="@drawable/sym_bkeyboard_settings"
android:iconPreview="@drawable/sym_keyboard_feedback_settings" android:iconPreview="@drawable/sym_keyboard_feedback_settings" />
android:keyWidth="10%p" />
<Key <Key
android:codes="@integer/key_f1" android:codes="@integer/key_f1"
android:keyIcon="@drawable/sym_bkeyboard_mic" android:keyIcon="@drawable/sym_bkeyboard_mic"
android:iconPreview="@drawable/sym_keyboard_feedback_mic" android:iconPreview="@drawable/sym_keyboard_feedback_mic" />
android:keyWidth="10%p" />
<Key <Key
android:codes="@integer/key_space" android:codes="@integer/key_space"
android:keyIcon="@drawable/sym_bkeyboard_space" android:keyIcon="@drawable/sym_bkeyboard_space"
@ -262,8 +408,7 @@
android:isRepeatable="true" /> android:isRepeatable="true" />
<Key <Key
android:keyLabel="." android:keyLabel="."
android:popupKeyboard="@xml/popup_punctuation" android:popupKeyboard="@xml/popup_punctuation" />
android:keyWidth="10%p" />
<Key <Key
android:keyLabel=":-)" android:keyLabel=":-)"
android:keyOutputText=":-) " android:keyOutputText=":-) "
@ -272,7 +417,8 @@
android:keyEdgeFlags="right" /> android:keyEdgeFlags="right" />
</Row> </Row>
<Row <Row
android:keyboardMode="@+id/mode_webentry" android:keyboardMode="@+id/mode_webentry_with_settings_key"
android:keyWidth="10%p"
android:rowEdgeFlags="bottom" android:rowEdgeFlags="bottom"
> >
<Key <Key
@ -283,13 +429,11 @@
<Key <Key
android:codes="@integer/key_settings" android:codes="@integer/key_settings"
android:keyIcon="@drawable/sym_bkeyboard_settings" android:keyIcon="@drawable/sym_bkeyboard_settings"
android:iconPreview="@drawable/sym_keyboard_feedback_settings" android:iconPreview="@drawable/sym_keyboard_feedback_settings" />
android:keyWidth="10%p" />
<Key <Key
android:codes="@integer/key_f1" android:codes="@integer/key_f1"
android:keyIcon="@drawable/sym_bkeyboard_mic" android:keyIcon="@drawable/sym_bkeyboard_mic"
android:iconPreview="@drawable/sym_keyboard_feedback_mic" android:iconPreview="@drawable/sym_keyboard_feedback_mic" />
android:keyWidth="10%p" />
<Key <Key
android:codes="@integer/key_space" android:codes="@integer/key_space"
android:keyIcon="@drawable/sym_bkeyboard_space" android:keyIcon="@drawable/sym_bkeyboard_space"
@ -299,12 +443,10 @@
<Key <Key
android:codes="@integer/key_tab" android:codes="@integer/key_tab"
android:keyIcon="@drawable/sym_bkeyboard_tab" android:keyIcon="@drawable/sym_bkeyboard_tab"
android:iconPreview="@drawable/sym_keyboard_feedback_tab" android:iconPreview="@drawable/sym_keyboard_feedback_tab" />
android:keyWidth="10%p" />
<Key <Key
android:keyLabel="." android:keyLabel="."
android:popupKeyboard="@xml/popup_punctuation" android:popupKeyboard="@xml/popup_punctuation" />
android:keyWidth="10%p" />
<Key <Key
android:codes="@integer/key_return" android:codes="@integer/key_return"
android:keyIcon="@drawable/sym_bkeyboard_return" android:keyIcon="@drawable/sym_bkeyboard_return"

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

@ -166,48 +166,184 @@
</Row> </Row>
<Row <Row
android:keyboardMode="@+id/mode_normal" android:keyboardMode="@+id/mode_normal"
android:keyWidth="10%p"
android:rowEdgeFlags="bottom" android:rowEdgeFlags="bottom"
> >
<Key <Key
android:codes="@integer/key_symbol" android:codes="@integer/key_symbol"
android:keyLabel="@string/label_symbol_key" android:keyLabel="@string/label_symbol_key"
android:keyWidth="15%p" android:keyWidth="20%p"
android:isModifier="true" android:isModifier="true"
android:keyEdgeFlags="left" /> android:keyEdgeFlags="left" />
<Key
android:codes="@integer/key_settings"
android:keyIcon="@drawable/sym_keyboard_settings"
android:iconPreview="@drawable/sym_keyboard_feedback_settings"
android:keyWidth="10%p"
android:isModifier="true" />
<Key <Key
android:codes="@integer/key_f1" android:codes="@integer/key_f1"
android:keyIcon="@drawable/sym_keyboard_mic" android:keyIcon="@drawable/sym_keyboard_mic"
android:iconPreview="@drawable/sym_keyboard_feedback_mic" android:iconPreview="@drawable/sym_keyboard_feedback_mic"
android:keyWidth="10%p"
android:isModifier="true" /> android:isModifier="true" />
<Key <Key
android:codes="@integer/key_space" android:codes="@integer/key_space"
android:keyIcon="@drawable/sym_keyboard_space" android:keyIcon="@drawable/sym_keyboard_space"
android:iconPreview="@drawable/sym_keyboard_feedback_space" android:iconPreview="@drawable/sym_keyboard_feedback_space"
android:keyWidth="30%p" android:keyWidth="40%p"
android:isModifier="true" android:isModifier="true"
android:isRepeatable="true" /> android:isRepeatable="true" />
<Key <Key
android:keyLabel="." android:keyLabel="."
android:popupKeyboard="@xml/popup_punctuation" android:popupKeyboard="@xml/popup_punctuation"
android:keyWidth="10%p"
android:isModifier="true" /> android:isModifier="true" />
<Key <Key
android:codes="@integer/key_return" android:codes="@integer/key_return"
android:keyIcon="@drawable/sym_keyboard_return" android:keyIcon="@drawable/sym_keyboard_return"
android:iconPreview="@drawable/sym_keyboard_feedback_return" android:iconPreview="@drawable/sym_keyboard_feedback_return"
android:keyWidth="25%p" android:keyWidth="20%p"
android:isModifier="true" android:isModifier="true"
android:keyEdgeFlags="right" /> android:keyEdgeFlags="right" />
</Row> </Row>
<Row <Row
android:keyboardMode="@+id/mode_url" android:keyboardMode="@+id/mode_url"
android:keyWidth="10%p"
android:rowEdgeFlags="bottom"
>
<Key
android:codes="@integer/key_symbol"
android:keyLabel="@string/label_symbol_key"
android:keyWidth="20%p"
android:isModifier="true"
android:keyEdgeFlags="left" />
<Key
android:keyLabel="/"
android:isModifier="true" />
<Key
android:codes="@integer/key_space"
android:keyIcon="@drawable/sym_keyboard_space"
android:iconPreview="@drawable/sym_keyboard_feedback_space"
android:keyWidth="40%p"
android:isModifier="true"
android:isRepeatable="true" />
<Key
android:keyLabel="."
android:popupKeyboard="@xml/popup_punctuation"
android:isModifier="true" />
<Key
android:codes="@integer/key_return"
android:keyIcon="@drawable/sym_keyboard_return"
android:iconPreview="@drawable/sym_keyboard_feedback_return"
android:keyWidth="20%p"
android:isModifier="true"
android:keyEdgeFlags="right" />
</Row>
<Row
android:keyboardMode="@+id/mode_email"
android:keyWidth="10%p"
android:rowEdgeFlags="bottom"
>
<Key
android:codes="@integer/key_symbol"
android:keyLabel="@string/label_symbol_key"
android:keyWidth="20%p"
android:isModifier="true"
android:keyEdgeFlags="left" />
<Key
android:keyLabel="\@"
android:isModifier="true" />
<Key
android:codes="@integer/key_space"
android:keyIcon="@drawable/sym_keyboard_space"
android:iconPreview="@drawable/sym_keyboard_feedback_space"
android:keyWidth="40%p"
android:isModifier="true"
android:isRepeatable="true" />
<Key
android:keyLabel="."
android:popupKeyboard="@xml/popup_punctuation"
android:isModifier="true" />
<Key
android:codes="@integer/key_return"
android:keyIcon="@drawable/sym_keyboard_return"
android:iconPreview="@drawable/sym_keyboard_feedback_return"
android:keyWidth="20%p"
android:isModifier="true"
android:keyEdgeFlags="right" />
</Row>
<Row
android:keyboardMode="@+id/mode_im"
android:keyWidth="10%p"
android:rowEdgeFlags="bottom"
>
<Key
android:codes="@integer/key_symbol"
android:keyLabel="@string/label_symbol_key"
android:keyWidth="20%p"
android:isModifier="true"
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"
android:keyIcon="@drawable/sym_keyboard_space"
android:iconPreview="@drawable/sym_keyboard_feedback_space"
android:keyWidth="40%p"
android:isModifier="true"
android:isRepeatable="true" />
<Key
android:keyLabel="."
android:popupKeyboard="@xml/popup_punctuation"
android:isModifier="true" />
<Key
android:keyLabel=":-)"
android:keyOutputText=":-) "
android:popupKeyboard="@xml/popup_smileys"
android:keyWidth="20%p"
android:isModifier="true"
android:keyEdgeFlags="right" />
</Row>
<Row
android:keyboardMode="@+id/mode_webentry"
android:keyWidth="10%p"
android:rowEdgeFlags="bottom"
>
<Key
android:codes="@integer/key_symbol"
android:keyLabel="@string/label_symbol_key"
android:keyWidth="20%p"
android:isModifier="true"
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"
android:keyIcon="@drawable/sym_keyboard_space"
android:iconPreview="@drawable/sym_keyboard_feedback_space"
android:keyWidth="20%p"
android:isModifier="true"
android:isRepeatable="true" />
<Key
android:codes="@integer/key_tab"
android:keyIcon="@drawable/sym_keyboard_tab"
android:iconPreview="@drawable/sym_keyboard_feedback_tab"
android:keyWidth="20%p"
android:isModifier="true" />
<Key
android:keyLabel="."
android:popupKeyboard="@xml/popup_punctuation"
android:isModifier="true" />
<Key
android:codes="@integer/key_return"
android:keyIcon="@drawable/sym_keyboard_return"
android:iconPreview="@drawable/sym_keyboard_feedback_return"
android:keyWidth="20%p"
android:isModifier="true"
android:keyEdgeFlags="right" />
</Row>
<Row
android:keyboardMode="@+id/mode_normal_with_settings_key"
android:keyWidth="10%p"
android:rowEdgeFlags="bottom" android:rowEdgeFlags="bottom"
> >
<Key <Key
@ -220,11 +356,11 @@
android:codes="@integer/key_settings" android:codes="@integer/key_settings"
android:keyIcon="@drawable/sym_keyboard_settings" android:keyIcon="@drawable/sym_keyboard_settings"
android:iconPreview="@drawable/sym_keyboard_feedback_settings" android:iconPreview="@drawable/sym_keyboard_feedback_settings"
android:keyWidth="10%p"
android:isModifier="true" /> android:isModifier="true" />
<Key <Key
android:keyLabel="/" android:codes="@integer/key_f1"
android:keyWidth="10%p" android:keyIcon="@drawable/sym_keyboard_mic"
android:iconPreview="@drawable/sym_keyboard_feedback_mic"
android:isModifier="true" /> android:isModifier="true" />
<Key <Key
android:codes="@integer/key_space" android:codes="@integer/key_space"
@ -236,7 +372,6 @@
<Key <Key
android:keyLabel="." android:keyLabel="."
android:popupKeyboard="@xml/popup_punctuation" android:popupKeyboard="@xml/popup_punctuation"
android:keyWidth="10%p"
android:isModifier="true" /> android:isModifier="true" />
<Key <Key
android:codes="@integer/key_return" android:codes="@integer/key_return"
@ -247,7 +382,8 @@
android:keyEdgeFlags="right" /> android:keyEdgeFlags="right" />
</Row> </Row>
<Row <Row
android:keyboardMode="@+id/mode_email" android:keyboardMode="@+id/mode_url_with_settings_key"
android:keyWidth="10%p"
android:rowEdgeFlags="bottom" android:rowEdgeFlags="bottom"
> >
<Key <Key
@ -260,7 +396,44 @@
android:codes="@integer/key_settings" android:codes="@integer/key_settings"
android:keyIcon="@drawable/sym_keyboard_settings" android:keyIcon="@drawable/sym_keyboard_settings"
android:iconPreview="@drawable/sym_keyboard_feedback_settings" android:iconPreview="@drawable/sym_keyboard_feedback_settings"
android:isModifier="true" />
<Key
android:keyLabel="/"
android:isModifier="true" />
<Key
android:codes="@integer/key_space"
android:keyIcon="@drawable/sym_keyboard_space"
android:iconPreview="@drawable/sym_keyboard_feedback_space"
android:keyWidth="30%p"
android:isModifier="true"
android:isRepeatable="true" />
<Key
android:keyLabel="."
android:popupKeyboard="@xml/popup_punctuation"
android:isModifier="true" />
<Key
android:codes="@integer/key_return"
android:keyIcon="@drawable/sym_keyboard_return"
android:iconPreview="@drawable/sym_keyboard_feedback_return"
android:keyWidth="25%p"
android:isModifier="true"
android:keyEdgeFlags="right" />
</Row>
<Row
android:keyboardMode="@+id/mode_email_with_settings_key"
android:keyWidth="10%p" android:keyWidth="10%p"
android:rowEdgeFlags="bottom"
>
<Key
android:codes="@integer/key_symbol"
android:keyLabel="@string/label_symbol_key"
android:keyWidth="15%p"
android:isModifier="true"
android:keyEdgeFlags="left" />
<Key
android:codes="@integer/key_settings"
android:keyIcon="@drawable/sym_keyboard_settings"
android:iconPreview="@drawable/sym_keyboard_feedback_settings"
android:isModifier="true" /> android:isModifier="true" />
<Key <Key
android:keyLabel="\@" android:keyLabel="\@"
@ -285,7 +458,8 @@
android:keyEdgeFlags="right" /> android:keyEdgeFlags="right" />
</Row> </Row>
<Row <Row
android:keyboardMode="@+id/mode_im" android:keyboardMode="@+id/mode_im_with_settings_key"
android:keyWidth="10%p"
android:rowEdgeFlags="bottom" android:rowEdgeFlags="bottom"
> >
<Key <Key
@ -298,13 +472,11 @@
android:codes="@integer/key_settings" android:codes="@integer/key_settings"
android:keyIcon="@drawable/sym_keyboard_settings" android:keyIcon="@drawable/sym_keyboard_settings"
android:iconPreview="@drawable/sym_keyboard_feedback_settings" android:iconPreview="@drawable/sym_keyboard_feedback_settings"
android:keyWidth="10%p"
android:isModifier="true" /> android:isModifier="true" />
<Key <Key
android:codes="@integer/key_f1" android:codes="@integer/key_f1"
android:keyIcon="@drawable/sym_keyboard_mic" android:keyIcon="@drawable/sym_keyboard_mic"
android:iconPreview="@drawable/sym_keyboard_feedback_mic" android:iconPreview="@drawable/sym_keyboard_feedback_mic"
android:keyWidth="10%p"
android:isModifier="true" /> android:isModifier="true" />
<Key <Key
android:codes="@integer/key_space" android:codes="@integer/key_space"
@ -316,7 +488,6 @@
<Key <Key
android:keyLabel="." android:keyLabel="."
android:popupKeyboard="@xml/popup_punctuation" android:popupKeyboard="@xml/popup_punctuation"
android:keyWidth="10%p"
android:isModifier="true" /> android:isModifier="true" />
<Key <Key
android:keyLabel=":-)" android:keyLabel=":-)"
@ -327,7 +498,8 @@
android:keyEdgeFlags="right" /> android:keyEdgeFlags="right" />
</Row> </Row>
<Row <Row
android:keyboardMode="@+id/mode_webentry" android:keyboardMode="@+id/mode_webentry_with_settings_key"
android:keyWidth="10%p"
android:rowEdgeFlags="bottom" android:rowEdgeFlags="bottom"
> >
<Key <Key
@ -340,13 +512,11 @@
android:codes="@integer/key_settings" android:codes="@integer/key_settings"
android:keyIcon="@drawable/sym_keyboard_settings" android:keyIcon="@drawable/sym_keyboard_settings"
android:iconPreview="@drawable/sym_keyboard_feedback_settings" android:iconPreview="@drawable/sym_keyboard_feedback_settings"
android:keyWidth="10%p"
android:isModifier="true" /> android:isModifier="true" />
<Key <Key
android:codes="@integer/key_f1" android:codes="@integer/key_f1"
android:keyIcon="@drawable/sym_keyboard_mic" android:keyIcon="@drawable/sym_keyboard_mic"
android:iconPreview="@drawable/sym_keyboard_feedback_mic" android:iconPreview="@drawable/sym_keyboard_feedback_mic"
android:keyWidth="10%p"
android:isModifier="true" /> android:isModifier="true" />
<Key <Key
android:codes="@integer/key_space" android:codes="@integer/key_space"
@ -359,12 +529,10 @@
android:codes="@integer/key_tab" android:codes="@integer/key_tab"
android:keyIcon="@drawable/sym_keyboard_tab" android:keyIcon="@drawable/sym_keyboard_tab"
android:iconPreview="@drawable/sym_keyboard_feedback_tab" android:iconPreview="@drawable/sym_keyboard_feedback_tab"
android:keyWidth="10%p"
android:isModifier="true" /> android:isModifier="true" />
<Key <Key
android:keyLabel="." android:keyLabel="."
android:popupKeyboard="@xml/popup_punctuation" android:popupKeyboard="@xml/popup_punctuation"
android:keyWidth="10%p"
android:isModifier="true" /> android:isModifier="true" />
<Key <Key
android:codes="@integer/key_return" android:codes="@integer/key_return"

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

@ -166,42 +166,158 @@
</Row> </Row>
<Row <Row
android:keyboardMode="@+id/mode_normal" android:keyboardMode="@+id/mode_normal"
android:keyWidth="10%p"
android:rowEdgeFlags="bottom" android:rowEdgeFlags="bottom"
> >
<Key <Key
android:codes="@integer/key_symbol" android:codes="@integer/key_symbol"
android:keyLabel="@string/label_symbol_key" android:keyLabel="@string/label_symbol_key"
android:keyWidth="15%p" android:keyWidth="20%p"
android:keyEdgeFlags="left" /> android:keyEdgeFlags="left" />
<Key
android:codes="@integer/key_settings"
android:keyIcon="@drawable/sym_bkeyboard_settings"
android:iconPreview="@drawable/sym_keyboard_feedback_settings"
android:keyWidth="10%p" />
<Key <Key
android:codes="@integer/key_f1" android:codes="@integer/key_f1"
android:keyIcon="@drawable/sym_bkeyboard_mic" android:keyIcon="@drawable/sym_bkeyboard_mic"
android:iconPreview="@drawable/sym_keyboard_feedback_mic" android:iconPreview="@drawable/sym_keyboard_feedback_mic" />
android:keyWidth="10%p" />
<Key <Key
android:codes="@integer/key_space" android:codes="@integer/key_space"
android:keyIcon="@drawable/sym_bkeyboard_space" android:keyIcon="@drawable/sym_bkeyboard_space"
android:iconPreview="@drawable/sym_keyboard_feedback_space" android:iconPreview="@drawable/sym_keyboard_feedback_space"
android:keyWidth="30%p" android:keyWidth="40%p"
android:isRepeatable="true" /> android:isRepeatable="true" />
<Key <Key
android:keyLabel="." android:keyLabel="."
android:popupKeyboard="@xml/popup_punctuation" android:popupKeyboard="@xml/popup_punctuation" />
android:keyWidth="10%p" />
<Key <Key
android:codes="@integer/key_return" android:codes="@integer/key_return"
android:keyIcon="@drawable/sym_bkeyboard_return" android:keyIcon="@drawable/sym_bkeyboard_return"
android:iconPreview="@drawable/sym_keyboard_feedback_return" android:iconPreview="@drawable/sym_keyboard_feedback_return"
android:keyWidth="25%p" android:keyWidth="20%p"
android:keyEdgeFlags="right" /> android:keyEdgeFlags="right" />
</Row> </Row>
<Row <Row
android:keyboardMode="@+id/mode_url" android:keyboardMode="@+id/mode_url"
android:keyWidth="10%p"
android:rowEdgeFlags="bottom"
>
<Key
android:codes="@integer/key_symbol"
android:keyLabel="@string/label_symbol_key"
android:keyWidth="20%p"
android:keyEdgeFlags="left" />
<Key
android:keyLabel="/" />
<Key
android:codes="@integer/key_space"
android:keyIcon="@drawable/sym_bkeyboard_space"
android:iconPreview="@drawable/sym_keyboard_feedback_space"
android:keyWidth="40%p"
android:isRepeatable="true" />
<Key
android:keyLabel="."
android:popupKeyboard="@xml/popup_punctuation" />
<Key
android:codes="@integer/key_return"
android:keyIcon="@drawable/sym_bkeyboard_return"
android:iconPreview="@drawable/sym_keyboard_feedback_return"
android:keyWidth="20%p"
android:keyEdgeFlags="right" />
</Row>
<Row
android:keyboardMode="@+id/mode_email"
android:keyWidth="10%p"
android:rowEdgeFlags="bottom"
>
<Key
android:codes="@integer/key_symbol"
android:keyLabel="@string/label_symbol_key"
android:keyWidth="20%p"
android:keyEdgeFlags="left" />
<Key
android:keyLabel="\@" />
<Key
android:codes="@integer/key_space"
android:keyIcon="@drawable/sym_bkeyboard_space"
android:iconPreview="@drawable/sym_keyboard_feedback_space"
android:keyWidth="40%p"
android:isRepeatable="true" />
<Key
android:keyLabel="."
android:popupKeyboard="@xml/popup_punctuation" />
<Key
android:codes="@integer/key_return"
android:keyIcon="@drawable/sym_bkeyboard_return"
android:iconPreview="@drawable/sym_keyboard_feedback_return"
android:keyWidth="20%p"
android:keyEdgeFlags="right" />
</Row>
<Row
android:keyboardMode="@+id/mode_im"
android:keyWidth="10%p"
android:rowEdgeFlags="bottom"
>
<Key
android:codes="@integer/key_symbol"
android:keyLabel="@string/label_symbol_key"
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" />
<Key
android:codes="@integer/key_space"
android:keyIcon="@drawable/sym_bkeyboard_space"
android:iconPreview="@drawable/sym_keyboard_feedback_space"
android:keyWidth="40%p"
android:isRepeatable="true" />
<Key
android:keyLabel="."
android:popupKeyboard="@xml/popup_punctuation" />
<Key
android:keyLabel=":-)"
android:keyOutputText=":-) "
android:popupKeyboard="@xml/popup_smileys"
android:keyWidth="20%p"
android:keyEdgeFlags="right" />
</Row>
<Row
android:keyboardMode="@+id/mode_webentry"
android:keyWidth="10%p"
android:rowEdgeFlags="bottom"
>
<Key
android:codes="@integer/key_symbol"
android:keyLabel="@string/label_symbol_key"
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" />
<Key
android:codes="@integer/key_space"
android:keyIcon="@drawable/sym_bkeyboard_space"
android:iconPreview="@drawable/sym_keyboard_feedback_space"
android:keyWidth="20%p"
android:isRepeatable="true" />
<Key
android:codes="@integer/key_tab"
android:keyIcon="@drawable/sym_bkeyboard_tab"
android:iconPreview="@drawable/sym_keyboard_feedback_tab"
android:keyWidth="20%p" />
<Key
android:keyLabel="."
android:popupKeyboard="@xml/popup_punctuation" />
<Key
android:codes="@integer/key_return"
android:keyIcon="@drawable/sym_bkeyboard_return"
android:iconPreview="@drawable/sym_keyboard_feedback_return"
android:keyWidth="20%p"
android:keyEdgeFlags="right" />
</Row>
<Row
android:keyboardMode="@+id/mode_normal_with_settings_key"
android:keyWidth="10%p"
android:rowEdgeFlags="bottom" android:rowEdgeFlags="bottom"
> >
<Key <Key
@ -212,11 +328,11 @@
<Key <Key
android:codes="@integer/key_settings" android:codes="@integer/key_settings"
android:keyIcon="@drawable/sym_bkeyboard_settings" android:keyIcon="@drawable/sym_bkeyboard_settings"
android:iconPreview="@drawable/sym_keyboard_feedback_settings" android:iconPreview="@drawable/sym_keyboard_feedback_settings" />
android:keyWidth="10%p" />
<Key <Key
android:keyLabel="/" android:codes="@integer/key_f1"
android:keyWidth="10%p" /> android:keyIcon="@drawable/sym_bkeyboard_mic"
android:iconPreview="@drawable/sym_keyboard_feedback_mic" />
<Key <Key
android:codes="@integer/key_space" android:codes="@integer/key_space"
android:keyIcon="@drawable/sym_bkeyboard_space" android:keyIcon="@drawable/sym_bkeyboard_space"
@ -225,8 +341,7 @@
android:isRepeatable="true" /> android:isRepeatable="true" />
<Key <Key
android:keyLabel="." android:keyLabel="."
android:popupKeyboard="@xml/popup_punctuation" android:popupKeyboard="@xml/popup_punctuation" />
android:keyWidth="10%p" />
<Key <Key
android:codes="@integer/key_return" android:codes="@integer/key_return"
android:keyIcon="@drawable/sym_bkeyboard_return" android:keyIcon="@drawable/sym_bkeyboard_return"
@ -235,7 +350,8 @@
android:keyEdgeFlags="right" /> android:keyEdgeFlags="right" />
</Row> </Row>
<Row <Row
android:keyboardMode="@+id/mode_email" android:keyboardMode="@+id/mode_url_with_settings_key"
android:keyWidth="10%p"
android:rowEdgeFlags="bottom" android:rowEdgeFlags="bottom"
> >
<Key <Key
@ -246,8 +362,39 @@
<Key <Key
android:codes="@integer/key_settings" android:codes="@integer/key_settings"
android:keyIcon="@drawable/sym_bkeyboard_settings" android:keyIcon="@drawable/sym_bkeyboard_settings"
android:iconPreview="@drawable/sym_keyboard_feedback_settings" android:iconPreview="@drawable/sym_keyboard_feedback_settings" />
android:keyWidth="10%p" /> <Key
android:keyLabel="/" />
<Key
android:codes="@integer/key_space"
android:keyIcon="@drawable/sym_bkeyboard_space"
android:iconPreview="@drawable/sym_keyboard_feedback_space"
android:keyWidth="30%p"
android:isRepeatable="true" />
<Key
android:keyLabel="."
android:popupKeyboard="@xml/popup_punctuation" />
<Key
android:codes="@integer/key_return"
android:keyIcon="@drawable/sym_bkeyboard_return"
android:iconPreview="@drawable/sym_keyboard_feedback_return"
android:keyWidth="25%p"
android:keyEdgeFlags="right" />
</Row>
<Row
android:keyboardMode="@+id/mode_email_with_settings_key"
android:keyWidth="10%p"
android:rowEdgeFlags="bottom"
>
<Key
android:codes="@integer/key_symbol"
android:keyLabel="@string/label_symbol_key"
android:keyWidth="15%p"
android:keyEdgeFlags="left" />
<Key
android:codes="@integer/key_settings"
android:keyIcon="@drawable/sym_bkeyboard_settings"
android:iconPreview="@drawable/sym_keyboard_feedback_settings" />
<Key <Key
android:keyLabel="\@" /> android:keyLabel="\@" />
<Key <Key
@ -267,7 +414,8 @@
android:keyEdgeFlags="right" /> android:keyEdgeFlags="right" />
</Row> </Row>
<Row <Row
android:keyboardMode="@+id/mode_im" android:keyboardMode="@+id/mode_im_with_settings_key"
android:keyWidth="10%p"
android:rowEdgeFlags="bottom" android:rowEdgeFlags="bottom"
> >
<Key <Key
@ -278,13 +426,11 @@
<Key <Key
android:codes="@integer/key_settings" android:codes="@integer/key_settings"
android:keyIcon="@drawable/sym_bkeyboard_settings" android:keyIcon="@drawable/sym_bkeyboard_settings"
android:iconPreview="@drawable/sym_keyboard_feedback_settings" android:iconPreview="@drawable/sym_keyboard_feedback_settings" />
android:keyWidth="10%p" />
<Key <Key
android:codes="@integer/key_f1" android:codes="@integer/key_f1"
android:keyIcon="@drawable/sym_bkeyboard_mic" android:keyIcon="@drawable/sym_bkeyboard_mic"
android:iconPreview="@drawable/sym_keyboard_feedback_mic" android:iconPreview="@drawable/sym_keyboard_feedback_mic" />
android:keyWidth="10%p" />
<Key <Key
android:codes="@integer/key_space" android:codes="@integer/key_space"
android:keyIcon="@drawable/sym_bkeyboard_space" android:keyIcon="@drawable/sym_bkeyboard_space"
@ -293,8 +439,7 @@
android:isRepeatable="true" /> android:isRepeatable="true" />
<Key <Key
android:keyLabel="." android:keyLabel="."
android:popupKeyboard="@xml/popup_punctuation" android:popupKeyboard="@xml/popup_punctuation" />
android:keyWidth="10%p" />
<Key <Key
android:keyLabel=":-)" android:keyLabel=":-)"
android:keyOutputText=":-) " android:keyOutputText=":-) "
@ -303,7 +448,8 @@
android:keyEdgeFlags="right" /> android:keyEdgeFlags="right" />
</Row> </Row>
<Row <Row
android:keyboardMode="@+id/mode_webentry" android:keyboardMode="@+id/mode_webentry_with_settings_key"
android:keyWidth="10%p"
android:rowEdgeFlags="bottom" android:rowEdgeFlags="bottom"
> >
<Key <Key
@ -314,13 +460,11 @@
<Key <Key
android:codes="@integer/key_settings" android:codes="@integer/key_settings"
android:keyIcon="@drawable/sym_bkeyboard_settings" android:keyIcon="@drawable/sym_bkeyboard_settings"
android:iconPreview="@drawable/sym_keyboard_feedback_settings" android:iconPreview="@drawable/sym_keyboard_feedback_settings" />
android:keyWidth="10%p" />
<Key <Key
android:codes="@integer/key_f1" android:codes="@integer/key_f1"
android:keyIcon="@drawable/sym_bkeyboard_mic" android:keyIcon="@drawable/sym_bkeyboard_mic"
android:iconPreview="@drawable/sym_keyboard_feedback_mic" android:iconPreview="@drawable/sym_keyboard_feedback_mic" />
android:keyWidth="10%p" />
<Key <Key
android:codes="@integer/key_space" android:codes="@integer/key_space"
android:keyIcon="@drawable/sym_bkeyboard_space" android:keyIcon="@drawable/sym_bkeyboard_space"
@ -330,12 +474,10 @@
<Key <Key
android:codes="@integer/key_tab" android:codes="@integer/key_tab"
android:keyIcon="@drawable/sym_bkeyboard_tab" android:keyIcon="@drawable/sym_bkeyboard_tab"
android:iconPreview="@drawable/sym_keyboard_feedback_tab" android:iconPreview="@drawable/sym_keyboard_feedback_tab" />
android:keyWidth="10%p" />
<Key <Key
android:keyLabel="." android:keyLabel="."
android:popupKeyboard="@xml/popup_punctuation" android:popupKeyboard="@xml/popup_punctuation" />
android:keyWidth="10%p" />
<Key <Key
android:codes="@integer/key_return" android:codes="@integer/key_return"
android:keyIcon="@drawable/sym_bkeyboard_return" android:keyIcon="@drawable/sym_bkeyboard_return"

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

@ -149,38 +149,30 @@
<Key <Key
android:codes="@integer/key_symbol" android:codes="@integer/key_symbol"
android:keyLabel="@string/label_symbol_key" android:keyLabel="@string/label_symbol_key"
android:keyWidth="15%p" android:keyWidth="20%p"
android:isModifier="true" android:isModifier="true"
android:keyEdgeFlags="left" /> android:keyEdgeFlags="left" />
<Key
android:codes="@integer/key_settings"
android:keyIcon="@drawable/sym_keyboard_settings"
android:iconPreview="@drawable/sym_keyboard_feedback_settings"
android:keyWidth="10%p"
android:isModifier="true" />
<Key <Key
android:codes="@integer/key_f1" android:codes="@integer/key_f1"
android:keyIcon="@drawable/sym_keyboard_mic" android:keyIcon="@drawable/sym_keyboard_mic"
android:iconPreview="@drawable/sym_keyboard_feedback_mic" android:iconPreview="@drawable/sym_keyboard_feedback_mic"
android:keyWidth="10%p"
android:isModifier="true" /> android:isModifier="true" />
<Key <Key
android:codes="@integer/key_space" android:codes="@integer/key_space"
android:keyIcon="@drawable/sym_keyboard_space" android:keyIcon="@drawable/sym_keyboard_space"
android:iconPreview="@drawable/sym_keyboard_feedback_space" android:iconPreview="@drawable/sym_keyboard_feedback_space"
android:keyWidth="30%p" android:keyWidth="40%p"
android:isModifier="true" android:isModifier="true"
android:isRepeatable="true" /> android:isRepeatable="true" />
<Key <Key
android:keyLabel="." android:keyLabel="."
android:popupKeyboard="@xml/popup_punctuation" android:popupKeyboard="@xml/popup_punctuation"
android:keyWidth="10%p"
android:isModifier="true" /> android:isModifier="true" />
<Key <Key
android:codes="@integer/key_return" android:codes="@integer/key_return"
android:keyIcon="@drawable/sym_keyboard_return" android:keyIcon="@drawable/sym_keyboard_return"
android:iconPreview="@drawable/sym_keyboard_feedback_return" android:iconPreview="@drawable/sym_keyboard_feedback_return"
android:keyWidth="25%p" android:keyWidth="20%p"
android:isModifier="true" android:isModifier="true"
android:keyEdgeFlags="right" /> android:keyEdgeFlags="right" />
</Row> </Row>
@ -191,42 +183,216 @@
<Key <Key
android:codes="@integer/key_symbol" android:codes="@integer/key_symbol"
android:keyLabel="@string/label_symbol_key" android:keyLabel="@string/label_symbol_key"
android:keyWidth="15%p" android:keyWidth="20%p"
android:isModifier="true" android:isModifier="true"
android:keyEdgeFlags="left" /> android:keyEdgeFlags="left" />
<Key
android:codes="@integer/key_settings"
android:keyIcon="@drawable/sym_keyboard_settings"
android:iconPreview="@drawable/sym_keyboard_feedback_settings"
android:keyWidth="10%p"
android:isModifier="true" />
<Key <Key
android:keyLabel="/" android:keyLabel="/"
android:keyWidth="10%p"
android:isModifier="true" /> android:isModifier="true" />
<Key <Key
android:codes="@integer/key_space" android:codes="@integer/key_space"
android:keyIcon="@drawable/sym_keyboard_space" android:keyIcon="@drawable/sym_keyboard_space"
android:iconPreview="@drawable/sym_keyboard_feedback_space" android:iconPreview="@drawable/sym_keyboard_feedback_space"
android:keyWidth="30%p" android:keyWidth="40%p"
android:isModifier="true" android:isModifier="true"
android:isRepeatable="true" /> android:isRepeatable="true" />
<Key <Key
android:keyLabel="." android:keyLabel="."
android:popupKeyboard="@xml/popup_punctuation" android:popupKeyboard="@xml/popup_punctuation"
android:keyWidth="10%p"
android:isModifier="true" /> android:isModifier="true" />
<Key <Key
android:codes="@integer/key_return" android:codes="@integer/key_return"
android:keyIcon="@drawable/sym_keyboard_return" android:keyIcon="@drawable/sym_keyboard_return"
android:iconPreview="@drawable/sym_keyboard_feedback_return" android:iconPreview="@drawable/sym_keyboard_feedback_return"
android:keyWidth="25%p" android:keyWidth="20%p"
android:isModifier="true" android:isModifier="true"
android:keyEdgeFlags="right" /> android:keyEdgeFlags="right" />
</Row> </Row>
<Row <Row
android:keyboardMode="@+id/mode_email" android:keyboardMode="@+id/mode_email"
android:rowEdgeFlags="bottom" android:rowEdgeFlags="bottom"
>
<Key
android:codes="@integer/key_symbol"
android:keyLabel="@string/label_symbol_key"
android:keyWidth="20%p"
android:isModifier="true"
android:keyEdgeFlags="left" />
<Key
android:keyLabel="\@"
android:isModifier="true" />
<Key
android:codes="@integer/key_space"
android:keyIcon="@drawable/sym_keyboard_space"
android:iconPreview="@drawable/sym_keyboard_feedback_space"
android:keyWidth="40%p"
android:isModifier="true"
android:isRepeatable="true" />
<Key
android:keyLabel="."
android:popupKeyboard="@xml/popup_punctuation"
android:isModifier="true" />
<Key
android:codes="@integer/key_return"
android:keyIcon="@drawable/sym_keyboard_return"
android:iconPreview="@drawable/sym_keyboard_feedback_return"
android:keyWidth="20%p"
android:isModifier="true"
android:keyEdgeFlags="right" />
</Row>
<Row
android:keyboardMode="@+id/mode_im"
android:rowEdgeFlags="bottom"
>
<Key
android:codes="@integer/key_symbol"
android:keyLabel="@string/label_symbol_key"
android:keyWidth="20%p"
android:isModifier="true"
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"
android:keyIcon="@drawable/sym_keyboard_space"
android:iconPreview="@drawable/sym_keyboard_feedback_space"
android:keyWidth="40%p"
android:isModifier="true"
android:isRepeatable="true" />
<Key
android:keyLabel="."
android:popupKeyboard="@xml/popup_punctuation"
android:isModifier="true" />
<Key
android:keyLabel=":-)"
android:keyOutputText=":-) "
android:popupKeyboard="@xml/popup_smileys"
android:keyWidth="20%p"
android:isModifier="true"
android:keyEdgeFlags="right" />
</Row>
<Row
android:keyboardMode="@+id/mode_webentry"
android:rowEdgeFlags="bottom"
>
<Key
android:codes="@integer/key_symbol"
android:keyLabel="@string/label_symbol_key"
android:keyWidth="20%p"
android:isModifier="true"
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"
android:keyIcon="@drawable/sym_keyboard_space"
android:iconPreview="@drawable/sym_keyboard_feedback_space"
android:keyWidth="20%p"
android:isModifier="true"
android:isRepeatable="true" />
<Key
android:codes="@integer/key_tab"
android:keyIcon="@drawable/sym_keyboard_tab"
android:iconPreview="@drawable/sym_keyboard_feedback_tab"
android:keyWidth="20%p"
android:isModifier="true" />
<Key
android:keyLabel="."
android:popupKeyboard="@xml/popup_punctuation"
android:isModifier="true" />
<Key
android:codes="@integer/key_return"
android:keyIcon="@drawable/sym_keyboard_return"
android:iconPreview="@drawable/sym_keyboard_feedback_return"
android:keyWidth="20%p"
android:isModifier="true"
android:keyEdgeFlags="right" />
</Row>
<Row
android:keyboardMode="@+id/mode_normal_with_settings_key"
android:rowEdgeFlags="bottom"
>
<Key
android:codes="@integer/key_symbol"
android:keyLabel="@string/label_symbol_key"
android:keyWidth="15%p"
android:isModifier="true"
android:keyEdgeFlags="left" />
<Key
android:codes="@integer/key_settings"
android:keyIcon="@drawable/sym_keyboard_settings"
android:iconPreview="@drawable/sym_keyboard_feedback_settings"
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"
android:keyIcon="@drawable/sym_keyboard_space"
android:iconPreview="@drawable/sym_keyboard_feedback_space"
android:keyWidth="30%p"
android:isModifier="true"
android:isRepeatable="true" />
<Key
android:keyLabel="."
android:popupKeyboard="@xml/popup_punctuation"
android:isModifier="true" />
<Key
android:codes="@integer/key_return"
android:keyIcon="@drawable/sym_keyboard_return"
android:iconPreview="@drawable/sym_keyboard_feedback_return"
android:keyWidth="25%p"
android:isModifier="true"
android:keyEdgeFlags="right" />
</Row>
<Row
android:keyboardMode="@+id/mode_url_with_settings_key"
android:rowEdgeFlags="bottom"
>
<Key
android:codes="@integer/key_symbol"
android:keyLabel="@string/label_symbol_key"
android:keyWidth="15%p"
android:isModifier="true"
android:keyEdgeFlags="left" />
<Key
android:codes="@integer/key_settings"
android:keyIcon="@drawable/sym_keyboard_settings"
android:iconPreview="@drawable/sym_keyboard_feedback_settings"
android:isModifier="true" />
<Key
android:keyLabel="/"
android:isModifier="true" />
<Key
android:codes="@integer/key_space"
android:keyIcon="@drawable/sym_keyboard_space"
android:iconPreview="@drawable/sym_keyboard_feedback_space"
android:keyWidth="30%p"
android:isModifier="true"
android:isRepeatable="true" />
<Key
android:keyLabel="."
android:popupKeyboard="@xml/popup_punctuation"
android:isModifier="true" />
<Key
android:codes="@integer/key_return"
android:keyIcon="@drawable/sym_keyboard_return"
android:iconPreview="@drawable/sym_keyboard_feedback_return"
android:keyWidth="25%p"
android:isModifier="true"
android:keyEdgeFlags="right" />
</Row>
<Row
android:keyboardMode="@+id/mode_email_with_settings_key"
android:rowEdgeFlags="bottom"
> >
<Key <Key
android:codes="@integer/key_symbol" android:codes="@integer/key_symbol"
@ -238,7 +404,6 @@
android:codes="@integer/key_settings" android:codes="@integer/key_settings"
android:keyIcon="@drawable/sym_keyboard_settings" android:keyIcon="@drawable/sym_keyboard_settings"
android:iconPreview="@drawable/sym_keyboard_feedback_settings" android:iconPreview="@drawable/sym_keyboard_feedback_settings"
android:keyWidth="10%p"
android:isModifier="true" /> android:isModifier="true" />
<Key <Key
android:keyLabel="\@" android:keyLabel="\@"
@ -263,7 +428,7 @@
android:keyEdgeFlags="right" /> android:keyEdgeFlags="right" />
</Row> </Row>
<Row <Row
android:keyboardMode="@+id/mode_im" android:keyboardMode="@+id/mode_im_with_settings_key"
android:rowEdgeFlags="bottom" android:rowEdgeFlags="bottom"
> >
<Key <Key
@ -276,13 +441,11 @@
android:codes="@integer/key_settings" android:codes="@integer/key_settings"
android:keyIcon="@drawable/sym_keyboard_settings" android:keyIcon="@drawable/sym_keyboard_settings"
android:iconPreview="@drawable/sym_keyboard_feedback_settings" android:iconPreview="@drawable/sym_keyboard_feedback_settings"
android:keyWidth="10%p"
android:isModifier="true" /> android:isModifier="true" />
<Key <Key
android:codes="@integer/key_f1" android:codes="@integer/key_f1"
android:keyIcon="@drawable/sym_keyboard_mic" android:keyIcon="@drawable/sym_keyboard_mic"
android:iconPreview="@drawable/sym_keyboard_feedback_mic" android:iconPreview="@drawable/sym_keyboard_feedback_mic"
android:keyWidth="10%p"
android:isModifier="true" /> android:isModifier="true" />
<Key <Key
android:codes="@integer/key_space" android:codes="@integer/key_space"
@ -294,7 +457,6 @@
<Key <Key
android:keyLabel="." android:keyLabel="."
android:popupKeyboard="@xml/popup_punctuation" android:popupKeyboard="@xml/popup_punctuation"
android:keyWidth="10%p"
android:isModifier="true" /> android:isModifier="true" />
<Key <Key
android:keyLabel=":-)" android:keyLabel=":-)"
@ -305,7 +467,7 @@
android:keyEdgeFlags="right" /> android:keyEdgeFlags="right" />
</Row> </Row>
<Row <Row
android:keyboardMode="@+id/mode_webentry" android:keyboardMode="@+id/mode_webentry_with_settings_key"
android:rowEdgeFlags="bottom" android:rowEdgeFlags="bottom"
> >
<Key <Key
@ -318,13 +480,11 @@
android:codes="@integer/key_settings" android:codes="@integer/key_settings"
android:keyIcon="@drawable/sym_keyboard_settings" android:keyIcon="@drawable/sym_keyboard_settings"
android:iconPreview="@drawable/sym_keyboard_feedback_settings" android:iconPreview="@drawable/sym_keyboard_feedback_settings"
android:keyWidth="10%p"
android:isModifier="true" /> android:isModifier="true" />
<Key <Key
android:codes="@integer/key_f1" android:codes="@integer/key_f1"
android:keyIcon="@drawable/sym_keyboard_mic" android:keyIcon="@drawable/sym_keyboard_mic"
android:iconPreview="@drawable/sym_keyboard_feedback_mic" android:iconPreview="@drawable/sym_keyboard_feedback_mic"
android:keyWidth="10%p"
android:isModifier="true" /> android:isModifier="true" />
<Key <Key
android:codes="@integer/key_space" android:codes="@integer/key_space"
@ -337,12 +497,10 @@
android:codes="@integer/key_tab" android:codes="@integer/key_tab"
android:keyIcon="@drawable/sym_keyboard_tab" android:keyIcon="@drawable/sym_keyboard_tab"
android:iconPreview="@drawable/sym_keyboard_feedback_tab" android:iconPreview="@drawable/sym_keyboard_feedback_tab"
android:keyWidth="10%p"
android:isModifier="true" /> android:isModifier="true" />
<Key <Key
android:keyLabel="." android:keyLabel="."
android:popupKeyboard="@xml/popup_punctuation" android:popupKeyboard="@xml/popup_punctuation"
android:keyWidth="10%p"
android:isModifier="true" /> android:isModifier="true" />
<Key <Key
android:codes="@integer/key_return" android:codes="@integer/key_return"

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

@ -148,33 +148,26 @@
<Key <Key
android:codes="@integer/key_symbol" android:codes="@integer/key_symbol"
android:keyLabel="@string/label_symbol_key" android:keyLabel="@string/label_symbol_key"
android:keyWidth="15%p" android:keyWidth="20%p"
android:keyEdgeFlags="left" /> android:keyEdgeFlags="left" />
<Key
android:codes="@integer/key_settings"
android:keyIcon="@drawable/sym_bkeyboard_settings"
android:iconPreview="@drawable/sym_keyboard_feedback_settings"
android:keyWidth="10%p" />
<Key <Key
android:codes="@integer/key_f1" android:codes="@integer/key_f1"
android:keyIcon="@drawable/sym_bkeyboard_mic" android:keyIcon="@drawable/sym_bkeyboard_mic"
android:iconPreview="@drawable/sym_keyboard_feedback_mic" android:iconPreview="@drawable/sym_keyboard_feedback_mic" />
android:keyWidth="10%p" />
<Key <Key
android:codes="@integer/key_space" android:codes="@integer/key_space"
android:keyIcon="@drawable/sym_bkeyboard_space" android:keyIcon="@drawable/sym_bkeyboard_space"
android:iconPreview="@drawable/sym_keyboard_feedback_space" android:iconPreview="@drawable/sym_keyboard_feedback_space"
android:keyWidth="30%p" android:keyWidth="40%p"
android:isRepeatable="true" /> android:isRepeatable="true" />
<Key <Key
android:keyLabel="." android:keyLabel="."
android:popupKeyboard="@xml/popup_punctuation" android:popupKeyboard="@xml/popup_punctuation" />
android:keyWidth="10%p" />
<Key <Key
android:codes="@integer/key_return" android:codes="@integer/key_return"
android:keyIcon="@drawable/sym_bkeyboard_return" android:keyIcon="@drawable/sym_bkeyboard_return"
android:iconPreview="@drawable/sym_keyboard_feedback_return" android:iconPreview="@drawable/sym_keyboard_feedback_return"
android:keyWidth="25%p" android:keyWidth="20%p"
android:keyEdgeFlags="right" /> android:keyEdgeFlags="right" />
</Row> </Row>
<Row <Row
@ -184,36 +177,119 @@
<Key <Key
android:codes="@integer/key_symbol" android:codes="@integer/key_symbol"
android:keyLabel="@string/label_symbol_key" android:keyLabel="@string/label_symbol_key"
android:keyWidth="15%p" android:keyWidth="20%p"
android:keyEdgeFlags="left" /> android:keyEdgeFlags="left" />
<Key <Key
android:codes="@integer/key_settings" android:keyLabel="/" />
android:keyIcon="@drawable/sym_bkeyboard_settings"
android:iconPreview="@drawable/sym_keyboard_feedback_settings"
android:keyWidth="10%p" />
<Key
android:keyLabel="/"
android:keyWidth="10%p" />
<Key <Key
android:codes="@integer/key_space" android:codes="@integer/key_space"
android:keyIcon="@drawable/sym_bkeyboard_space" android:keyIcon="@drawable/sym_bkeyboard_space"
android:iconPreview="@drawable/sym_keyboard_feedback_space" android:iconPreview="@drawable/sym_keyboard_feedback_space"
android:keyWidth="30%p" android:keyWidth="40%p"
android:isRepeatable="true" /> android:isRepeatable="true" />
<Key <Key
android:keyLabel="." android:keyLabel="."
android:popupKeyboard="@xml/popup_punctuation" android:popupKeyboard="@xml/popup_punctuation" />
android:keyWidth="10%p" />
<Key <Key
android:codes="@integer/key_return" android:codes="@integer/key_return"
android:keyIcon="@drawable/sym_bkeyboard_return" android:keyIcon="@drawable/sym_bkeyboard_return"
android:iconPreview="@drawable/sym_keyboard_feedback_return" android:iconPreview="@drawable/sym_keyboard_feedback_return"
android:keyWidth="25%p" android:keyWidth="20%p"
android:keyEdgeFlags="right" /> android:keyEdgeFlags="right" />
</Row> </Row>
<Row <Row
android:keyboardMode="@+id/mode_email" android:keyboardMode="@+id/mode_email"
android:rowEdgeFlags="bottom" android:rowEdgeFlags="bottom"
>
<Key
android:codes="@integer/key_symbol"
android:keyLabel="@string/label_symbol_key"
android:keyWidth="20%p"
android:keyEdgeFlags="left" />
<Key
android:keyLabel="\@" />
<Key
android:codes="@integer/key_space"
android:keyIcon="@drawable/sym_bkeyboard_space"
android:iconPreview="@drawable/sym_keyboard_feedback_space"
android:keyWidth="40%p"
android:isRepeatable="true" />
<Key
android:keyLabel="."
android:popupKeyboard="@xml/popup_punctuation" />
<Key
android:codes="@integer/key_return"
android:keyIcon="@drawable/sym_bkeyboard_return"
android:iconPreview="@drawable/sym_keyboard_feedback_return"
android:keyWidth="20%p"
android:keyEdgeFlags="right" />
</Row>
<Row
android:keyboardMode="@+id/mode_im"
android:rowEdgeFlags="bottom"
>
<Key
android:codes="@integer/key_symbol"
android:keyLabel="@string/label_symbol_key"
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" />
<Key
android:codes="@integer/key_space"
android:keyIcon="@drawable/sym_bkeyboard_space"
android:iconPreview="@drawable/sym_keyboard_feedback_space"
android:keyWidth="40%p"
android:isRepeatable="true" />
<Key
android:keyLabel="."
android:popupKeyboard="@xml/popup_punctuation" />
<Key
android:keyLabel=":-)"
android:keyOutputText=":-) "
android:popupKeyboard="@xml/popup_smileys"
android:keyWidth="20%p"
android:keyEdgeFlags="right" />
</Row>
<Row
android:keyboardMode="@+id/mode_webentry"
android:rowEdgeFlags="bottom"
>
<Key
android:codes="@integer/key_symbol"
android:keyLabel="@string/label_symbol_key"
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" />
<Key
android:codes="@integer/key_space"
android:keyIcon="@drawable/sym_bkeyboard_space"
android:iconPreview="@drawable/sym_keyboard_feedback_space"
android:keyWidth="20%p"
android:isRepeatable="true" />
<Key
android:codes="@integer/key_tab"
android:keyIcon="@drawable/sym_bkeyboard_tab"
android:iconPreview="@drawable/sym_keyboard_feedback_tab"
android:keyWidth="20%p" />
<Key
android:keyLabel="."
android:popupKeyboard="@xml/popup_punctuation" />
<Key
android:codes="@integer/key_return"
android:keyIcon="@drawable/sym_bkeyboard_return"
android:iconPreview="@drawable/sym_keyboard_feedback_return"
android:keyWidth="20%p"
android:keyEdgeFlags="right" />
</Row>
<Row
android:keyboardMode="@+id/mode_normal_with_settings_key"
android:rowEdgeFlags="bottom"
> >
<Key <Key
android:codes="@integer/key_symbol" android:codes="@integer/key_symbol"
@ -223,8 +299,71 @@
<Key <Key
android:codes="@integer/key_settings" android:codes="@integer/key_settings"
android:keyIcon="@drawable/sym_bkeyboard_settings" android:keyIcon="@drawable/sym_bkeyboard_settings"
android:iconPreview="@drawable/sym_keyboard_feedback_settings" android:iconPreview="@drawable/sym_keyboard_feedback_settings" />
android:keyWidth="10%p" /> <Key
android:codes="@integer/key_f1"
android:keyIcon="@drawable/sym_bkeyboard_mic"
android:iconPreview="@drawable/sym_keyboard_feedback_mic" />
<Key
android:codes="@integer/key_space"
android:keyIcon="@drawable/sym_bkeyboard_space"
android:iconPreview="@drawable/sym_keyboard_feedback_space"
android:keyWidth="30%p"
android:isRepeatable="true" />
<Key
android:keyLabel="."
android:popupKeyboard="@xml/popup_punctuation" />
<Key
android:codes="@integer/key_return"
android:keyIcon="@drawable/sym_bkeyboard_return"
android:iconPreview="@drawable/sym_keyboard_feedback_return"
android:keyWidth="25%p"
android:keyEdgeFlags="right" />
</Row>
<Row
android:keyboardMode="@+id/mode_url_with_settings_key"
android:rowEdgeFlags="bottom"
>
<Key
android:codes="@integer/key_symbol"
android:keyLabel="@string/label_symbol_key"
android:keyWidth="15%p"
android:keyEdgeFlags="left" />
<Key
android:codes="@integer/key_settings"
android:keyIcon="@drawable/sym_bkeyboard_settings"
android:iconPreview="@drawable/sym_keyboard_feedback_settings" />
<Key
android:keyLabel="/" />
<Key
android:codes="@integer/key_space"
android:keyIcon="@drawable/sym_bkeyboard_space"
android:iconPreview="@drawable/sym_keyboard_feedback_space"
android:keyWidth="30%p"
android:isRepeatable="true" />
<Key
android:keyLabel="."
android:popupKeyboard="@xml/popup_punctuation" />
<Key
android:codes="@integer/key_return"
android:keyIcon="@drawable/sym_bkeyboard_return"
android:iconPreview="@drawable/sym_keyboard_feedback_return"
android:keyWidth="25%p"
android:keyEdgeFlags="right" />
</Row>
<Row
android:keyboardMode="@+id/mode_email_with_settings_key"
android:rowEdgeFlags="bottom"
>
<Key
android:codes="@integer/key_symbol"
android:keyLabel="@string/label_symbol_key"
android:keyWidth="15%p"
android:keyEdgeFlags="left" />
<Key
android:codes="@integer/key_settings"
android:keyIcon="@drawable/sym_bkeyboard_settings"
android:iconPreview="@drawable/sym_keyboard_feedback_settings" />
<Key <Key
android:keyLabel="\@" /> android:keyLabel="\@" />
<Key <Key
@ -244,7 +383,7 @@
android:keyEdgeFlags="right" /> android:keyEdgeFlags="right" />
</Row> </Row>
<Row <Row
android:keyboardMode="@+id/mode_im" android:keyboardMode="@+id/mode_im_with_settings_key"
android:rowEdgeFlags="bottom" android:rowEdgeFlags="bottom"
> >
<Key <Key
@ -255,13 +394,11 @@
<Key <Key
android:codes="@integer/key_settings" android:codes="@integer/key_settings"
android:keyIcon="@drawable/sym_bkeyboard_settings" android:keyIcon="@drawable/sym_bkeyboard_settings"
android:iconPreview="@drawable/sym_keyboard_feedback_settings" android:iconPreview="@drawable/sym_keyboard_feedback_settings" />
android:keyWidth="10%p" />
<Key <Key
android:codes="@integer/key_f1" android:codes="@integer/key_f1"
android:keyIcon="@drawable/sym_bkeyboard_mic" android:keyIcon="@drawable/sym_bkeyboard_mic"
android:iconPreview="@drawable/sym_keyboard_feedback_mic" android:iconPreview="@drawable/sym_keyboard_feedback_mic" />
android:keyWidth="10%p" />
<Key <Key
android:codes="@integer/key_space" android:codes="@integer/key_space"
android:keyIcon="@drawable/sym_bkeyboard_space" android:keyIcon="@drawable/sym_bkeyboard_space"
@ -270,8 +407,7 @@
android:isRepeatable="true" /> android:isRepeatable="true" />
<Key <Key
android:keyLabel="." android:keyLabel="."
android:popupKeyboard="@xml/popup_punctuation" android:popupKeyboard="@xml/popup_punctuation" />
android:keyWidth="10%p" />
<Key <Key
android:keyLabel=":-)" android:keyLabel=":-)"
android:keyOutputText=":-) " android:keyOutputText=":-) "
@ -280,7 +416,7 @@
android:keyEdgeFlags="right" /> android:keyEdgeFlags="right" />
</Row> </Row>
<Row <Row
android:keyboardMode="@+id/mode_webentry" android:keyboardMode="@+id/mode_webentry_with_settings_key"
android:rowEdgeFlags="bottom" android:rowEdgeFlags="bottom"
> >
<Key <Key
@ -291,13 +427,11 @@
<Key <Key
android:codes="@integer/key_settings" android:codes="@integer/key_settings"
android:keyIcon="@drawable/sym_bkeyboard_settings" android:keyIcon="@drawable/sym_bkeyboard_settings"
android:iconPreview="@drawable/sym_keyboard_feedback_settings" android:iconPreview="@drawable/sym_keyboard_feedback_settings" />
android:keyWidth="10%p" />
<Key <Key
android:codes="@integer/key_f1" android:codes="@integer/key_f1"
android:keyIcon="@drawable/sym_bkeyboard_mic" android:keyIcon="@drawable/sym_bkeyboard_mic"
android:iconPreview="@drawable/sym_keyboard_feedback_mic" android:iconPreview="@drawable/sym_keyboard_feedback_mic" />
android:keyWidth="10%p" />
<Key <Key
android:codes="@integer/key_space" android:codes="@integer/key_space"
android:keyIcon="@drawable/sym_bkeyboard_space" android:keyIcon="@drawable/sym_bkeyboard_space"
@ -307,12 +441,10 @@
<Key <Key
android:codes="@integer/key_tab" android:codes="@integer/key_tab"
android:keyIcon="@drawable/sym_bkeyboard_tab" android:keyIcon="@drawable/sym_bkeyboard_tab"
android:iconPreview="@drawable/sym_keyboard_feedback_tab" android:iconPreview="@drawable/sym_keyboard_feedback_tab" />
android:keyWidth="10%p" />
<Key <Key
android:keyLabel="." android:keyLabel="."
android:popupKeyboard="@xml/popup_punctuation" android:popupKeyboard="@xml/popup_punctuation" />
android:keyWidth="10%p" />
<Key <Key
android:codes="@integer/key_return" android:codes="@integer/key_return"
android:keyIcon="@drawable/sym_bkeyboard_return" android:keyIcon="@drawable/sym_bkeyboard_return"

30
java/res/xml/kbd_symbols.xml
View File

@ -121,20 +121,40 @@
android:isRepeatable="true" android:isModifier="true"/> android:isRepeatable="true" android:isModifier="true"/>
</Row> </Row>
<Row android:rowEdgeFlags="bottom"> <Row
android:keyboardMode="@+id/mode_symbols"
android:rowEdgeFlags="bottom"
>
<Key android:codes="-2" android:keyLabel="@string/label_alpha_key"
android:keyWidth="20%p" android:keyEdgeFlags="left" android:isModifier="true"/>
<Key android:codes="@integer/key_f1" android:isModifier="true"/>
<Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space"
android:keyWidth="40%p"
android:iconPreview="@drawable/sym_keyboard_feedback_space"
android:isRepeatable="true" android:isModifier="true"/>
<Key android:codes="46" android:keyLabel="."
android:popupKeyboard="@xml/popup_punctuation" android:isModifier="true"/>
<Key android:codes="10" android:keyIcon="@drawable/sym_keyboard_return" android:keyWidth="20%p" android:keyEdgeFlags="right"
android:iconPreview="@drawable/sym_keyboard_feedback_return"
android:isModifier="true"/>
</Row>
<Row
android:keyboardMode="@+id/mode_symbols_with_settings_key"
android:rowEdgeFlags="bottom"
>
<Key android:codes="-2" android:keyLabel="@string/label_alpha_key" <Key android:codes="-2" android:keyLabel="@string/label_alpha_key"
android:keyWidth="15%p" android:keyEdgeFlags="left" android:isModifier="true"/> android:keyWidth="15%p" android:keyEdgeFlags="left" android:isModifier="true"/>
<Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings" <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings"
android:iconPreview="@drawable/sym_keyboard_feedback_settings" android:iconPreview="@drawable/sym_keyboard_feedback_settings"
android:keyWidth="10%p" android:isModifier="true"/> android:isModifier="true"/>
<Key android:codes="@integer/key_f1" android:keyWidth="10%p" android:isModifier="true"/> <Key android:codes="@integer/key_f1" android:isModifier="true"/>
<Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space" <Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space"
android:keyWidth="30%p" android:keyWidth="30%p"
android:iconPreview="@drawable/sym_keyboard_feedback_space" android:iconPreview="@drawable/sym_keyboard_feedback_space"
android:isRepeatable="true" android:isModifier="true"/> android:isRepeatable="true" android:isModifier="true"/>
<Key android:codes="46" android:keyLabel="." <Key android:codes="46" android:keyLabel="."
android:popupKeyboard="@xml/popup_punctuation" android:popupKeyboard="@xml/popup_punctuation" android:isModifier="true"/>
android:keyWidth="10%p" android:isModifier="true"/>
<Key android:codes="10" android:keyIcon="@drawable/sym_keyboard_return" android:keyWidth="25%p" android:keyEdgeFlags="right" <Key android:codes="10" android:keyIcon="@drawable/sym_keyboard_return" android:keyWidth="25%p" android:keyEdgeFlags="right"
android:iconPreview="@drawable/sym_keyboard_feedback_return" android:iconPreview="@drawable/sym_keyboard_feedback_return"
android:isModifier="true"/> android:isModifier="true"/>

33
java/res/xml/kbd_symbols_black.xml
View File

@ -121,22 +121,39 @@
android:isRepeatable="true"/> android:isRepeatable="true"/>
</Row> </Row>
<Row android:rowEdgeFlags="bottom"> <Row
android:keyboardMode="@+id/mode_symbols"
android:rowEdgeFlags="bottom"
>
<Key android:codes="-2" android:keyLabel="@string/label_alpha_key"
android:keyWidth="20%p" android:keyEdgeFlags="left"/>
<Key android:codes="@integer/key_f1"/>
<Key android:codes="32" android:keyIcon="@drawable/sym_bkeyboard_space"
android:keyWidth="40%p"
android:iconPreview="@drawable/sym_keyboard_feedback_space"
android:isRepeatable="true"/>
<Key android:codes="46" android:keyLabel="."
android:popupKeyboard="@xml/popup_punctuation"/>
<Key android:codes="10" android:keyIcon="@drawable/sym_bkeyboard_return" android:keyWidth="20%p" android:keyEdgeFlags="right"
android:iconPreview="@drawable/sym_keyboard_feedback_return"/>
</Row>
<Row
android:keyboardMode="@+id/mode_symbols_with_settings_key"
android:rowEdgeFlags="bottom"
>
<Key android:codes="-2" android:keyLabel="@string/label_alpha_key" <Key android:codes="-2" android:keyLabel="@string/label_alpha_key"
android:keyWidth="15%p" android:keyEdgeFlags="left"/> android:keyWidth="15%p" android:keyEdgeFlags="left"/>
<Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings" <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings"
android:iconPreview="@drawable/sym_keyboard_feedback_settings" android:iconPreview="@drawable/sym_keyboard_feedback_settings"/>
android:keyWidth="10%p"/> <Key android:codes="@integer/key_f1"/>
<Key android:codes="@integer/key_f1" android:keyWidth="10%p"/>
<Key android:codes="32" android:keyIcon="@drawable/sym_bkeyboard_space" <Key android:codes="32" android:keyIcon="@drawable/sym_bkeyboard_space"
android:keyWidth="30%p" android:keyWidth="30%p"
android:iconPreview="@drawable/sym_keyboard_feedback_space" android:iconPreview="@drawable/sym_keyboard_feedback_space"
android:isRepeatable="true"/> android:isRepeatable="true"/>
<Key android:codes="46" android:keyLabel="." <Key android:codes="46" android:keyLabel="."
android:popupKeyboard="@xml/popup_punctuation" android:popupKeyboard="@xml/popup_punctuation"/>
android:keyWidth="10%p"/>
<Key android:codes="10" android:keyIcon="@drawable/sym_bkeyboard_return" android:keyWidth="25%p" android:keyEdgeFlags="right" <Key android:codes="10" android:keyIcon="@drawable/sym_bkeyboard_return" android:keyWidth="25%p" android:keyEdgeFlags="right"
android:iconPreview="@drawable/sym_keyboard_feedback_return" android:iconPreview="@drawable/sym_keyboard_feedback_return"/>
/>
</Row> </Row>
</Keyboard> </Keyboard>

29
java/res/xml/kbd_symbols_shift.xml
View File

@ -88,18 +88,39 @@
android:isRepeatable="true" android:isModifier="true"/> android:isRepeatable="true" android:isModifier="true"/>
</Row> </Row>
<Row android:rowEdgeFlags="bottom"> <Row
android:keyboardMode="@+id/mode_symbols"
android:rowEdgeFlags="bottom"
>
<Key android:codes="-2" android:keyLabel="@string/label_alpha_key" android:keyWidth="20%p"
android:keyEdgeFlags="left" android:isModifier="true"/>
<Key android:keyLabel="„" android:isModifier="true"/>
<Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space"
android:keyWidth="40%p"
android:iconPreview="@drawable/sym_keyboard_feedback_space"
android:isRepeatable="true" android:isModifier="true"/>
<Key android:keyLabel="…" android:isModifier="true"/>
<Key android:codes="10" android:keyIcon="@drawable/sym_keyboard_return"
android:keyWidth="20%p" android:keyEdgeFlags="right"
android:iconPreview="@drawable/sym_keyboard_feedback_return"
android:isModifier="true"/>
</Row>
<Row
android:keyboardMode="@+id/mode_symbols_with_settings_key"
android:rowEdgeFlags="bottom"
>
<Key android:codes="-2" android:keyLabel="@string/label_alpha_key" android:keyWidth="15%p" <Key android:codes="-2" android:keyLabel="@string/label_alpha_key" android:keyWidth="15%p"
android:keyEdgeFlags="left" android:isModifier="true"/> android:keyEdgeFlags="left" android:isModifier="true"/>
<Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings" <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings"
android:iconPreview="@drawable/sym_keyboard_feedback_settings" android:iconPreview="@drawable/sym_keyboard_feedback_settings"
android:keyWidth="10%p" android:isModifier="true"/> android:isModifier="true"/>
<Key android:keyLabel="„" android:keyWidth="10%p" android:isModifier="true"/> <Key android:keyLabel="„" android:isModifier="true"/>
<Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space" <Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space"
android:keyWidth="30%p" android:keyWidth="30%p"
android:iconPreview="@drawable/sym_keyboard_feedback_space" android:iconPreview="@drawable/sym_keyboard_feedback_space"
android:isRepeatable="true" android:isModifier="true"/> android:isRepeatable="true" android:isModifier="true"/>
<Key android:keyLabel="…" android:keyWidth="10%p" android:isModifier="true"/> <Key android:keyLabel="…" android:isModifier="true"/>
<Key android:codes="10" android:keyIcon="@drawable/sym_keyboard_return" <Key android:codes="10" android:keyIcon="@drawable/sym_keyboard_return"
android:keyWidth="25%p" android:keyEdgeFlags="right" android:keyWidth="25%p" android:keyEdgeFlags="right"
android:iconPreview="@drawable/sym_keyboard_feedback_return" android:iconPreview="@drawable/sym_keyboard_feedback_return"

32
java/res/xml/kbd_symbols_shift_black.xml
View File

@ -88,21 +88,39 @@
android:isRepeatable="true"/> android:isRepeatable="true"/>
</Row> </Row>
<Row android:rowEdgeFlags="bottom"> <Row
android:keyboardMode="@+id/mode_symbols"
android:rowEdgeFlags="bottom"
>
<Key android:codes="-2" android:keyLabel="@string/label_alpha_key" android:keyWidth="20%p"
android:keyEdgeFlags="left"/>
<Key android:keyLabel="„" />
<Key android:codes="32" android:keyIcon="@drawable/sym_bkeyboard_space"
android:keyWidth="40%p"
android:iconPreview="@drawable/sym_keyboard_feedback_space"
android:isRepeatable="true"/>
<Key android:keyLabel="…" />
<Key android:codes="10" android:keyIcon="@drawable/sym_bkeyboard_return"
android:keyWidth="20%p" android:keyEdgeFlags="right"
android:iconPreview="@drawable/sym_keyboard_feedback_return" />
</Row>
<Row
android:keyboardMode="@+id/mode_symbols_with_settings_key"
android:rowEdgeFlags="bottom"
>
<Key android:codes="-2" android:keyLabel="@string/label_alpha_key" android:keyWidth="15%p" <Key android:codes="-2" android:keyLabel="@string/label_alpha_key" android:keyWidth="15%p"
android:keyEdgeFlags="left"/> android:keyEdgeFlags="left"/>
<Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings" <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings"
android:iconPreview="@drawable/sym_keyboard_feedback_settings" android:iconPreview="@drawable/sym_keyboard_feedback_settings"/>
android:keyWidth="10%p"/> <Key android:keyLabel="„" />
<Key android:keyLabel="„" android:keyWidth="10%p" />
<Key android:codes="32" android:keyIcon="@drawable/sym_bkeyboard_space" <Key android:codes="32" android:keyIcon="@drawable/sym_bkeyboard_space"
android:keyWidth="30%p" android:keyWidth="30%p"
android:iconPreview="@drawable/sym_keyboard_feedback_space" android:iconPreview="@drawable/sym_keyboard_feedback_space"
android:isRepeatable="true"/> android:isRepeatable="true"/>
<Key android:keyLabel="…" android:keyWidth="10%p" /> <Key android:keyLabel="…" />
<Key android:codes="10" android:keyIcon="@drawable/sym_bkeyboard_return" <Key android:codes="10" android:keyIcon="@drawable/sym_bkeyboard_return"
android:keyWidth="25%p" android:keyEdgeFlags="right" android:keyWidth="25%p" android:keyEdgeFlags="right"
android:iconPreview="@drawable/sym_keyboard_feedback_return" android:iconPreview="@drawable/sym_keyboard_feedback_return" />
/>
</Row> </Row>
</Keyboard> </Keyboard>

9
java/res/xml/prefs.xml
View File

@ -59,6 +59,15 @@
android:defaultValue="false" android:defaultValue="false"
/> />
<ListPreference
android:key="settings_key"
android:title="@string/prefs_settings_key"
android:persistent="true"
android:entryValues="@array/settings_key_modes_values"
android:entries="@array/settings_key_modes"
android:defaultValue="@string/settings_key_mode_auto"
/>
<ListPreference <ListPreference
android:key="voice_mode" android:key="voice_mode"
android:title="@string/voice_input" android:title="@string/voice_input"

106
java/src/com/android/inputmethod/latin/KeyboardSwitcher.java
View File

@ -39,11 +39,29 @@ public class KeyboardSwitcher implements SharedPreferences.OnSharedPreferenceCha
public static final int MODE_IM = 6; public static final int MODE_IM = 6;
public static final int MODE_WEB = 7; public static final int MODE_WEB = 7;
// Main keyboard layouts without the settings key
public static final int KEYBOARDMODE_NORMAL = R.id.mode_normal; public static final int KEYBOARDMODE_NORMAL = R.id.mode_normal;
public static final int KEYBOARDMODE_URL = R.id.mode_url; public static final int KEYBOARDMODE_URL = R.id.mode_url;
public static final int KEYBOARDMODE_EMAIL = R.id.mode_email; public static final int KEYBOARDMODE_EMAIL = R.id.mode_email;
public static final int KEYBOARDMODE_IM = R.id.mode_im; public static final int KEYBOARDMODE_IM = R.id.mode_im;
public static final int KEYBOARDMODE_WEB = R.id.mode_webentry; public static final int KEYBOARDMODE_WEB = R.id.mode_webentry;
// Main keyboard layouts with the settings key
public static final int KEYBOARDMODE_NORMAL_WITH_SETTINGS_KEY =
R.id.mode_normal_with_settings_key;
public static final int KEYBOARDMODE_URL_WITH_SETTINGS_KEY =
R.id.mode_url_with_settings_key;
public static final int KEYBOARDMODE_EMAIL_WITH_SETTINGS_KEY =
R.id.mode_email_with_settings_key;
public static final int KEYBOARDMODE_IM_WITH_SETTINGS_KEY =
R.id.mode_im_with_settings_key;
public static final int KEYBOARDMODE_WEB_WITH_SETTINGS_KEY =
R.id.mode_webentry_with_settings_key;
// Symbols keyboard layout without the settings key
public static final int KEYBOARDMODE_SYMBOLS = R.id.mode_symbols;
// Symbols keyboard layout with the settings key
public static final int KEYBOARDMODE_SYMBOLS_WITH_SETTINGS_KEY =
R.id.mode_symbols_with_settings_key;
public static final String DEFAULT_LAYOUT_ID = "4"; public static final String DEFAULT_LAYOUT_ID = "4";
public static final String PREF_KEYBOARD_LAYOUT = "pref_keyboard_layout_20100902"; public static final String PREF_KEYBOARD_LAYOUT = "pref_keyboard_layout_20100902";
@ -75,9 +93,13 @@ public class KeyboardSwitcher implements SharedPreferences.OnSharedPreferenceCha
KEYBOARDMODE_URL, KEYBOARDMODE_URL,
KEYBOARDMODE_EMAIL, KEYBOARDMODE_EMAIL,
KEYBOARDMODE_IM, KEYBOARDMODE_IM,
KEYBOARDMODE_WEB}; KEYBOARDMODE_WEB,
KEYBOARDMODE_NORMAL_WITH_SETTINGS_KEY,
KEYBOARDMODE_URL_WITH_SETTINGS_KEY,
KEYBOARDMODE_EMAIL_WITH_SETTINGS_KEY,
KEYBOARDMODE_IM_WITH_SETTINGS_KEY,
KEYBOARDMODE_WEB_WITH_SETTINGS_KEY };
final Context mContext;
final LatinIME mInputMethodService; final LatinIME mInputMethodService;
private KeyboardId mSymbolsId; private KeyboardId mSymbolsId;
@ -97,23 +119,32 @@ public class KeyboardSwitcher implements SharedPreferences.OnSharedPreferenceCha
private boolean mPreferSymbols; private boolean mPreferSymbols;
private int mSymbolsModeState = SYMBOLS_MODE_STATE_NONE; private int mSymbolsModeState = SYMBOLS_MODE_STATE_NONE;
// Indicates whether or not we have the settings key
boolean mHasSettingsKey;
private static final int SETTINGS_KEY_MODE_AUTO = R.string.settings_key_mode_auto;
private static final int SETTINGS_KEY_MODE_ALWAYS_SHOW = R.string.settings_key_mode_always_show;
// NOTE: No need to have SETTINGS_KEY_MODE_ALWAYS_HIDE here because it's not being referred to
// in the source code now.
// Default is SETTINGS_KEY_MODE_AUTO.
private static final int DEFAULT_SETTINGS_KEY_MODE = SETTINGS_KEY_MODE_AUTO;
private int mLastDisplayWidth; private int mLastDisplayWidth;
private LanguageSwitcher mLanguageSwitcher; private LanguageSwitcher mLanguageSwitcher;
private Locale mInputLocale; private Locale mInputLocale;
private int mLayoutId; private int mLayoutId;
KeyboardSwitcher(Context context, LatinIME ims) { KeyboardSwitcher(LatinIME ims) {
mContext = context; mInputMethodService = ims;
final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(ims); final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(ims);
mLayoutId = Integer.valueOf(prefs.getString(PREF_KEYBOARD_LAYOUT, DEFAULT_LAYOUT_ID)); mLayoutId = Integer.valueOf(prefs.getString(PREF_KEYBOARD_LAYOUT, DEFAULT_LAYOUT_ID));
updateSettingsKeyState(prefs);
prefs.registerOnSharedPreferenceChangeListener(this); prefs.registerOnSharedPreferenceChangeListener(this);
mKeyboards = new HashMap<KeyboardId, SoftReference<LatinKeyboard>>(); mKeyboards = new HashMap<KeyboardId, SoftReference<LatinKeyboard>>();
mSymbolsId = makeSymbolsId(false); mSymbolsId = makeSymbolsId(false);
mSymbolsShiftedId = makeSymbolsShiftedId(false); mSymbolsShiftedId = makeSymbolsShiftedId(false);
mInputMethodService = ims;
} }
/** /**
@ -132,11 +163,15 @@ public class KeyboardSwitcher implements SharedPreferences.OnSharedPreferenceCha
} }
private KeyboardId makeSymbolsId(boolean hasVoice) { private KeyboardId makeSymbolsId(boolean hasVoice) {
return new KeyboardId(KBD_SYMBOLS[getCharColorId()], hasVoice); return new KeyboardId(KBD_SYMBOLS[getCharColorId()], mHasSettingsKey ?
KEYBOARDMODE_SYMBOLS_WITH_SETTINGS_KEY : KEYBOARDMODE_SYMBOLS,
false, hasVoice);
} }
private KeyboardId makeSymbolsShiftedId(boolean hasVoice) { private KeyboardId makeSymbolsShiftedId(boolean hasVoice) {
return new KeyboardId(KBD_SYMBOLS_SHIFT[getCharColorId()], hasVoice); return new KeyboardId(KBD_SYMBOLS_SHIFT[getCharColorId()], mHasSettingsKey ?
KEYBOARDMODE_SYMBOLS_WITH_SETTINGS_KEY : KEYBOARDMODE_SYMBOLS,
false, hasVoice);
} }
void makeKeyboards(boolean forceCreate) { void makeKeyboards(boolean forceCreate) {
@ -243,20 +278,22 @@ public class KeyboardSwitcher implements SharedPreferences.OnSharedPreferenceCha
mInputView.setKeyboard(keyboard); mInputView.setKeyboard(keyboard);
keyboard.setShifted(false); keyboard.setShifted(false);
keyboard.setShiftLocked(keyboard.isShiftLocked()); keyboard.setShiftLocked(keyboard.isShiftLocked());
keyboard.setImeOptions(mContext.getResources(), mMode, imeOptions); keyboard.setImeOptions(mInputMethodService.getResources(), mMode, imeOptions);
keyboard.setColorOfSymbolIcons(mIsAutoCompletionActive, isBlackSym()); keyboard.setColorOfSymbolIcons(mIsAutoCompletionActive, isBlackSym());
// Update the settings key state because number of enabled IMEs could have been changed
updateSettingsKeyState(PreferenceManager.getDefaultSharedPreferences(mInputMethodService));
} }
private LatinKeyboard getKeyboard(KeyboardId id) { private LatinKeyboard getKeyboard(KeyboardId id) {
SoftReference<LatinKeyboard> ref = mKeyboards.get(id); SoftReference<LatinKeyboard> ref = mKeyboards.get(id);
LatinKeyboard keyboard = (ref == null) ? null : ref.get(); LatinKeyboard keyboard = (ref == null) ? null : ref.get();
if (keyboard == null) { if (keyboard == null) {
Resources orig = mContext.getResources(); Resources orig = mInputMethodService.getResources();
Configuration conf = orig.getConfiguration(); Configuration conf = orig.getConfiguration();
Locale saveLocale = conf.locale; Locale saveLocale = conf.locale;
conf.locale = mInputLocale; conf.locale = mInputLocale;
orig.updateConfiguration(conf, null); orig.updateConfiguration(conf, null);
keyboard = new LatinKeyboard(mContext, id.mXml, id.mKeyboardMode); keyboard = new LatinKeyboard(mInputMethodService, id.mXml, id.mKeyboardMode);
keyboard.setVoiceMode(hasVoiceButton(id.mXml == R.xml.kbd_symbols keyboard.setVoiceMode(hasVoiceButton(id.mXml == R.xml.kbd_symbols
|| id.mXml == R.xml.kbd_symbols_black), mHasVoice); || id.mXml == R.xml.kbd_symbols_black), mHasVoice);
keyboard.setLanguageSwitcher(mLanguageSwitcher, mIsAutoCompletionActive, isBlackSym()); keyboard.setLanguageSwitcher(mLanguageSwitcher, mIsAutoCompletionActive, isBlackSym());
@ -281,7 +318,9 @@ public class KeyboardSwitcher implements SharedPreferences.OnSharedPreferenceCha
if (mode == MODE_PHONE) { if (mode == MODE_PHONE) {
return new KeyboardId(KBD_PHONE_SYMBOLS[charColorId], hasVoice); return new KeyboardId(KBD_PHONE_SYMBOLS[charColorId], hasVoice);
} else { } else {
return new KeyboardId(KBD_SYMBOLS[charColorId], hasVoice); return new KeyboardId(KBD_SYMBOLS[charColorId], mHasSettingsKey ?
KEYBOARDMODE_SYMBOLS_WITH_SETTINGS_KEY : KEYBOARDMODE_SYMBOLS,
false, hasVoice);
} }
} }
switch (mode) { switch (mode) {
@ -290,19 +329,27 @@ public class KeyboardSwitcher implements SharedPreferences.OnSharedPreferenceCha
"getKeyboardId:" + mode + "," + imeOptions + "," + isSymbols); "getKeyboardId:" + mode + "," + imeOptions + "," + isSymbols);
/* fall through */ /* fall through */
case MODE_TEXT: case MODE_TEXT:
return new KeyboardId(keyboardRowsResId, KEYBOARDMODE_NORMAL, true, hasVoice); return new KeyboardId(keyboardRowsResId, mHasSettingsKey ?
KEYBOARDMODE_NORMAL_WITH_SETTINGS_KEY : KEYBOARDMODE_NORMAL,
true, hasVoice);
case MODE_SYMBOLS: case MODE_SYMBOLS:
return new KeyboardId(KBD_SYMBOLS[charColorId], hasVoice); return new KeyboardId(KBD_SYMBOLS[charColorId], mHasSettingsKey ?
KEYBOARDMODE_SYMBOLS_WITH_SETTINGS_KEY : KEYBOARDMODE_SYMBOLS,
false, hasVoice);
case MODE_PHONE: case MODE_PHONE:
return new KeyboardId(KBD_PHONE[charColorId], hasVoice); return new KeyboardId(KBD_PHONE[charColorId], hasVoice);
case MODE_URL: case MODE_URL:
return new KeyboardId(keyboardRowsResId, KEYBOARDMODE_URL, true, hasVoice); return new KeyboardId(keyboardRowsResId, mHasSettingsKey ?
KEYBOARDMODE_URL_WITH_SETTINGS_KEY : KEYBOARDMODE_URL, true, hasVoice);
case MODE_EMAIL: case MODE_EMAIL:
return new KeyboardId(keyboardRowsResId, KEYBOARDMODE_EMAIL, true, hasVoice); return new KeyboardId(keyboardRowsResId, mHasSettingsKey ?
KEYBOARDMODE_EMAIL_WITH_SETTINGS_KEY : KEYBOARDMODE_EMAIL, true, hasVoice);
case MODE_IM: case MODE_IM:
return new KeyboardId(keyboardRowsResId, KEYBOARDMODE_IM, true, hasVoice); return new KeyboardId(keyboardRowsResId, mHasSettingsKey ?
KEYBOARDMODE_IM_WITH_SETTINGS_KEY : KEYBOARDMODE_IM, true, hasVoice);
case MODE_WEB: case MODE_WEB:
return new KeyboardId(keyboardRowsResId, KEYBOARDMODE_WEB, true, hasVoice); return new KeyboardId(keyboardRowsResId, mHasSettingsKey ?
KEYBOARDMODE_WEB_WITH_SETTINGS_KEY : KEYBOARDMODE_WEB, true, hasVoice);
} }
return null; return null;
} }
@ -351,7 +398,8 @@ public class KeyboardSwitcher implements SharedPreferences.OnSharedPreferenceCha
// called. // called.
symbolsShiftedKeyboard.enableShiftLock(); symbolsShiftedKeyboard.enableShiftLock();
symbolsShiftedKeyboard.setShiftLocked(true); symbolsShiftedKeyboard.setShiftLocked(true);
symbolsShiftedKeyboard.setImeOptions(mContext.getResources(), mMode, mImeOptions); symbolsShiftedKeyboard.setImeOptions(mInputMethodService.getResources(),
mMode, mImeOptions);
} else if (mCurrentId.equals(mSymbolsShiftedId)) { } else if (mCurrentId.equals(mSymbolsShiftedId)) {
LatinKeyboard symbolsKeyboard = getKeyboard(mSymbolsId); LatinKeyboard symbolsKeyboard = getKeyboard(mSymbolsId);
mCurrentId = mSymbolsId; mCurrentId = mSymbolsId;
@ -360,7 +408,7 @@ public class KeyboardSwitcher implements SharedPreferences.OnSharedPreferenceCha
// indicator, we need to call enableShiftLock() and setShiftLocked(false). // indicator, we need to call enableShiftLock() and setShiftLocked(false).
symbolsKeyboard.enableShiftLock(); symbolsKeyboard.enableShiftLock();
symbolsKeyboard.setShifted(false); symbolsKeyboard.setShifted(false);
symbolsKeyboard.setImeOptions(mContext.getResources(), mMode, mImeOptions); symbolsKeyboard.setImeOptions(mInputMethodService.getResources(), mMode, mImeOptions);
} }
} }
@ -445,11 +493,14 @@ public class KeyboardSwitcher implements SharedPreferences.OnSharedPreferenceCha
if (PREF_KEYBOARD_LAYOUT.equals(key)) { if (PREF_KEYBOARD_LAYOUT.equals(key)) {
changeLatinKeyboardView( changeLatinKeyboardView(
Integer.valueOf(sharedPreferences.getString(key, DEFAULT_LAYOUT_ID)), false); Integer.valueOf(sharedPreferences.getString(key, DEFAULT_LAYOUT_ID)), false);
} else if (LatinIMESettings.PREF_SETTINGS_KEY.equals(key)) {
updateSettingsKeyState(sharedPreferences);
recreateInputView();
} }
} }
public boolean isBlackSym () { public boolean isBlackSym () {
if (mInputView != null && mInputView.getSymbolColorSheme() == 1) { if (mInputView != null && mInputView.getSymbolColorScheme() == 1) {
return true; return true;
} }
return false; return false;
@ -471,4 +522,19 @@ public class KeyboardSwitcher implements SharedPreferences.OnSharedPreferenceCha
.onAutoCompletionStateChanged(isAutoCompletion)); .onAutoCompletionStateChanged(isAutoCompletion));
} }
} }
private void updateSettingsKeyState(SharedPreferences prefs) {
Resources resources = mInputMethodService.getResources();
final String settingsKeyMode = prefs.getString(LatinIMESettings.PREF_SETTINGS_KEY,
resources.getString(DEFAULT_SETTINGS_KEY_MODE));
// We show the settings key when 1) SETTINGS_KEY_MODE_ALWAYS_SHOW or
// 2) SETTINGS_KEY_MODE_AUTO and there are two or more enabled IMEs on the system
if (settingsKeyMode.equals(resources.getString(SETTINGS_KEY_MODE_ALWAYS_SHOW))
|| (settingsKeyMode.equals(resources.getString(SETTINGS_KEY_MODE_AUTO))
&& LatinIMEUtil.hasMultipleEnabledIMEs(mInputMethodService))) {
mHasSettingsKey = true;
} else {
mHasSettingsKey = false;
}
}
} }

13
java/src/com/android/inputmethod/latin/LatinIME.java
View File

@ -355,7 +355,7 @@ public class LatinIME extends InputMethodService
final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this); final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
mLanguageSwitcher = new LanguageSwitcher(this); mLanguageSwitcher = new LanguageSwitcher(this);
mLanguageSwitcher.loadLocales(prefs); mLanguageSwitcher.loadLocales(prefs);
mKeyboardSwitcher = new KeyboardSwitcher(this, this); mKeyboardSwitcher = new KeyboardSwitcher(this);
mKeyboardSwitcher.setLanguageSwitcher(mLanguageSwitcher); mKeyboardSwitcher.setLanguageSwitcher(mLanguageSwitcher);
mSystemLocale = conf.locale.toString(); mSystemLocale = conf.locale.toString();
mLanguageSwitcher.setSystemLocale(conf.locale); mLanguageSwitcher.setSystemLocale(conf.locale);
@ -983,7 +983,7 @@ public class LatinIME extends InputMethodService
private void reloadKeyboards() { private void reloadKeyboards() {
if (mKeyboardSwitcher == null) { if (mKeyboardSwitcher == null) {
mKeyboardSwitcher = new KeyboardSwitcher(this, this); mKeyboardSwitcher = new KeyboardSwitcher(this);
} }
mKeyboardSwitcher.setLanguageSwitcher(mLanguageSwitcher); mKeyboardSwitcher.setLanguageSwitcher(mLanguageSwitcher);
if (mKeyboardSwitcher.getInputView() != null if (mKeyboardSwitcher.getInputView() != null
@ -1121,11 +1121,6 @@ public class LatinIME extends InputMethodService
} }
} }
private boolean hasMultipleEnabledIMEs() {
return ((InputMethodManager) getSystemService(
INPUT_METHOD_SERVICE)).getEnabledInputMethodList().size() > 1;
}
private void showInputMethodPicker() { private void showInputMethodPicker() {
((InputMethodManager) getSystemService(INPUT_METHOD_SERVICE)) ((InputMethodManager) getSystemService(INPUT_METHOD_SERVICE))
.showInputMethodPicker(); .showInputMethodPicker();
@ -1133,7 +1128,7 @@ public class LatinIME extends InputMethodService
private void onOptionKeyPressed() { private void onOptionKeyPressed() {
if (!isShowingOptionDialog()) { if (!isShowingOptionDialog()) {
if (hasMultipleEnabledIMEs()) { if (LatinIMEUtil.hasMultipleEnabledIMEs(this)) {
showOptionsMenu(); showOptionsMenu();
} else { } else {
launchSettings(); launchSettings();
@ -1143,7 +1138,7 @@ public class LatinIME extends InputMethodService
private void onOptionKeyLongPressed() { private void onOptionKeyLongPressed() {
if (!isShowingOptionDialog()) { if (!isShowingOptionDialog()) {
if (hasMultipleEnabledIMEs()) { if (LatinIMEUtil.hasMultipleEnabledIMEs(this)) {
showInputMethodPicker(); showInputMethodPicker();
} else { } else {
launchSettings(); launchSettings();

11
java/src/com/android/inputmethod/latin/LatinIMESettings.java
View File

@ -46,6 +46,7 @@ public class LatinIMESettings extends PreferenceActivity
private static final String PREDICTION_SETTINGS_KEY = "prediction_settings"; private static final String PREDICTION_SETTINGS_KEY = "prediction_settings";
private static final String VOICE_SETTINGS_KEY = "voice_mode"; private static final String VOICE_SETTINGS_KEY = "voice_mode";
private static final String DEBUG_MODE_KEY = "debug_mode"; private static final String DEBUG_MODE_KEY = "debug_mode";
/* package */ static final String PREF_SETTINGS_KEY = "settings_key";
private static final String TAG = "LatinIMESettings"; private static final String TAG = "LatinIMESettings";
@ -55,6 +56,7 @@ public class LatinIMESettings extends PreferenceActivity
private CheckBoxPreference mQuickFixes; private CheckBoxPreference mQuickFixes;
private CheckBoxPreference mDebugMode; private CheckBoxPreference mDebugMode;
private ListPreference mVoicePreference; private ListPreference mVoicePreference;
private ListPreference mSettingsKeyPreference;
private boolean mVoiceOn; private boolean mVoiceOn;
private VoiceInputLogger mLogger; private VoiceInputLogger mLogger;
@ -68,6 +70,7 @@ public class LatinIMESettings extends PreferenceActivity
addPreferencesFromResource(R.xml.prefs); addPreferencesFromResource(R.xml.prefs);
mQuickFixes = (CheckBoxPreference) findPreference(QUICK_FIXES_KEY); mQuickFixes = (CheckBoxPreference) findPreference(QUICK_FIXES_KEY);
mVoicePreference = (ListPreference) findPreference(VOICE_SETTINGS_KEY); mVoicePreference = (ListPreference) findPreference(VOICE_SETTINGS_KEY);
mSettingsKeyPreference = (ListPreference) findPreference(PREF_SETTINGS_KEY);
SharedPreferences prefs = getPreferenceManager().getSharedPreferences(); SharedPreferences prefs = getPreferenceManager().getSharedPreferences();
prefs.registerOnSharedPreferenceChangeListener(this); prefs.registerOnSharedPreferenceChangeListener(this);
@ -93,6 +96,7 @@ public class LatinIMESettings extends PreferenceActivity
} else { } else {
updateVoiceModeSummary(); updateVoiceModeSummary();
} }
updateSettingsKeySummary();
} }
@Override @Override
@ -118,6 +122,13 @@ public class LatinIMESettings extends PreferenceActivity
} }
mVoiceOn = !(prefs.getString(VOICE_SETTINGS_KEY, mVoiceModeOff).equals(mVoiceModeOff)); mVoiceOn = !(prefs.getString(VOICE_SETTINGS_KEY, mVoiceModeOff).equals(mVoiceModeOff));
updateVoiceModeSummary(); updateVoiceModeSummary();
updateSettingsKeySummary();
}
private void updateSettingsKeySummary() {
mSettingsKeyPreference.setSummary(
getResources().getStringArray(R.array.settings_key_modes)
[mSettingsKeyPreference.findIndexOfValue(mSettingsKeyPreference.getValue())]);
} }
private void updateDebugMode() { private void updateDebugMode() {

8
java/src/com/android/inputmethod/latin/LatinIMEUtil.java
View File

@ -16,6 +16,9 @@
package com.android.inputmethod.latin; package com.android.inputmethod.latin;
import android.view.inputmethod.InputMethodManager;
import android.content.Context;
import android.os.AsyncTask; import android.os.AsyncTask;
import android.text.format.DateUtils; import android.text.format.DateUtils;
import android.util.Log; import android.util.Log;
@ -72,4 +75,9 @@ public class LatinIMEUtil {
} }
} }
} }
public static boolean hasMultipleEnabledIMEs(Context context) {
return ((InputMethodManager) context.getSystemService(
Context.INPUT_METHOD_SERVICE)).getEnabledInputMethodList().size() > 1;
}
} }

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

@ -643,7 +643,7 @@ public class LatinKeyboardBaseView extends View implements PointerTracker.UIProx
return mShowPreview; return mShowPreview;
} }
public int getSymbolColorSheme() { public int getSymbolColorScheme() {
return mSymbolColorScheme; return mSymbolColorScheme;
} }