From ed8eabcc397134f3f832f53d0f6e50c88c182f77 Mon Sep 17 00:00:00 2001
From: "Tadashi G. Takaoka" <takaoka@google.com>
Date: Thu, 16 Sep 2010 13:10:14 +0900
Subject: [PATCH] Cleanup keyboard layout files
Change-Id: I095c1294b9e826b503ff741eeff9dc93ad39f060
---
java/res/xml/kbd_phone.xml | 107 ++++++---
java/res/xml/kbd_phone_black.xml | 105 +++++---
java/res/xml/kbd_phone_symbols.xml | 103 +++++---
java/res/xml/kbd_phone_symbols_black.xml | 101 +++++---
java/res/xml/kbd_symbols.xml | 294 +++++++++++++----------
java/res/xml/kbd_symbols_black.xml | 279 ++++++++++++---------
java/res/xml/kbd_symbols_shift.xml | 238 +++++++++++-------
java/res/xml/kbd_symbols_shift_black.xml | 223 ++++++++++-------
java/res/xml/popup_domains.xml | 30 ++-
java/res/xml/popup_punctuation.xml | 58 +++--
java/res/xml/popup_smileys.xml | 78 ++++--
11 files changed, 1016 insertions(+), 600 deletions(-)
diff --git a/java/res/xml/kbd_phone.xml b/java/res/xml/kbd_phone.xml
index 73d022fcb5..dd42d76752 100644
--- a/java/res/xml/kbd_phone.xml
+++ b/java/res/xml/kbd_phone.xml
@@ -17,49 +17,86 @@
** limitations under the License.
*/
-->
-<Keyboard xmlns:android="http://schemas.android.com/apk/res/android"
+
+<Keyboard
+ xmlns:android="http://schemas.android.com/apk/res/android"
android:keyWidth="26.67%p"
android:horizontalGap="0px"
android:verticalGap="0px"
android:keyHeight="@dimen/key_height"
+>
+ <Row
+ android:rowEdgeFlags="top"
>
-
- <Row>
- <Key android:codes="49" android:keyIcon="@drawable/sym_keyboard_num1" android:keyEdgeFlags="left"/>
- <Key android:codes="50" android:keyIcon="@drawable/sym_keyboard_num2"/>
- <Key android:codes="51" android:keyIcon="@drawable/sym_keyboard_num3"/>
- <Key android:keyLabel="-" android:keyWidth="20%p" android:keyEdgeFlags="right"/>
+ <Key
+ android:codes="49"
+ android:keyIcon="@drawable/sym_keyboard_num1"
+ android:keyEdgeFlags="left" />
+ <Key
+ android:codes="50"
+ android:keyIcon="@drawable/sym_keyboard_num2" />
+ <Key
+ android:codes="51"
+ android:keyIcon="@drawable/sym_keyboard_num3" />
+ <Key
+ android:keyLabel="-"
+ android:keyWidth="20%p"
+ android:keyEdgeFlags="right" />
</Row>
-
<Row>
- <Key android:codes="52" android:keyIcon="@drawable/sym_keyboard_num4" android:keyEdgeFlags="left"/>
- <Key android:codes="53" android:keyIcon="@drawable/sym_keyboard_num5"/>
- <Key android:codes="54" android:keyIcon="@drawable/sym_keyboard_num6"/>
- <Key android:keyLabel="." android:keyWidth="20%p" android:keyEdgeFlags="right"/>
+ <Key
+ android:codes="52"
+ android:keyIcon="@drawable/sym_keyboard_num4"
+ android:keyEdgeFlags="left" />
+ <Key
+ android:codes="53"
+ android:keyIcon="@drawable/sym_keyboard_num5" />
+ <Key
+ android:codes="54"
+ android:keyIcon="@drawable/sym_keyboard_num6" />
+ <Key
+ android:keyLabel="."
+ android:keyWidth="20%p"
+ android:keyEdgeFlags="right" />
</Row>
-
<Row>
- <Key android:codes="55" android:keyIcon="@drawable/sym_keyboard_num7" android:keyEdgeFlags="left"/>
- <Key android:codes="56" android:keyIcon="@drawable/sym_keyboard_num8"/>
- <Key android:codes="57" android:keyIcon="@drawable/sym_keyboard_num9"/>
- <Key android:codes="-5" android:keyIcon="@drawable/sym_keyboard_delete"
- android:iconPreview="@drawable/sym_keyboard_feedback_delete"
- android:keyWidth="20%p"
- android:isRepeatable="true" android:keyEdgeFlags="right"/>
+ <Key
+ android:codes="55"
+ android:keyIcon="@drawable/sym_keyboard_num7"
+ android:keyEdgeFlags="left" />
+ <Key
+ android:codes="56"
+ android:keyIcon="@drawable/sym_keyboard_num8" />
+ <Key
+ android:codes="57"
+ android:keyIcon="@drawable/sym_keyboard_num9" />
+ <Key
+ android:codes="@integer/key_delete"
+ android:keyIcon="@drawable/sym_keyboard_delete"
+ android:iconPreview="@drawable/sym_keyboard_feedback_delete"
+ android:keyWidth="20%p"
+ android:isRepeatable="true"
+ android:keyEdgeFlags="right" />
</Row>
-
- <Row android:rowEdgeFlags="bottom">
- <Key android:codes="-2" android:keyIcon="@drawable/sym_keyboard_numalt"
- android:iconPreview="@drawable/sym_keyboard_feedback_numalt"/>
-
- <Key android:codes="48" android:keyIcon="@drawable/sym_keyboard_num0"/>
-
- <Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space"
- android:iconPreview="@drawable/sym_keyboard_feedback_space"
- android:isRepeatable="true"/>
- <Key android:codes="10" android:keyIcon="@drawable/sym_keyboard_return"
- android:keyWidth="20%p"
- android:keyEdgeFlags="right"/>
+ <Row
+ android:rowEdgeFlags="bottom"
+ >
+ <Key
+ android:codes="@integer/key_symbol"
+ android:keyIcon="@drawable/sym_keyboard_numalt"
+ android:iconPreview="@drawable/sym_keyboard_feedback_numalt" />
+ <Key
+ android:codes="48"
+ android:keyIcon="@drawable/sym_keyboard_num0" />
+ <Key
+ android:codes="@integer/key_space"
+ android:keyIcon="@drawable/sym_keyboard_space"
+ android:iconPreview="@drawable/sym_keyboard_feedback_space"
+ android:isRepeatable="true" />
+ <Key
+ android:codes="@integer/key_return"
+ android:keyIcon="@drawable/sym_keyboard_return"
+ android:keyWidth="20%p"
+ android:keyEdgeFlags="right" />
</Row>
-
-</Keyboard>
\ No newline at end of file
+</Keyboard>
diff --git a/java/res/xml/kbd_phone_black.xml b/java/res/xml/kbd_phone_black.xml
index 3738f2b68a..bc13cdf438 100644
--- a/java/res/xml/kbd_phone_black.xml
+++ b/java/res/xml/kbd_phone_black.xml
@@ -17,49 +17,86 @@
** limitations under the License.
*/
-->
-<Keyboard xmlns:android="http://schemas.android.com/apk/res/android"
+
+<Keyboard
+ xmlns:android="http://schemas.android.com/apk/res/android"
android:keyWidth="26.67%p"
android:horizontalGap="0px"
android:verticalGap="0px"
android:keyHeight="@dimen/key_height"
+>
+ <Row
+ android:rowEdgeFlags="top"
>
-
- <Row>
- <Key android:codes="49" android:keyIcon="@drawable/sym_bkeyboard_num1" android:keyEdgeFlags="left"/>
- <Key android:codes="50" android:keyIcon="@drawable/sym_bkeyboard_num2"/>
- <Key android:codes="51" android:keyIcon="@drawable/sym_bkeyboard_num3"/>
- <Key android:keyLabel="-" android:keyWidth="20%p" android:keyEdgeFlags="right"/>
+ <Key
+ android:codes="49"
+ android:keyIcon="@drawable/sym_bkeyboard_num1"
+ android:keyEdgeFlags="left" />
+ <Key
+ android:codes="50"
+ android:keyIcon="@drawable/sym_bkeyboard_num2" />
+ <Key
+ android:codes="51"
+ android:keyIcon="@drawable/sym_bkeyboard_num3" />
+ <Key
+ android:keyLabel="-"
+ android:keyWidth="20%p"
+ android:keyEdgeFlags="right" />
</Row>
-
<Row>
- <Key android:codes="52" android:keyIcon="@drawable/sym_bkeyboard_num4" android:keyEdgeFlags="left"/>
- <Key android:codes="53" android:keyIcon="@drawable/sym_bkeyboard_num5"/>
- <Key android:codes="54" android:keyIcon="@drawable/sym_bkeyboard_num6"/>
- <Key android:keyLabel="." android:keyWidth="20%p" android:keyEdgeFlags="right"/>
+ <Key
+ android:codes="52"
+ android:keyIcon="@drawable/sym_bkeyboard_num4"
+ android:keyEdgeFlags="left" />
+ <Key
+ android:codes="53"
+ android:keyIcon="@drawable/sym_bkeyboard_num5" />
+ <Key
+ android:codes="54"
+ android:keyIcon="@drawable/sym_bkeyboard_num6" />
+ <Key
+ android:keyLabel="."
+ android:keyWidth="20%p"
+ android:keyEdgeFlags="right" />
</Row>
-
<Row>
- <Key android:codes="55" android:keyIcon="@drawable/sym_bkeyboard_num7" android:keyEdgeFlags="left"/>
- <Key android:codes="56" android:keyIcon="@drawable/sym_bkeyboard_num8"/>
- <Key android:codes="57" android:keyIcon="@drawable/sym_bkeyboard_num9"/>
- <Key android:codes="-5" android:keyIcon="@drawable/sym_bkeyboard_delete"
- android:iconPreview="@drawable/sym_keyboard_feedback_delete"
- android:keyWidth="20%p"
- android:isRepeatable="true" android:keyEdgeFlags="right"/>
+ <Key
+ android:codes="55"
+ android:keyIcon="@drawable/sym_bkeyboard_num7"
+ android:keyEdgeFlags="left" />
+ <Key
+ android:codes="56"
+ android:keyIcon="@drawable/sym_bkeyboard_num8" />
+ <Key
+ android:codes="57"
+ android:keyIcon="@drawable/sym_bkeyboard_num9" />
+ <Key
+ android:codes="@integer/key_delete"
+ android:keyIcon="@drawable/sym_bkeyboard_delete"
+ android:iconPreview="@drawable/sym_keyboard_feedback_delete"
+ android:keyWidth="20%p"
+ android:isRepeatable="true"
+ android:keyEdgeFlags="right" />
</Row>
-
- <Row android:rowEdgeFlags="bottom">
- <Key android:codes="-2" android:keyIcon="@drawable/sym_bkeyboard_numalt"
- android:iconPreview="@drawable/sym_keyboard_feedback_numalt"/>
-
- <Key android:codes="48" android:keyIcon="@drawable/sym_bkeyboard_num0"/>
-
- <Key android:codes="32" android:keyIcon="@drawable/sym_bkeyboard_space"
- android:iconPreview="@drawable/sym_keyboard_feedback_space"
- android:isRepeatable="true"/>
- <Key android:codes="10" android:keyIcon="@drawable/sym_bkeyboard_return"
- android:keyWidth="20%p"
- android:keyEdgeFlags="right"/>
+ <Row
+ android:rowEdgeFlags="bottom"
+ >
+ <Key
+ android:codes="@integer/key_symbol"
+ android:keyIcon="@drawable/sym_bkeyboard_numalt"
+ android:iconPreview="@drawable/sym_keyboard_feedback_numalt" />
+ <Key
+ android:codes="48"
+ android:keyIcon="@drawable/sym_bkeyboard_num0" />
+ <Key
+ android:codes="@integer/key_space"
+ android:keyIcon="@drawable/sym_bkeyboard_space"
+ android:iconPreview="@drawable/sym_keyboard_feedback_space"
+ android:isRepeatable="true" />
+ <Key
+ android:codes="@integer/key_return"
+ android:keyIcon="@drawable/sym_bkeyboard_return"
+ android:keyWidth="20%p"
+ android:keyEdgeFlags="right" />
</Row>
-
</Keyboard>
diff --git a/java/res/xml/kbd_phone_symbols.xml b/java/res/xml/kbd_phone_symbols.xml
index 9196df8da4..7f67a98077 100644
--- a/java/res/xml/kbd_phone_symbols.xml
+++ b/java/res/xml/kbd_phone_symbols.xml
@@ -18,51 +18,82 @@
*/
-->
-<Keyboard xmlns:android="http://schemas.android.com/apk/res/android"
+<Keyboard
+ xmlns:android="http://schemas.android.com/apk/res/android"
android:keyWidth="26.67%p"
android:horizontalGap="0px"
android:verticalGap="0px"
android:keyHeight="@dimen/key_height"
+>
+ <Row
+ android:rowEdgeFlags="top"
>
-
- <Row>
- <Key android:keyLabel="(" android:keyEdgeFlags="left"/>
- <Key android:keyLabel="/"/>
- <Key android:keyLabel=")"/>
- <Key android:keyLabel="-" android:keyWidth="20%p" android:keyEdgeFlags="right"/>
+ <Key
+ android:keyLabel="("
+ android:keyEdgeFlags="left" />
+ <Key
+ android:keyLabel="/" />
+ <Key
+ android:keyLabel=")" />
+ <Key
+ android:keyLabel="-"
+ android:keyWidth="20%p"
+ android:keyEdgeFlags="right" />
</Row>
-
<Row>
- <Key android:keyLabel="N" android:keyEdgeFlags="left"/>
- <!-- Pause is a comma.
- Check PhoneNumberUtils.java to see if this has changed. -->
- <Key android:codes="44" android:keyLabel="Pause"/>
- <Key android:keyLabel=","/>
- <Key android:keyLabel="." android:keyWidth="20%p" android:keyEdgeFlags="right"/>
+ <Key
+ android:keyLabel="N"
+ android:keyEdgeFlags="left" />
+ <!-- Pause is a comma. Check PhoneNumberUtils.java to see if this
+ has changed. -->
+ <Key
+ android:codes="44"
+ android:keyLabel="Pause" />
+ <Key
+ android:keyLabel="," />
+ <Key
+ android:keyLabel="."
+ android:keyWidth="20%p"
+ android:keyEdgeFlags="right" />
</Row>
-
<Row>
- <Key android:codes="42" android:keyIcon="@drawable/sym_keyboard_numstar"
- android:keyEdgeFlags="left"/>
+ <Key
+ android:codes="42"
+ android:keyIcon="@drawable/sym_keyboard_numstar"
+ android:keyEdgeFlags="left" />
<!-- Wait is a semicolon. -->
- <Key android:codes="59" android:keyLabel="Wait"/>
- <Key android:codes="35" android:keyIcon="@drawable/sym_keyboard_numpound"/>
- <Key android:codes="-5" android:keyIcon="@drawable/sym_keyboard_delete"
- android:iconPreview="@drawable/sym_keyboard_feedback_delete"
- android:keyWidth="20%p"
- android:isRepeatable="true" android:keyEdgeFlags="right"/>
+ <Key
+ android:codes="59"
+ android:keyLabel="Wait" />
+ <Key
+ android:codes="35"
+ android:keyIcon="@drawable/sym_keyboard_numpound" />
+ <Key
+ android:codes="@integer/key_delete"
+ android:keyIcon="@drawable/sym_keyboard_delete"
+ android:iconPreview="@drawable/sym_keyboard_feedback_delete"
+ android:keyWidth="20%p"
+ android:isRepeatable="true"
+ android:keyEdgeFlags="right" />
</Row>
-
- <Row android:rowEdgeFlags="bottom">
- <Key android:codes="-2" android:keyLabel="@string/label_phone_key"
- android:keyEdgeFlags="left"/>
- <Key android:keyLabel="+"/>
- <Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space"
- android:iconPreview="@drawable/sym_keyboard_feedback_space"
- android:isRepeatable="true"/>
- <Key android:codes="10" android:keyIcon="@drawable/sym_keyboard_return"
- android:keyWidth="20%p"
- android:keyEdgeFlags="right"/>
+ <Row
+ android:rowEdgeFlags="bottom"
+ >
+ <Key
+ android:codes="@integer/key_symbol"
+ android:keyLabel="@string/label_phone_key"
+ android:keyEdgeFlags="left" />
+ <Key
+ android:keyLabel="+" />
+ <Key
+ android:codes="@integer/key_space"
+ android:keyIcon="@drawable/sym_keyboard_space"
+ android:iconPreview="@drawable/sym_keyboard_feedback_space"
+ android:isRepeatable="true" />
+ <Key
+ android:codes="@integer/key_return"
+ android:keyIcon="@drawable/sym_keyboard_return"
+ android:keyWidth="20%p"
+ android:keyEdgeFlags="right" />
</Row>
-
-</Keyboard>
\ No newline at end of file
+</Keyboard>
diff --git a/java/res/xml/kbd_phone_symbols_black.xml b/java/res/xml/kbd_phone_symbols_black.xml
index b996e8b31f..a0d2280486 100644
--- a/java/res/xml/kbd_phone_symbols_black.xml
+++ b/java/res/xml/kbd_phone_symbols_black.xml
@@ -18,51 +18,82 @@
*/
-->
-<Keyboard xmlns:android="http://schemas.android.com/apk/res/android"
+<Keyboard
+ xmlns:android="http://schemas.android.com/apk/res/android"
android:keyWidth="26.67%p"
android:horizontalGap="0px"
android:verticalGap="0px"
android:keyHeight="@dimen/key_height"
+>
+ <Row
+ android:rowEdgeFlags="top"
>
-
- <Row>
- <Key android:keyLabel="(" android:keyEdgeFlags="left"/>
- <Key android:keyLabel="/"/>
- <Key android:keyLabel=")"/>
- <Key android:keyLabel="-" android:keyWidth="20%p" android:keyEdgeFlags="right"/>
+ <Key
+ android:keyLabel="("
+ android:keyEdgeFlags="left" />
+ <Key
+ android:keyLabel="/" />
+ <Key
+ android:keyLabel=")" />
+ <Key
+ android:keyLabel="-"
+ android:keyWidth="20%p"
+ android:keyEdgeFlags="right" />
</Row>
-
<Row>
- <Key android:keyLabel="N" android:keyEdgeFlags="left"/>
- <!-- Pause is a comma.
- Check PhoneNumberUtils.java to see if this has changed. -->
- <Key android:codes="44" android:keyLabel="Pause"/>
- <Key android:keyLabel=","/>
- <Key android:keyLabel="." android:keyWidth="20%p" android:keyEdgeFlags="right"/>
+ <Key
+ android:keyLabel="N"
+ android:keyEdgeFlags="left" />
+ <!-- Pause is a comma. Check PhoneNumberUtils.java to see if this
+ has changed. -->
+ <Key
+ android:codes="44"
+ android:keyLabel="Pause" />
+ <Key
+ android:keyLabel="," />
+ <Key
+ android:keyLabel="."
+ android:keyWidth="20%p"
+ android:keyEdgeFlags="right" />
</Row>
-
<Row>
- <Key android:codes="42" android:keyIcon="@drawable/sym_bkeyboard_numstar"
- android:keyEdgeFlags="left"/>
+ <Key
+ android:codes="42"
+ android:keyIcon="@drawable/sym_bkeyboard_numstar"
+ android:keyEdgeFlags="left" />
<!-- Wait is a semicolon. -->
- <Key android:codes="59" android:keyLabel="Wait"/>
- <Key android:codes="35" android:keyIcon="@drawable/sym_bkeyboard_numpound"/>
- <Key android:codes="-5" android:keyIcon="@drawable/sym_bkeyboard_delete"
- android:iconPreview="@drawable/sym_keyboard_feedback_delete"
- android:keyWidth="20%p"
- android:isRepeatable="true" android:keyEdgeFlags="right"/>
+ <Key
+ android:codes="59"
+ android:keyLabel="Wait" />
+ <Key
+ android:codes="35"
+ android:keyIcon="@drawable/sym_bkeyboard_numpound" />
+ <Key
+ android:codes="@integer/key_delete"
+ android:keyIcon="@drawable/sym_bkeyboard_delete"
+ android:iconPreview="@drawable/sym_keyboard_feedback_delete"
+ android:keyWidth="20%p"
+ android:isRepeatable="true"
+ android:keyEdgeFlags="right" />
</Row>
-
- <Row android:rowEdgeFlags="bottom">
- <Key android:codes="-2" android:keyLabel="@string/label_phone_key"
- android:keyEdgeFlags="left"/>
- <Key android:keyLabel="+"/>
- <Key android:codes="32" android:keyIcon="@drawable/sym_bkeyboard_space"
- android:iconPreview="@drawable/sym_keyboard_feedback_space"
- android:isRepeatable="true"/>
- <Key android:codes="10" android:keyIcon="@drawable/sym_bkeyboard_return"
- android:keyWidth="20%p"
- android:keyEdgeFlags="right"/>
+ <Row
+ android:rowEdgeFlags="bottom"
+ >
+ <Key
+ android:codes="@integer/key_symbol"
+ android:keyLabel="@string/label_phone_key"
+ 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:isRepeatable="true" />
+ <Key
+ android:codes="@integer/key_return"
+ android:keyIcon="@drawable/sym_bkeyboard_return"
+ android:keyWidth="20%p"
+ android:keyEdgeFlags="right" />
</Row>
-
</Keyboard>
diff --git a/java/res/xml/kbd_symbols.xml b/java/res/xml/kbd_symbols.xml
index fbdead6c32..ba5a30c937 100644
--- a/java/res/xml/kbd_symbols.xml
+++ b/java/res/xml/kbd_symbols.xml
@@ -18,145 +18,197 @@
*/
-->
-<Keyboard xmlns:android="http://schemas.android.com/apk/res/android"
+<Keyboard
+ xmlns:android="http://schemas.android.com/apk/res/android"
android:keyWidth="10%p"
android:horizontalGap="0px"
android:verticalGap="0px"
android:keyHeight="@dimen/key_height"
+>
+ <Row
+ android:rowEdgeFlags="top"
>
-
- <Row>
- <Key android:codes="49" android:keyLabel="1" android:keyEdgeFlags="left"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="¹½⅓¼⅛"
- />
- <Key android:codes="50" android:keyLabel="2"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="²⅔"
- />
- <Key android:codes="51" android:keyLabel="3"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="³¾⅜"
- />
- <Key android:codes="52" android:keyLabel="4"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="â´"
- />
- <Key android:codes="53" android:keyLabel="5"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="â…"
- />
- <Key android:codes="54" android:keyLabel="6"/>
- <Key android:codes="55" android:keyLabel="7"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="â…ž"
- />
- <Key android:codes="56" android:keyLabel="8"/>
- <Key android:codes="57" android:keyLabel="9"/>
- <Key android:codes="48" android:keyLabel="0"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="â¿âˆ…"
- android:keyEdgeFlags="right"/>
+ <Key
+ android:keyLabel="1"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="¹½⅓¼⅛"
+ android:keyEdgeFlags="left" />
+ <Key
+ android:keyLabel="2"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="²⅔" />
+ <Key
+ android:keyLabel="3"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="³¾⅜" />
+ <Key
+ android:keyLabel="4"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="â´" />
+ <Key
+ android:keyLabel="5"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="â…" />
+ <Key
+ android:keyLabel="6" />
+ <Key
+ android:keyLabel="7"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="â…ž" />
+ <Key
+ android:keyLabel="8" />
+ <Key
+ android:keyLabel="9" />
+ <Key
+ android:keyLabel="0"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="â¿âˆ…"
+ android:keyEdgeFlags="right" />
</Row>
-
<Row>
- <Key android:codes="64" android:keyLabel="\@" android:keyEdgeFlags="left"/>
- <Key android:codes="35" android:keyLabel="\#"/>
- <Key android:codes="36" android:keyLabel="$"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="¢£€¥₣₤₱"
- />
- <Key android:codes="37" android:keyLabel="%"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="‰"
- />
- <Key android:codes="38" android:keyLabel="&"/>
- <Key android:codes="42" android:keyLabel="*"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="†‡★"
- />
- <Key android:codes="45" android:keyLabel="-"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="_–—"
- />
- <Key android:keyLabel="+"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="±"
- />
- <Key android:codes="40" android:keyLabel="("
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="[{<"
- />
- <Key android:codes="41" android:keyLabel=")" android:keyEdgeFlags="right"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="]}>"
- />
+ <Key
+ android:keyLabel="\@"
+ android:keyEdgeFlags="left" />
+ <Key
+ android:keyLabel="\#" />
+ <Key
+ android:keyLabel="$"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="¢£€¥₣₤₱" />
+ <Key
+ android:keyLabel="%"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="‰" />
+ <Key
+ android:keyLabel="&" />
+ <Key
+ android:keyLabel="*"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="†‡★" />
+ <Key
+ android:keyLabel="-"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="_–—" />
+ <Key
+ android:keyLabel="+"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="±" />
+ <Key
+ android:keyLabel="("
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="[{<" />
+ <Key
+ android:keyLabel=")"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="]}>"
+ android:keyEdgeFlags="right" />
</Row>
-
<Row>
- <Key android:codes="-1" android:keyLabel="@string/label_alt_key"
- android:keyWidth="15%p" android:isModifier="true"
- android:isSticky="true" android:keyEdgeFlags="left"/>
- <Key android:codes="33" android:keyLabel="!"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="¡"
- />
- <Key android:codes="34" android:keyLabel="""
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="“â€Â«Â»Ë"
- />
- <Key android:codes="39" android:keyLabel="\'"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="‘’"
- />
- <Key android:codes="58" android:keyLabel=":"/>
- <Key android:codes="59" android:keyLabel=";"/>
- <Key android:codes="47" android:keyLabel="/" />
- <Key android:codes="63" android:keyLabel="\?"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="¿"
- />
- <Key android:codes="-5" android:keyIcon="@drawable/sym_keyboard_delete" android:keyWidth="15%p" android:keyEdgeFlags="right"
- android:iconPreview="@drawable/sym_keyboard_feedback_delete"
- android:isRepeatable="true" android:isModifier="true"/>
+ <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" />
+ <Key
+ android:keyLabel="!"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="¡" />
+ <Key
+ android:keyLabel="""
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="“â€Â«Â»Ë" />
+ <Key
+ android:keyLabel="\'"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="‘’" />
+ <Key
+ android:keyLabel=":" />
+ <Key
+ android:keyLabel=";" />
+ <Key
+ android:keyLabel="/" />
+ <Key
+ android:keyLabel="\?"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android: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" />
</Row>
-
<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"/>
+ <Key
+ android:codes="@integer/key_symbol"
+ android:keyLabel="@string/label_alpha_key"
+ android:keyWidth="20%p"
+ android:isModifier="true"
+ android:keyEdgeFlags="left" />
+ <Key
+ android:codes="@integer/key_f1"
+ 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_symbols_with_settings_key"
android:rowEdgeFlags="bottom"
>
- <Key android:codes="-2" android:keyLabel="@string/label_alpha_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:isModifier="true"/>
- <Key android:codes="@integer/key_f1" android:isModifier="true"/>
- <Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space"
- android:keyWidth="30%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="25%p" android:keyEdgeFlags="right"
- android:iconPreview="@drawable/sym_keyboard_feedback_return"
- android:isModifier="true"/>
+ <Key
+ android:codes="@integer/key_symbol"
+ android:keyLabel="@string/label_alpha_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: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>
</Keyboard>
diff --git a/java/res/xml/kbd_symbols_black.xml b/java/res/xml/kbd_symbols_black.xml
index 3bf1397ae3..fbe86b42a0 100644
--- a/java/res/xml/kbd_symbols_black.xml
+++ b/java/res/xml/kbd_symbols_black.xml
@@ -18,142 +18,185 @@
*/
-->
-<Keyboard xmlns:android="http://schemas.android.com/apk/res/android"
+<Keyboard
+ xmlns:android="http://schemas.android.com/apk/res/android"
android:keyWidth="10%p"
android:horizontalGap="0px"
android:verticalGap="0px"
android:keyHeight="@dimen/key_height"
+>
+ <Row
+ android:rowEdgeFlags="top"
>
-
- <Row>
- <Key android:codes="49" android:keyLabel="1" android:keyEdgeFlags="left"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="¹½⅓¼⅛"
- />
- <Key android:codes="50" android:keyLabel="2"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="²⅔"
- />
- <Key android:codes="51" android:keyLabel="3"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="³¾⅜"
- />
- <Key android:codes="52" android:keyLabel="4"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="â´"
- />
- <Key android:codes="53" android:keyLabel="5"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="â…"
- />
- <Key android:codes="54" android:keyLabel="6"/>
- <Key android:codes="55" android:keyLabel="7"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="â…ž"
- />
- <Key android:codes="56" android:keyLabel="8"/>
- <Key android:codes="57" android:keyLabel="9"/>
- <Key android:codes="48" android:keyLabel="0"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="â¿âˆ…"
- android:keyEdgeFlags="right"/>
+ <Key
+ android:keyLabel="1"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="¹½⅓¼⅛"
+ android:keyEdgeFlags="left" />
+ <Key
+ android:keyLabel="2"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="²⅔" />
+ <Key
+ android:keyLabel="3"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="³¾⅜" />
+ <Key
+ android:keyLabel="4"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="â´" />
+ <Key
+ android:keyLabel="5"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="â…" />
+ <Key
+ android:keyLabel="6" />
+ <Key
+ android:keyLabel="7"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="â…ž" />
+ <Key
+ android:keyLabel="8" />
+ <Key
+ android:keyLabel="9" />
+ <Key
+ android:keyLabel="0"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="â¿âˆ…"
+ android:keyEdgeFlags="right" />
</Row>
-
<Row>
- <Key android:codes="64" android:keyLabel="\@" android:keyEdgeFlags="left"/>
- <Key android:codes="35" android:keyLabel="\#"/>
- <Key android:codes="36" android:keyLabel="$"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="¢£€¥₣₤₱"
- />
- <Key android:codes="37" android:keyLabel="%"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="‰"
- />
- <Key android:codes="38" android:keyLabel="&"/>
- <Key android:codes="42" android:keyLabel="*"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="†‡★"
- />
- <Key android:codes="45" android:keyLabel="-"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="_–—"
- />
- <Key android:keyLabel="+"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="±"
- />
- <Key android:codes="40" android:keyLabel="("
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="[{<"
- />
- <Key android:codes="41" android:keyLabel=")" android:keyEdgeFlags="right"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="]}>"
- />
+ <Key
+ android:keyLabel="\@"
+ android:keyEdgeFlags="left" />
+ <Key
+ android:keyLabel="\#" />
+ <Key
+ android:keyLabel="$"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="¢£€¥₣₤₱" />
+ <Key
+ android:keyLabel="%"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="‰" />
+ <Key
+ android:keyLabel="&" />
+ <Key
+ android:keyLabel="*"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="†‡★" />
+ <Key
+ android:keyLabel="-"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="_–—" />
+ <Key
+ android:keyLabel="+"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="±" />
+ <Key
+ android:keyLabel="("
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="[{<" />
+ <Key
+ android:keyLabel=")"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="]}>"
+ android:keyEdgeFlags="right" />
</Row>
-
<Row>
- <Key android:codes="-1" android:keyLabel="@string/label_alt_key"
- android:keyWidth="15%p" android:isModifier="true"
- android:isSticky="true" android:keyEdgeFlags="left"/>
- <Key android:codes="33" android:keyLabel="!"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="¡"
- />
- <Key android:codes="34" android:keyLabel="""
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="“â€Â«Â»Ë"
- />
- <Key android:codes="39" android:keyLabel="\'"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="‘’"
- />
- <Key android:codes="58" android:keyLabel=":"/>
- <Key android:codes="59" android:keyLabel=";"/>
- <Key android:codes="47" android:keyLabel="/" />
- <Key android:codes="63" android:keyLabel="\?"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="¿"
- />
- <Key android:codes="-5" android:keyIcon="@drawable/sym_bkeyboard_delete" android:keyWidth="15%p" android:keyEdgeFlags="right"
- android:iconPreview="@drawable/sym_keyboard_feedback_delete"
- android:isRepeatable="true"/>
+ <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" />
+ <Key
+ android:keyLabel="!"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="¡" />
+ <Key
+ android:keyLabel="""
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="“â€Â«Â»Ë" />
+ <Key
+ android:keyLabel="\'"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="‘’" />
+ <Key
+ android:keyLabel=":" />
+ <Key
+ android:keyLabel=";" />
+ <Key
+ android:keyLabel="/" />
+ <Key
+ android:keyLabel="\?"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="¿" />
+ <Key
+ android:codes="@integer/key_delete"
+ android:keyIcon="@drawable/sym_bkeyboard_delete"
+ android:iconPreview="@drawable/sym_keyboard_feedback_delete"
+ android:keyWidth="15%p"
+ android:isRepeatable="true"
+ android:keyEdgeFlags="right" />
</Row>
-
<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"/>
+ <Key
+ android:codes="@integer/key_symbol"
+ android:keyLabel="@string/label_alpha_key"
+ android:keyWidth="20%p"
+ android:keyEdgeFlags="left" />
+ <Key
+ android:codes="@integer/key_f1" />
+ <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_symbols_with_settings_key"
android:rowEdgeFlags="bottom"
>
- <Key android:codes="-2" android:keyLabel="@string/label_alpha_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:codes="@integer/key_f1"/>
- <Key android:codes="32" android:keyIcon="@drawable/sym_bkeyboard_space"
- android:keyWidth="30%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="25%p" android:keyEdgeFlags="right"
- android:iconPreview="@drawable/sym_keyboard_feedback_return"/>
+ <Key
+ android:codes="@integer/key_symbol"
+ android:keyLabel="@string/label_alpha_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:codes="@integer/key_f1" />
+ <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>
</Keyboard>
diff --git a/java/res/xml/kbd_symbols_shift.xml b/java/res/xml/kbd_symbols_shift.xml
index b72ea50e55..01c2beabf0 100644
--- a/java/res/xml/kbd_symbols_shift.xml
+++ b/java/res/xml/kbd_symbols_shift.xml
@@ -18,112 +18,174 @@
*/
-->
-<Keyboard xmlns:android="http://schemas.android.com/apk/res/android"
+<Keyboard
+ xmlns:android="http://schemas.android.com/apk/res/android"
android:keyWidth="10%p"
android:horizontalGap="0px"
android:verticalGap="0px"
android:keyHeight="@dimen/key_height"
+>
+ <Row
+ android:rowEdgeFlags="top"
>
-
- <Row>
- <Key android:keyLabel="~" android:keyEdgeFlags="left"/>
- <Key android:keyLabel="`"/>
- <Key android:keyLabel="|"/>
- <Key android:keyLabel="•"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="♪♥♠♦♣"
- />
- <Key android:keyLabel="√"/>
- <Key android:keyLabel="Ï€"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="Î "
- />
- <Key android:keyLabel="÷"/>
- <Key android:keyLabel="×"/>
- <Key android:keyLabel="{"/>
- <Key android:keyLabel="}" android:keyEdgeFlags="right"/>
+ <Key
+ android:keyLabel="~"
+ android:keyEdgeFlags="left" />
+ <Key
+ android:keyLabel="`" />
+ <Key
+ android:keyLabel="|" />
+ <Key
+ android:keyLabel="•"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="♪♥♠♦♣" />
+ <Key
+ android:keyLabel="√" />
+ <Key
+ android:keyLabel="Ï€"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="Î " />
+ <Key
+ android:keyLabel="÷" />
+ <Key
+ android:keyLabel="×" />
+ <Key
+ android:keyLabel="{" />
+ <Key
+ android:keyLabel="}"
+ android:keyEdgeFlags="right" />
</Row>
-
<Row>
- <Key android:codes="9" android:keyLabel="\u21E5" android:keyEdgeFlags="left"/>
- <Key android:keyLabel="£"/>
- <Key android:keyLabel="¢"/>
- <Key android:keyLabel="€"/>
- <Key android:keyLabel="°"/>
- <Key android:keyLabel="^"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="↑↓â†â†’"
- />
- <Key android:keyLabel="_"/>
- <Key android:keyLabel="="
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="≠≈∞"
- />
- <Key android:keyLabel="["/>
- <Key android:keyLabel="]" android:keyEdgeFlags="right"/>
+ <Key
+ android:codes="@integer/key_tab"
+ android:keyLabel="\u21E5"
+ android:keyEdgeFlags="left" />
+ <Key
+ android:keyLabel="£" />
+ <Key
+ android:keyLabel="¢" />
+ <Key
+ android:keyLabel="€" />
+ <Key
+ android:keyLabel="°" />
+ <Key
+ android:keyLabel="^"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="↑↓â†â†’" />
+ <Key
+ android:keyLabel="_" />
+ <Key
+ android:keyLabel="="
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="≠≈∞" />
+ <Key
+ android:keyLabel="[" />
+ <Key
+ android:keyLabel="]"
+ android:keyEdgeFlags="right" />
</Row>
-
<Row>
- <Key android:codes="-1" android:keyLabel="@string/label_alt_key"
- android:keyWidth="15%p" android:isModifier="true"
- android:isSticky="true" android:keyEdgeFlags="left"/>
- <Key android:keyLabel="â„¢"/>
- <Key android:keyLabel="®"/>
- <Key android:keyLabel="©"/>
- <Key android:keyLabel="¶"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="§"
- />
- <Key android:keyLabel="\\"/>
- <Key android:keyLabel="<"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="≤«‹"
- />
- <Key android:keyLabel=">"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="≥»›"
- />
- <Key android:codes="-5" android:keyIcon="@drawable/sym_keyboard_delete" android:keyWidth="15%p" android:keyEdgeFlags="right"
- android:iconPreview="@drawable/sym_keyboard_feedback_delete"
- android:isRepeatable="true" android:isModifier="true"/>
+ <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" />
+ <Key
+ android:keyLabel="â„¢" />
+ <Key
+ android:keyLabel="®" />
+ <Key
+ android:keyLabel="©" />
+ <Key
+ android:keyLabel="¶"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="§" />
+ <Key
+ android:keyLabel="\\" />
+ <Key
+ android:keyLabel="<"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="≤«‹" />
+ <Key
+ android:keyLabel=">"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android: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" />
</Row>
-
<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"/>
+ <Key
+ android:codes="@integer/key_symbol"
+ android:keyLabel="@string/label_alpha_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: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_symbols_with_settings_key"
android:rowEdgeFlags="bottom"
>
- <Key android:codes="-2" android:keyLabel="@string/label_alpha_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:isModifier="true"/>
- <Key android:keyLabel="„" android:isModifier="true"/>
- <Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space"
- android:keyWidth="30%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="25%p" android:keyEdgeFlags="right"
- android:iconPreview="@drawable/sym_keyboard_feedback_return"
- android:isModifier="true"/>
+ <Key
+ android:codes="@integer/key_symbol"
+ android:keyLabel="@string/label_alpha_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: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>
</Keyboard>
diff --git a/java/res/xml/kbd_symbols_shift_black.xml b/java/res/xml/kbd_symbols_shift_black.xml
index b52c9d1765..73b59c9a63 100644
--- a/java/res/xml/kbd_symbols_shift_black.xml
+++ b/java/res/xml/kbd_symbols_shift_black.xml
@@ -18,109 +18,162 @@
*/
-->
-<Keyboard xmlns:android="http://schemas.android.com/apk/res/android"
+<Keyboard
+ xmlns:android="http://schemas.android.com/apk/res/android"
android:keyWidth="10%p"
android:horizontalGap="0px"
android:verticalGap="0px"
android:keyHeight="@dimen/key_height"
+>
+ <Row
+ android:rowEdgeFlags="top"
>
-
- <Row>
- <Key android:keyLabel="~" android:keyEdgeFlags="left"/>
- <Key android:keyLabel="`"/>
- <Key android:keyLabel="|"/>
- <Key android:keyLabel="•"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="♪♥♠♦♣"
- />
- <Key android:keyLabel="√"/>
- <Key android:keyLabel="Ï€"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="Î "
- />
- <Key android:keyLabel="÷"/>
- <Key android:keyLabel="×"/>
- <Key android:keyLabel="{"/>
- <Key android:keyLabel="}" android:keyEdgeFlags="right"/>
+ <Key
+ android:keyLabel="~"
+ android:keyEdgeFlags="left" />
+ <Key
+ android:keyLabel="`" />
+ <Key
+ android:keyLabel="|" />
+ <Key
+ android:keyLabel="•"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="♪♥♠♦♣" />
+ <Key
+ android:keyLabel="√" />
+ <Key
+ android:keyLabel="Ï€"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="Î " />
+ <Key
+ android:keyLabel="÷" />
+ <Key
+ android:keyLabel="×" />
+ <Key
+ android:keyLabel="{" />
+ <Key
+ android:keyLabel="}"
+ android:keyEdgeFlags="right" />
</Row>
-
<Row>
- <Key android:codes="9" android:keyLabel="\u21E5" android:keyEdgeFlags="left"/>
- <Key android:keyLabel="£"/>
- <Key android:keyLabel="¢"/>
- <Key android:keyLabel="€"/>
- <Key android:keyLabel="°"/>
- <Key android:keyLabel="^"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="↑↓â†â†’"
- />
- <Key android:keyLabel="_"/>
- <Key android:keyLabel="="
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="≠≈∞"
- />
- <Key android:keyLabel="["/>
- <Key android:keyLabel="]" android:keyEdgeFlags="right"/>
+ <Key
+ android:codes="@integer/key_tab"
+ android:keyLabel="\u21E5"
+ android:keyEdgeFlags="left" />
+ <Key
+ android:keyLabel="£" />
+ <Key
+ android:keyLabel="¢" />
+ <Key
+ android:keyLabel="€" />
+ <Key
+ android:keyLabel="°" />
+ <Key
+ android:keyLabel="^"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="↑↓â†â†’" />
+ <Key
+ android:keyLabel="_" />
+ <Key
+ android:keyLabel="="
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="≠≈∞" />
+ <Key
+ android:keyLabel="[" />
+ <Key
+ android:keyLabel="]"
+ android:keyEdgeFlags="right" />
</Row>
-
<Row>
- <Key android:codes="-1" android:keyLabel="@string/label_alt_key"
- android:keyWidth="15%p" android:isModifier="true"
- android:isSticky="true" android:keyEdgeFlags="left"/>
- <Key android:keyLabel="â„¢"/>
- <Key android:keyLabel="®"/>
- <Key android:keyLabel="©"/>
- <Key android:keyLabel="¶"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="§"
- />
- <Key android:keyLabel="\\"/>
- <Key android:keyLabel="<"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="≤«‹"
- />
- <Key android:keyLabel=">"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="≥»›"
- />
- <Key android:codes="-5" android:keyIcon="@drawable/sym_bkeyboard_delete" android:keyWidth="15%p" android:keyEdgeFlags="right"
- android:iconPreview="@drawable/sym_keyboard_feedback_delete"
- android:isRepeatable="true"/>
+ <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" />
+ <Key
+ android:keyLabel="â„¢" />
+ <Key
+ android:keyLabel="®" />
+ <Key
+ android:keyLabel="©" />
+ <Key
+ android:keyLabel="¶"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="§" />
+ <Key
+ android:keyLabel="\\" />
+ <Key
+ android:keyLabel="<"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="≤«‹" />
+ <Key
+ android:keyLabel=">"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="≥»›" />
+ <Key
+ android:codes="@integer/key_delete"
+ android:keyIcon="@drawable/sym_bkeyboard_delete"
+ android:iconPreview="@drawable/sym_keyboard_feedback_delete"
+ android:keyWidth="15%p"
+ android:isRepeatable="true"
+ android:keyEdgeFlags="right" />
</Row>
-
<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" />
+ <Key
+ android:codes="@integer/key_symbol"
+ android:keyLabel="@string/label_alpha_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="…" />
+ <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_symbols_with_settings_key"
android:rowEdgeFlags="bottom"
>
- <Key android:codes="-2" android:keyLabel="@string/label_alpha_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="32" android:keyIcon="@drawable/sym_bkeyboard_space"
- android:keyWidth="30%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="25%p" android:keyEdgeFlags="right"
- android:iconPreview="@drawable/sym_keyboard_feedback_return" />
+ <Key
+ android:codes="@integer/key_symbol"
+ android:keyLabel="@string/label_alpha_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="…" />
+ <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>
</Keyboard>
diff --git a/java/res/xml/popup_domains.xml b/java/res/xml/popup_domains.xml
index b733fe24ff..0f7d97691b 100644
--- a/java/res/xml/popup_domains.xml
+++ b/java/res/xml/popup_domains.xml
@@ -18,21 +18,29 @@
*/
-->
-<Keyboard xmlns:android="http://schemas.android.com/apk/res/android"
+<Keyboard
+ xmlns:android="http://schemas.android.com/apk/res/android"
android:keyWidth="15%p"
android:horizontalGap="0px"
android:verticalGap="0px"
android:keyHeight="@dimen/key_height"
+>
+ <Row
+ android:rowEdgeFlags="top|bottom"
>
-
- <Row android:rowEdgeFlags="top|bottom">
- <Key android:keyLabel="@string/popular_domain_1"
- android:keyOutputText="@string/popular_domain_1" android:keyEdgeFlags="left" />
- <Key android:keyLabel="@string/popular_domain_2"
- android:keyOutputText="@string/popular_domain_2"/>
- <Key android:keyLabel="@string/popular_domain_3"
- android:keyOutputText="@string/popular_domain_3"/>
- <Key android:keyLabel="@string/popular_domain_4"
- android:keyOutputText="@string/popular_domain_4" android:keyEdgeFlags="right" />
+ <Key
+ android:keyLabel="@string/popular_domain_1"
+ android:keyOutputText="@string/popular_domain_1"
+ android:keyEdgeFlags="left" />
+ <Key
+ android:keyLabel="@string/popular_domain_2"
+ android:keyOutputText="@string/popular_domain_2" />
+ <Key
+ android:keyLabel="@string/popular_domain_3"
+ android:keyOutputText="@string/popular_domain_3" />
+ <Key
+ android:keyLabel="@string/popular_domain_4"
+ android:keyOutputText="@string/popular_domain_4"
+ android:keyEdgeFlags="right" />
</Row>
</Keyboard>
diff --git a/java/res/xml/popup_punctuation.xml b/java/res/xml/popup_punctuation.xml
index 7f88cd3e0d..ee1feabecd 100644
--- a/java/res/xml/popup_punctuation.xml
+++ b/java/res/xml/popup_punctuation.xml
@@ -18,29 +18,51 @@
*/
-->
-<Keyboard xmlns:android="http://schemas.android.com/apk/res/android"
+<Keyboard
+ xmlns:android="http://schemas.android.com/apk/res/android"
android:keyWidth="10%p"
android:horizontalGap="0px"
android:verticalGap="0px"
android:keyHeight="@dimen/key_height"
+>
+ <Row
+ android:rowEdgeFlags="top"
>
-
- <Row android:rowEdgeFlags="top">
- <Key android:keyLabel=":" android:keyEdgeFlags="left" />
- <Key android:keyLabel="/" />
- <Key android:keyLabel="&" />
- <Key android:keyLabel="(" />
- <Key android:keyLabel=")" />
- <Key android:keyLabel="-" />
- <Key android:keyLabel="+" android:keyEdgeFlags="right" />
+ <Key
+ android:keyLabel=":"
+ android:keyEdgeFlags="left" />
+ <Key
+ android:keyLabel="/" />
+ <Key
+ android:keyLabel="&" />
+ <Key
+ android:keyLabel="(" />
+ <Key
+ android:keyLabel=")" />
+ <Key
+ android:keyLabel="-" />
+ <Key
+ android:keyLabel="+"
+ android:keyEdgeFlags="right" />
</Row>
- <Row android:rowEdgeFlags="bottom">
- <Key android:keyLabel=";" android:keyEdgeFlags="left" />
- <Key android:keyLabel="\@" />
- <Key android:keyLabel="\'" />
- <Key android:keyLabel=""" />
- <Key android:keyLabel="\?" />
- <Key android:keyLabel="!" />
- <Key android:keyLabel="," android:keyEdgeFlags="right" />
+ <Row
+ android:rowEdgeFlags="bottom"
+ >
+ <Key
+ android:keyLabel=";"
+ android:keyEdgeFlags="left" />
+ <Key
+ android:keyLabel="\@" />
+ <Key
+ android:keyLabel="\'" />
+ <Key
+ android:keyLabel=""" />
+ <Key
+ android:keyLabel="\?" />
+ <Key
+ android:keyLabel="!" />
+ <Key
+ android:keyLabel=","
+ android:keyEdgeFlags="right" />
</Row>
</Keyboard>
diff --git a/java/res/xml/popup_smileys.xml b/java/res/xml/popup_smileys.xml
index 5663fefc8e..3b556da77e 100644
--- a/java/res/xml/popup_smileys.xml
+++ b/java/res/xml/popup_smileys.xml
@@ -18,32 +18,72 @@
*/
-->
-<Keyboard xmlns:android="http://schemas.android.com/apk/res/android"
+<Keyboard
+ xmlns:android="http://schemas.android.com/apk/res/android"
android:keyWidth="15%p"
android:horizontalGap="0px"
android:verticalGap="0px"
android:keyHeight="@dimen/key_height"
+>
+ <Row
+ android:rowEdgeFlags="top"
>
-
- <Row android:rowEdgeFlags="top">
- <Key android:keyLabel=":-)" android:keyOutputText=":-) " android:keyEdgeFlags="left" />
- <Key android:keyLabel=":-(" android:keyOutputText=":-( "/>
- <Key android:keyLabel=";-)" android:keyOutputText=";-) "/>
- <Key android:keyLabel=":-P" android:keyOutputText=":-P "/>
- <Key android:keyLabel="=-O" android:keyOutputText="=-O " android:keyEdgeFlags="right" />
+ <Key
+ android:keyLabel=":-)"
+ android:keyOutputText=":-) "
+ android:keyEdgeFlags="left" />
+ <Key
+ android:keyLabel=":-("
+ android:keyOutputText=":-( " />
+ <Key
+ android:keyLabel=";-)"
+ android:keyOutputText=";-) " />
+ <Key
+ android:keyLabel=":-P"
+ android:keyOutputText=":-P " />
+ <Key
+ android:keyLabel="=-O"
+ android:keyOutputText="=-O "
+ android:keyEdgeFlags="right" />
</Row>
<Row>
- <Key android:keyLabel=":-*" android:keyOutputText=":-* " android:keyEdgeFlags="left" />
- <Key android:keyLabel=":O" android:keyOutputText=":O "/>
- <Key android:keyLabel="B-)" android:keyOutputText="B-) "/>
- <Key android:keyLabel=":-$" android:keyOutputText=":-$ "/>
- <Key android:keyLabel=":-!" android:keyOutputText=":-! " android:keyEdgeFlags="right" />
+ <Key
+ android:keyLabel=":-*"
+ android:keyOutputText=":-* "
+ android:keyEdgeFlags="left" />
+ <Key
+ android:keyLabel=":O"
+ android:keyOutputText=":O " />
+ <Key
+ android:keyLabel="B-)"
+ android:keyOutputText="B-) " />
+ <Key
+ android:keyLabel=":-$"
+ android:keyOutputText=":-$ " />
+ <Key
+ android:keyLabel=":-!"
+ android:keyOutputText=":-! "
+ android:keyEdgeFlags="right" />
</Row>
- <Row android:rowEdgeFlags="bottom">
- <Key android:keyLabel=":-[" android:keyOutputText=":-[ " android:keyEdgeFlags="left" />
- <Key android:keyLabel="O:-)" android:keyOutputText="O:-) "/>
- <Key android:keyLabel=":-\\" android:keyOutputText=":-\\ "/>
- <Key android:keyLabel=":'(" android:keyOutputText=":'( "/>
- <Key android:keyLabel=":-D" android:keyOutputText=":-D " android:keyEdgeFlags="right" />
+ <Row
+ android:rowEdgeFlags="bottom"
+ >
+ <Key
+ android:keyLabel=":-["
+ android:keyOutputText=":-[ "
+ android:keyEdgeFlags="left" />
+ <Key
+ android:keyLabel="O:-)"
+ android:keyOutputText="O:-) " />
+ <Key
+ android:keyLabel=":-\\"
+ android:keyOutputText=":-\\ " />
+ <Key
+ android:keyLabel=":'("
+ android:keyOutputText=":'( " />
+ <Key
+ android:keyLabel=":-D"
+ android:keyOutputText=":-D "
+ android:keyEdgeFlags="right" />
</Row>
</Keyboard>
--
GitLab