aboutsummaryrefslogtreecommitdiffstats
path: root/java
diff options
context:
space:
mode:
authorSteinar H. Gunderson <sesse@google.com>2010-08-17 14:53:55 +0200
committerSteinar H. Gunderson <sesse@google.com>2010-08-17 15:18:26 +0200
commit4b892a1daac6094a37ee20760de55fd01651ee99 (patch)
tree3521d54caa411f4a363357108ea1480d1a3c4f39 /java
parentc9a181b1b340012fbc8c32d23a3294364a7ad27b (diff)
downloadlatinime-4b892a1daac6094a37ee20760de55fd01651ee99.tar.gz
latinime-4b892a1daac6094a37ee20760de55fd01651ee99.tar.xz
latinime-4b892a1daac6094a37ee20760de55fd01651ee99.zip
Fix various modifier keys on the Norwegian keyboard.
There are some traditional differences between Norwegian and Swedish keyboard layouts -- for instance, few Norwegians would search for ü on the y key, but it is so on the Swedish keyboard. Correct the most obvious differences. Change-Id: Iab53fa51ff7faa2022b10b551e47060a6f2c5652
Diffstat (limited to 'java')
-rw-r--r--java/res/xml-nb/kbd_qwerty.xml12
-rw-r--r--java/res/xml-nb/kbd_qwerty_black.xml12
2 files changed, 10 insertions, 14 deletions
diff --git a/java/res/xml-nb/kbd_qwerty.xml b/java/res/xml-nb/kbd_qwerty.xml
index 554bb00eb..d2f0258c1 100644
--- a/java/res/xml-nb/kbd_qwerty.xml
+++ b/java/res/xml-nb/kbd_qwerty.xml
@@ -46,16 +46,16 @@
android:popupCharacters="ťþ"/>
<Key android:codes="121" android:keyLabel="y"
android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="ýÿü"/>
+ android:popupCharacters="ýÿ"/>
<Key android:codes="117" android:keyLabel="u"
android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="úùûū"/>
+ android:popupCharacters="üúùûū"/>
<Key android:codes="105" android:keyLabel="i"
android:popupKeyboard="@xml/kbd_popup_template"
android:popupCharacters="íìîï"/>
<Key android:codes="111" android:keyLabel="o"
android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="óòôõ"/>
+ android:popupCharacters="öóòôõ"/>
<Key android:codes="112" android:keyLabel="p"/>
<Key android:keyLabel="å"
android:keyWidth="8.75%p" android:keyEdgeFlags="right"/>
@@ -64,7 +64,7 @@
<Row>
<Key android:codes="97" android:keyLabel="a"
android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="áàâąã"
+ android:popupCharacters="äáàâąã"
android:keyWidth="8.75%p" android:keyEdgeFlags="left"/>
<Key android:codes="115" android:keyLabel="s"
android:popupKeyboard="@xml/kbd_popup_template"
@@ -82,10 +82,8 @@
android:popupCharacters="ł"/>
<Key android:keyLabel="ø"
android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="öœ"/>
+ android:popupCharacters="œ"/>
<Key android:keyLabel="æ"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="ä"
android:keyWidth="8.75%p" android:keyEdgeFlags="right"/>
</Row>
diff --git a/java/res/xml-nb/kbd_qwerty_black.xml b/java/res/xml-nb/kbd_qwerty_black.xml
index 9d4c52d38..150ff7fc7 100644
--- a/java/res/xml-nb/kbd_qwerty_black.xml
+++ b/java/res/xml-nb/kbd_qwerty_black.xml
@@ -46,16 +46,16 @@
android:popupCharacters="ťþ"/>
<Key android:codes="121" android:keyLabel="y"
android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="ýÿü"/>
+ android:popupCharacters="ýÿ"/>
<Key android:codes="117" android:keyLabel="u"
android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="úùûū"/>
+ android:popupCharacters="üúùûū"/>
<Key android:codes="105" android:keyLabel="i"
android:popupKeyboard="@xml/kbd_popup_template"
android:popupCharacters="íìîï"/>
<Key android:codes="111" android:keyLabel="o"
android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="óòôõ"/>
+ android:popupCharacters="öóòôõ"/>
<Key android:codes="112" android:keyLabel="p"/>
<Key android:keyLabel="å"
android:keyWidth="8.75%p" android:keyEdgeFlags="right"/>
@@ -64,7 +64,7 @@
<Row>
<Key android:codes="97" android:keyLabel="a"
android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="áàâąã"
+ android:popupCharacters="äáàâąã"
android:keyWidth="8.75%p" android:keyEdgeFlags="left"/>
<Key android:codes="115" android:keyLabel="s"
android:popupKeyboard="@xml/kbd_popup_template"
@@ -82,10 +82,8 @@
android:popupCharacters="ł"/>
<Key android:keyLabel="ø"
android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="öœ"/>
+ android:popupCharacters="œ"/>
<Key android:keyLabel="æ"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="ä"
android:keyWidth="8.75%p" android:keyEdgeFlags="right"/>
</Row>