Unbundle Keyboard.java to BaseKeyboard.java
Change-Id: I8b310c2c0cae1a151e53c22001c586697346982c
diff --git a/java/res/xml/kbd_symbols.xml b/java/res/xml/kbd_symbols.xml
index cb8b3b3..4cdc539 100644
--- a/java/res/xml/kbd_symbols.xml
+++ b/java/res/xml/kbd_symbols.xml
@@ -19,194 +19,194 @@
-->
<Keyboard
- xmlns:android="http://schemas.android.com/apk/res/android"
- android:keyWidth="10%p"
- android:horizontalGap="0px"
- android:verticalGap="0px"
- android:keyHeight="@dimen/key_height"
+ xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+ latin:keyWidth="10%p"
+ latin:horizontalGap="0px"
+ latin:verticalGap="0px"
+ latin:keyHeight="@dimen/key_height"
>
<Row
- android:rowEdgeFlags="top"
+ latin:rowEdgeFlags="top"
>
<Key
- android:keyLabel="1"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="¹½⅓¼⅛"
- android:keyEdgeFlags="left" />
+ latin:keyLabel="1"
+ latin:popupKeyboard="@xml/kbd_popup_template"
+ latin:popupCharacters="¹½⅓¼⅛"
+ latin:keyEdgeFlags="left" />
<Key
- android:keyLabel="2"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="²⅔" />
+ latin:keyLabel="2"
+ latin:popupKeyboard="@xml/kbd_popup_template"
+ latin:popupCharacters="²⅔" />
<Key
- android:keyLabel="3"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="³¾⅜" />
+ latin:keyLabel="3"
+ latin:popupKeyboard="@xml/kbd_popup_template"
+ latin:popupCharacters="³¾⅜" />
<Key
- android:keyLabel="4"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="⁴" />
+ latin:keyLabel="4"
+ latin:popupKeyboard="@xml/kbd_popup_template"
+ latin:popupCharacters="⁴" />
<Key
- android:keyLabel="5"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="⅝" />
+ latin:keyLabel="5"
+ latin:popupKeyboard="@xml/kbd_popup_template"
+ latin:popupCharacters="⅝" />
<Key
- android:keyLabel="6" />
+ latin:keyLabel="6" />
<Key
- android:keyLabel="7"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="⅞" />
+ latin:keyLabel="7"
+ latin:popupKeyboard="@xml/kbd_popup_template"
+ latin:popupCharacters="⅞" />
<Key
- android:keyLabel="8" />
+ latin:keyLabel="8" />
<Key
- android:keyLabel="9" />
+ latin:keyLabel="9" />
<Key
- android:keyLabel="0"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="ⁿ∅"
- android:keyEdgeFlags="right" />
+ latin:keyLabel="0"
+ latin:popupKeyboard="@xml/kbd_popup_template"
+ latin:popupCharacters="ⁿ∅"
+ latin:keyEdgeFlags="right" />
</Row>
<Row>
<Key
- android:keyLabel="\@"
- android:keyEdgeFlags="left" />
+ latin:keyLabel="\@"
+ latin:keyEdgeFlags="left" />
<Key
- android:keyLabel="\#" />
+ latin:keyLabel="\#" />
<Key
- android:keyLabel="$"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="¢£€¥₣₤₱" />
+ latin:keyLabel="$"
+ latin:popupKeyboard="@xml/kbd_popup_template"
+ latin:popupCharacters="¢£€¥₣₤₱" />
<Key
- android:keyLabel="%"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="‰" />
+ latin:keyLabel="%"
+ latin:popupKeyboard="@xml/kbd_popup_template"
+ latin:popupCharacters="‰" />
<Key
- android:keyLabel="&" />
+ latin:keyLabel="&" />
<Key
- android:keyLabel="*"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="†‡★" />
+ latin:keyLabel="*"
+ latin:popupKeyboard="@xml/kbd_popup_template"
+ latin:popupCharacters="†‡★" />
<Key
- android:keyLabel="-"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="_–—" />
+ latin:keyLabel="-"
+ latin:popupKeyboard="@xml/kbd_popup_template"
+ latin:popupCharacters="_–—" />
<Key
- android:keyLabel="+"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="±" />
+ latin:keyLabel="+"
+ latin:popupKeyboard="@xml/kbd_popup_template"
+ latin:popupCharacters="±" />
<Key
- android:keyLabel="("
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="[{<" />
+ latin:keyLabel="("
+ latin:popupKeyboard="@xml/kbd_popup_template"
+ latin:popupCharacters="[{<" />
<Key
- android:keyLabel=")"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="]}>"
- android:keyEdgeFlags="right" />
+ latin:keyLabel=")"
+ latin:popupKeyboard="@xml/kbd_popup_template"
+ latin:popupCharacters="]}>"
+ latin:keyEdgeFlags="right" />
</Row>
<Row>
<Key
- android:codes="@integer/key_shift"
- android:keyLabel="@string/label_alt_key"
- android:keyWidth="15%p"
- android:isModifier="true"
- android:isSticky="true"
- android:keyEdgeFlags="left" />
+ latin:codes="@integer/key_shift"
+ latin:keyLabel="@string/label_alt_key"
+ latin:keyWidth="15%p"
+ latin:isModifier="true"
+ latin:isSticky="true"
+ latin:keyEdgeFlags="left" />
<Key
- android:keyLabel="!"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="¡" />
+ latin:keyLabel="!"
+ latin:popupKeyboard="@xml/kbd_popup_template"
+ latin:popupCharacters="¡" />
<Key
- android:keyLabel="""
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="“”«»˝" />
+ latin:keyLabel="""
+ latin:popupKeyboard="@xml/kbd_popup_template"
+ latin:popupCharacters="“”«»˝" />
<Key
- android:keyLabel="\'"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="‘’" />
+ latin:keyLabel="\'"
+ latin:popupKeyboard="@xml/kbd_popup_template"
+ latin:popupCharacters="‘’" />
<Key
- android:keyLabel=":" />
+ latin:keyLabel=":" />
<Key
- android:keyLabel=";" />
+ latin:keyLabel=";" />
<Key
- android:keyLabel="/" />
+ latin:keyLabel="/" />
<Key
- android:keyLabel="\?"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="¿" />
+ latin:keyLabel="\?"
+ latin:popupKeyboard="@xml/kbd_popup_template"
+ latin:popupCharacters="¿" />
<Key
- android:codes="@integer/key_delete"
- android:keyIcon="@drawable/sym_keyboard_delete"
- android:iconPreview="@drawable/sym_keyboard_feedback_delete"
- android:keyWidth="15%p"
- android:isModifier="true"
- android:isRepeatable="true"
- android:keyEdgeFlags="right" />
+ latin:codes="@integer/key_delete"
+ latin:keyIcon="@drawable/sym_keyboard_delete"
+ latin:iconPreview="@drawable/sym_keyboard_feedback_delete"
+ latin:keyWidth="15%p"
+ latin:isModifier="true"
+ latin:isRepeatable="true"
+ latin:keyEdgeFlags="right" />
</Row>
<Row
- android:keyboardMode="@+id/mode_symbols"
- android:rowEdgeFlags="bottom"
+ latin:keyboardMode="@+id/mode_symbols"
+ latin:rowEdgeFlags="bottom"
>
<Key
- android:codes="@integer/key_symbol"
- android:keyLabel="@string/label_alpha_key"
- android:keyWidth="20%p"
- android:isModifier="true"
- android:keyEdgeFlags="left" />
+ latin:codes="@integer/key_symbol"
+ latin:keyLabel="@string/label_alpha_key"
+ latin:keyWidth="20%p"
+ latin:isModifier="true"
+ latin:keyEdgeFlags="left" />
<Key
- android:codes="@integer/key_f1"
- android:isModifier="true" />
+ latin:codes="@integer/key_f1"
+ latin: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" />
+ latin:codes="@integer/key_space"
+ latin:keyIcon="@drawable/sym_keyboard_space"
+ latin:iconPreview="@drawable/sym_keyboard_feedback_space"
+ latin:keyWidth="40%p"
+ latin:isModifier="true" />
<Key
- android:keyLabel="."
- android:popupKeyboard="@xml/popup_punctuation"
- android:isModifier="true" />
+ latin:keyLabel="."
+ latin:popupKeyboard="@xml/popup_punctuation"
+ latin: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" />
+ latin:codes="@integer/key_return"
+ latin:keyIcon="@drawable/sym_keyboard_return"
+ latin:iconPreview="@drawable/sym_keyboard_feedback_return"
+ latin:keyWidth="20%p"
+ latin:isModifier="true"
+ latin:keyEdgeFlags="right" />
</Row>
<Row
- android:keyboardMode="@+id/mode_symbols_with_settings_key"
- android:rowEdgeFlags="bottom"
+ latin:keyboardMode="@+id/mode_symbols_with_settings_key"
+ latin:rowEdgeFlags="bottom"
>
<Key
- android:codes="@integer/key_symbol"
- android:keyLabel="@string/label_alpha_key"
- android:keyWidth="15%p"
- android:isModifier="true"
- android:keyEdgeFlags="left" />
+ latin:codes="@integer/key_symbol"
+ latin:keyLabel="@string/label_alpha_key"
+ latin:keyWidth="15%p"
+ latin:isModifier="true"
+ latin:keyEdgeFlags="left" />
<Key
- android:codes="@integer/key_settings"
- android:keyIcon="@drawable/sym_keyboard_settings"
- android:iconPreview="@drawable/sym_keyboard_feedback_settings"
- android:isModifier="true" />
+ latin:codes="@integer/key_settings"
+ latin:keyIcon="@drawable/sym_keyboard_settings"
+ latin:iconPreview="@drawable/sym_keyboard_feedback_settings"
+ latin:isModifier="true" />
<Key
- android:codes="@integer/key_f1"
- android:isModifier="true" />
+ latin:codes="@integer/key_f1"
+ latin: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" />
+ latin:codes="@integer/key_space"
+ latin:keyIcon="@drawable/sym_keyboard_space"
+ latin:iconPreview="@drawable/sym_keyboard_feedback_space"
+ latin:keyWidth="30%p"
+ latin:isModifier="true" />
<Key
- android:keyLabel="."
- android:popupKeyboard="@xml/popup_punctuation"
- android:isModifier="true" />
+ latin:keyLabel="."
+ latin:popupKeyboard="@xml/popup_punctuation"
+ latin: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" />
+ latin:codes="@integer/key_return"
+ latin:keyIcon="@drawable/sym_keyboard_return"
+ latin:iconPreview="@drawable/sym_keyboard_feedback_return"
+ latin:keyWidth="25%p"
+ latin:isModifier="true"
+ latin:keyEdgeFlags="right" />
</Row>
</Keyboard>