diff options
| author |   Ken Wakasa <kwakasa@google.com> | 2010-08-17 16:34:10 -0700 |
|---|---|---|
| committer |   Android (Google) Code Review <android-gerrit@google.com> | 2010-08-17 16:34:10 -0700 |
| commit | 540333635794ad9453a8127057a50acce17e462c (patch) | |
| tree | 59e52fd03ee51f4455ceaeb97715534ef32141dd /java | |
| parent | c20c5a8d4c29f52075a157098cf8d7192a45ac36 (diff) | |
| parent | 4b892a1daac6094a37ee20760de55fd01651ee99 (diff) | |
| download | latinime-540333635794ad9453a8127057a50acce17e462c.tar.gz latinime-540333635794ad9453a8127057a50acce17e462c.tar.xz latinime-540333635794ad9453a8127057a50acce17e462c.zip | |
Merge "Fix various modifier keys on the Norwegian keyboard."
Diffstat (limited to 'java')
| -rw-r--r-- | java/res/xml-nb/kbd_qwerty.xml | 12 | ||||
| -rw-r--r-- | java/res/xml-nb/kbd_qwerty_black.xml | 12 |
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> |