Make Estonian keyboard Scandinavian variant

This change also fixes Scandinavian keyboard layout around "a" key.

Bug: 5627326
Change-Id: I65da7a56a28d90eabcffcd616164d8e8c1111c96
main
Tadashi G. Takaoka 2011-12-26 12:18:26 +09:00
parent 0d0f01da67
commit 6aa7fc0984
10 changed files with 56 additions and 5 deletions

View File

@ -28,6 +28,7 @@
<string name="more_keys_for_y">6,ý,ÿ</string> <string name="more_keys_for_y">6,ý,ÿ</string>
<string name="more_keys_for_d">ð</string> <string name="more_keys_for_d">ð</string>
<string name="more_keys_for_l">ł</string> <string name="more_keys_for_l">ł</string>
<string name="keylabel_for_scandinavia_row1_11">å</string>
<string name="keylabel_for_scandinavia_row2_10">æ</string> <string name="keylabel_for_scandinavia_row2_10">æ</string>
<string name="keylabel_for_scandinavia_row2_11">ø</string> <string name="keylabel_for_scandinavia_row2_11">ø</string>
<string name="more_keys_for_scandinavia_row2_10">ä</string> <string name="more_keys_for_scandinavia_row2_10">ä</string>

View File

@ -34,4 +34,9 @@
<string name="more_keys_for_k">ķ</string> <string name="more_keys_for_k">ķ</string>
<string name="more_keys_for_l">ļ,ł,ĺ,ľ</string> <string name="more_keys_for_l">ļ,ł,ĺ,ľ</string>
<string name="more_keys_for_g">ģ,ğ</string> <string name="more_keys_for_g">ģ,ğ</string>
<string name="keylabel_for_scandinavia_row1_11">ü</string>
<string name="keylabel_for_scandinavia_row2_10">ö</string>
<string name="keylabel_for_scandinavia_row2_11">ä</string>
<string name="more_keys_for_scandinavia_row2_10">õ</string>
<string name="more_keys_for_scandinavia_row2_11"></string>
</resources> </resources>

View File

@ -23,6 +23,7 @@
<string name="more_keys_for_u">7,ü</string> <string name="more_keys_for_u">7,ü</string>
<string name="more_keys_for_s">š,ß,ś</string> <string name="more_keys_for_s">š,ß,ś</string>
<string name="more_keys_for_z">ž,ź,ż</string> <string name="more_keys_for_z">ž,ź,ż</string>
<string name="keylabel_for_scandinavia_row1_11">å</string>
<string name="keylabel_for_scandinavia_row2_10">ö</string> <string name="keylabel_for_scandinavia_row2_10">ö</string>
<string name="keylabel_for_scandinavia_row2_11">ä</string> <string name="keylabel_for_scandinavia_row2_11">ä</string>
<string name="more_keys_for_scandinavia_row2_10">ø</string> <string name="more_keys_for_scandinavia_row2_10">ø</string>

View File

@ -22,6 +22,7 @@
<string name="more_keys_for_e">3,é,è,ê,ë,ę,ė,ē</string> <string name="more_keys_for_e">3,é,è,ê,ë,ę,ė,ē</string>
<string name="more_keys_for_o">9,ô,ò,ó,ö,õ,œ,ō</string> <string name="more_keys_for_o">9,ô,ò,ó,ö,õ,œ,ō</string>
<string name="more_keys_for_u">7,ü,û,ù,ú,ū</string> <string name="more_keys_for_u">7,ü,û,ù,ú,ū</string>
<string name="keylabel_for_scandinavia_row1_11">å</string>
<string name="keylabel_for_scandinavia_row2_10">ø</string> <string name="keylabel_for_scandinavia_row2_10">ø</string>
<string name="keylabel_for_scandinavia_row2_11">æ</string> <string name="keylabel_for_scandinavia_row2_11">æ</string>
<string name="more_keys_for_scandinavia_row2_10">ö</string> <string name="more_keys_for_scandinavia_row2_10">ö</string>

View File

@ -22,6 +22,7 @@
<string name="more_keys_for_o">9,œ,ô,ò,ó,õ,ō</string> <string name="more_keys_for_o">9,œ,ô,ò,ó,õ,ō</string>
<string name="more_keys_for_u">7,ü,û,ù,ú,ū</string> <string name="more_keys_for_u">7,ü,û,ù,ú,ū</string>
<string name="more_keys_for_s">ß,ś,š</string> <string name="more_keys_for_s">ß,ś,š</string>
<string name="keylabel_for_scandinavia_row1_11">å</string>
<string name="keylabel_for_scandinavia_row2_10">ö</string> <string name="keylabel_for_scandinavia_row2_10">ö</string>
<string name="keylabel_for_scandinavia_row2_11">ä</string> <string name="keylabel_for_scandinavia_row2_11">ä</string>
<string name="more_keys_for_scandinavia_row2_10">ø</string> <string name="more_keys_for_scandinavia_row2_10">ø</string>

View File

@ -38,6 +38,7 @@
<string name="more_keys_for_g"></string> <string name="more_keys_for_g"></string>
<string name="more_keys_for_p">0</string> <string name="more_keys_for_p">0</string>
<string name="more_keys_for_v"></string> <string name="more_keys_for_v"></string>
<string name="keylabel_for_scandinavia_row1_11"></string>
<string name="keylabel_for_scandinavia_row2_10"></string> <string name="keylabel_for_scandinavia_row2_10"></string>
<string name="keylabel_for_scandinavia_row2_11"></string> <string name="keylabel_for_scandinavia_row2_11"></string>
<string name="more_keys_for_scandinavia_row2_10"></string> <string name="more_keys_for_scandinavia_row2_10"></string>

View File

@ -0,0 +1,42 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
/*
**
** Copyright 2011, The Android Open Source Project
**
** Licensed under the Apache License, Version 2.0 (the "License");
** you may not use this file except in compliance with the License.
** You may obtain a copy of the License at
**
** http://www.apache.org/licenses/LICENSE-2.0
**
** Unless required by applicable law or agreed to in writing, software
** distributed under the License is distributed on an "AS IS" BASIS,
** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
** See the License for the specific language governing permissions and
** limitations under the License.
*/
-->
<KeyboardSet
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
latin:keyboardLocale="et">
<Element
latin:elementName="alphabet"
latin:elementKeyboard="@xml/kbd_scandinavian" />
<Element
latin:elementName="symbols"
latin:elementKeyboard="@xml/kbd_symbols" />
<Element
latin:elementName="symbolsShift"
latin:elementKeyboard="@xml/kbd_symbols_shift" />
<Element
latin:elementName="phone"
latin:elementKeyboard="@xml/kbd_phone" />
<Element
latin:elementName="phoneShift"
latin:elementKeyboard="@xml/kbd_phone_shift" />
<Element
latin:elementName="number"
latin:elementKeyboard="@xml/kbd_number" />
</KeyboardSet>

View File

@ -57,7 +57,7 @@
latin:keyLabel="p" latin:keyLabel="p"
latin:moreKeys="@string/more_keys_for_p" /> latin:moreKeys="@string/more_keys_for_p" />
<Key <Key
latin:keyLabel="å" /> latin:keyLabel="@string/keylabel_for_scandinavia_row1_11" />
<Key <Key
latin:keyStyle="deleteKeyStyle" latin:keyStyle="deleteKeyStyle"
latin:keyXPos="-10.0%p" latin:keyXPos="-10.0%p"

View File

@ -61,7 +61,7 @@
latin:keyLabel="p" latin:keyLabel="p"
latin:moreKeys="@string/more_keys_for_p" /> latin:moreKeys="@string/more_keys_for_p" />
<Key <Key
latin:keyLabel="å" /> latin:keyLabel="@string/keylabel_for_scandinavia_row1_11" />
<Key <Key
latin:keyStyle="deleteKeyStyle" latin:keyStyle="deleteKeyStyle"
latin:keyXPos="-11.500%p" latin:keyXPos="-11.500%p"

View File

@ -67,7 +67,7 @@
latin:keyHintLabel="0" latin:keyHintLabel="0"
latin:moreKeys="@string/more_keys_for_p" /> latin:moreKeys="@string/more_keys_for_p" />
<Key <Key
latin:keyLabel="å" latin:keyLabel="@string/keylabel_for_scandinavia_row1_11"
latin:keyWidth="fillRight" /> latin:keyWidth="fillRight" />
</Row> </Row>
<Row <Row
@ -75,8 +75,7 @@
> >
<Key <Key
latin:keyLabel="a" latin:keyLabel="a"
latin:moreKeys="@string/more_keys_for_a" latin:moreKeys="@string/more_keys_for_a" />
latin:keyWidth="8.75%p" />
<Key <Key
latin:keyLabel="s" latin:keyLabel="s"
latin:moreKeys="@string/more_keys_for_s" /> latin:moreKeys="@string/more_keys_for_s" />