aboutsummaryrefslogtreecommitdiffstats
path: root/java/res/xml
diff options
context:
space:
mode:
authorTadashi G. Takaoka <takaoka@google.com>2010-09-02 12:56:00 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-09-02 12:56:00 -0700
commit6c8109dc15a5f917c72e0d002968ea7b51abc2d8 (patch)
treef7bdd0d24c5c85b862bf490f65b31be2469710be /java/res/xml
parenta18e956f7aec76b4bebaecd3ce022520026fba48 (diff)
parenta723409acfe9a2c32be2c3a0d6e5be9a0dd82f00 (diff)
downloadlatinime-6c8109dc15a5f917c72e0d002968ea7b51abc2d8.tar.gz
latinime-6c8109dc15a5f917c72e0d002968ea7b51abc2d8.tar.xz
latinime-6c8109dc15a5f917c72e0d002968ea7b51abc2d8.zip
am a723409a: am f0fd5065: Merge "Add a number alternation to English popup mini keyboard" into gingerbread
Merge commit 'a723409acfe9a2c32be2c3a0d6e5be9a0dd82f00' * commit 'a723409acfe9a2c32be2c3a0d6e5be9a0dd82f00': Add a number alternation to English popup mini keyboard
Diffstat (limited to 'java/res/xml')
-rwxr-xr-xjava/res/xml/kbd_qwerty.xml21
-rwxr-xr-xjava/res/xml/kbd_qwerty_black.xml21
2 files changed, 32 insertions, 10 deletions
diff --git a/java/res/xml/kbd_qwerty.xml b/java/res/xml/kbd_qwerty.xml
index 0a0691dd1..0aeaf6cc7 100755
--- a/java/res/xml/kbd_qwerty.xml
+++ b/java/res/xml/kbd_qwerty.xml
@@ -29,18 +29,26 @@
>
<Row>
- <Key android:codes="113" android:keyLabel="q" android:keyEdgeFlags="left"/>
- <Key android:codes="119" android:keyLabel="w"/>
+ <Key android:codes="113" android:keyLabel="q" android:keyEdgeFlags="left"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="@string/alternates_for_q"
+ />
+ <Key android:codes="119" android:keyLabel="w"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="@string/alternates_for_w"
+ />
<Key android:codes="101" android:keyLabel="e"
android:popupKeyboard="@xml/kbd_popup_template"
android:popupCharacters="@string/alternates_for_e"
/>
<Key android:codes="114" android:keyLabel="r"
android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="@string/alternates_for_r"/>
+ android:popupCharacters="@string/alternates_for_r"
+ />
<Key android:codes="116" android:keyLabel="t"
android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="@string/alternates_for_t"/>
+ android:popupCharacters="@string/alternates_for_t"
+ />
<Key android:codes="121" android:keyLabel="y"
android:popupKeyboard="@xml/kbd_popup_template"
android:popupCharacters="@string/alternates_for_y"
@@ -57,7 +65,10 @@
android:popupKeyboard="@xml/kbd_popup_template"
android:popupCharacters="@string/alternates_for_o"
/>
- <Key android:codes="112" android:keyLabel="p" android:keyEdgeFlags="right"/>
+ <Key android:codes="112" android:keyLabel="p" android:keyEdgeFlags="right"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="@string/alternates_for_p"
+ />
</Row>
<Row>
diff --git a/java/res/xml/kbd_qwerty_black.xml b/java/res/xml/kbd_qwerty_black.xml
index 286547283..8b68d7500 100755
--- a/java/res/xml/kbd_qwerty_black.xml
+++ b/java/res/xml/kbd_qwerty_black.xml
@@ -26,18 +26,26 @@
>
<Row>
- <Key android:codes="113" android:keyLabel="q" android:keyEdgeFlags="left"/>
- <Key android:codes="119" android:keyLabel="w"/>
+ <Key android:codes="113" android:keyLabel="q" android:keyEdgeFlags="left"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="@string/alternates_for_q"
+ />
+ <Key android:codes="119" android:keyLabel="w"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="@string/alternates_for_w"
+ />
<Key android:codes="101" android:keyLabel="e"
android:popupKeyboard="@xml/kbd_popup_template"
android:popupCharacters="@string/alternates_for_e"
/>
<Key android:codes="114" android:keyLabel="r"
android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="@string/alternates_for_r"/>
+ android:popupCharacters="@string/alternates_for_r"
+ />
<Key android:codes="116" android:keyLabel="t"
android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="@string/alternates_for_t"/>
+ android:popupCharacters="@string/alternates_for_t"
+ />
<Key android:codes="121" android:keyLabel="y"
android:popupKeyboard="@xml/kbd_popup_template"
android:popupCharacters="@string/alternates_for_y"
@@ -54,7 +62,10 @@
android:popupKeyboard="@xml/kbd_popup_template"
android:popupCharacters="@string/alternates_for_o"
/>
- <Key android:codes="112" android:keyLabel="p" android:keyEdgeFlags="right"/>
+ <Key android:codes="112" android:keyLabel="p" android:keyEdgeFlags="right"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="@string/alternates_for_p"
+ />
</Row>
<Row>