Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -3271,6 +3271,120 @@ public static String[] getTextsTable(final Locale locale) {
/* #166: "morekeys_cyrillic_yu" */ "\u044e\u0301",
};

private static final String[] TEXTS_sah = {
/* morekeys_a ~ */
null, null, null, null,
/* ~ morekeys_u */
// Label for "switch to alphabetic" key.
// U+0410: "А" CYRILLIC CAPITAL LETTER A
// U+0411: "Б" CYRILLIC CAPITAL LETTER BE
// U+0412: "В" CYRILLIC CAPITAL LETTER VE
/* keylabel_to_alpha */ "\u0410\u0411\u0412",
/* morekeys_i ~ */
null, null, null,
/* ~ morekeys_c */
/* double_quotes */ "!text/double_9qm_lqm",
/* morekeys_s */ null,
/* single_quotes */ "!text/single_9qm_lqm",
// U+20BD ₽ RUBLE SIGN
/* keyspec_currency ~ */ "\u20BD",
null, null, null, null, null, null, null, null, null, null,
/* ~ morekeys_k */
// U+0435 + U+0301: "е" CYRILLIC SMALL LETTER IE + ◌́ COMBINING ACUTE ACCENT
// U+0451: "ё" CYRILLIC SMALL LETTER IO
// U+0463: "ѣ" CYRILLIC SMALL LETTER YAT
/* morekeys_cyrillic_ie */ "\u0451,\u0435\u0301,\u0463",
/* keyspec_nordic_row1_11 ~ */
null, null, null, null,
/* ~ morekeys_nordic_row2_10 */
// U+0449: "щ" CYRILLIC SMALL LETTER SHCHA
/* keyspec_east_slavic_row1_9 */ "\u0449",
// U+044B: "ы" CYRILLIC SMALL LETTER YERU
/* keyspec_east_slavic_row2_2 */ "\u044B",
// U+044D: "э" CYRILLIC SMALL LETTER E
/* keyspec_east_slavic_row2_11 */ "\u044D",
// U+0438: "и" CYRILLIC SMALL LETTER I
/* keyspec_east_slavic_row3_5 */ "\u0438",
// U+044A: "ъ" CYRILLIC SMALL LETTER HARD SIGN
/* morekeys_cyrillic_soft_sign */ "\u044A",
null, null, null, null, null, null, null, null, null, null,/* #32-41 */
null, null, null, null, null, null, null, null, null, null,/* #42-51 */
null, null, null, null, null, null, null, null, null, null,/* #52-61 */
null, null, null, null, null, null, null, null, null, null,/* #62-71 */
null, null, null, null, null, null, null, null, null, null,/* #72-86 */
null, null, null, null, null,
// U+044B + U+0301: "ы" CYRILLIC SMALL LETTER YERU + ◌́ COMBINING ACUTE ACCENT
// U+A651: "ꙑ" CYRILLIC SMALL LETTER YERU WITH BACK YER
/* #87: morekeys_east_slavic_row2_2 */ "\u044B\u0301,\uA651",
// U+0443 + U+0301: "у" CYRILLIC SMALL LETTER U + ◌́ COMBINING ACUTE ACCENT
// U+045E: "ў" CYRILLIC SMALL LETTER SHORT U
/* morekeys_cyrillic_u */ "\u0443\u0301,\u045E",
/* morekeys_cyrillic_en */ null,
// U+0491: "ґ" CYRILLIC SMALL LETTER GHE WITH UPTURN
/* morekeys_cyrillic_ghe */ "\u0491",
// U+043E + U+0301: "о" CYRILLIC SMALL LETTER O + ◌́ COMBINING ACUTE ACCENT
/* #91: morekeys_cyrillic_o */ "\u043e\u0301",
// U+0438 + U+0301: "и" CYRILLIC SMALL LETTER I + ◌́ COMBINING ACUTE ACCENT
// U+0456: "і" CYRILLIC SMALL LETTER BYELORUSSIAN-UKRAINIAN I
// U+0457: "ї" CYRILLIC SMALL LETTER YI
/* morekeys_cyrillic_i */ "\u0438\u0301,\u0456,\u0457",
null, null, null, null, null, null, null, null, null, /* #93-101 */
null, null, null, null, null, null, null, null, null, null, /* #102-111 */
null, null, null, null, null, null, null, /* #112-118 */
// U+044D + U+0301: "э" CYRILLIC SMALL LETTER E + ◌́ COMBINING ACUTE ACCENT
// U+0454: "є" CYRILLIC SMALL LETTER UKRAINIAN IE
/* #119: morekeys_east_slavic_row2_11 */ "\u044d\u0301,\u0454",
/* #120: morekeys_cyrillic_ka */ null,
/* #121: morekeys_cyrillic_a */ "\u0430\u0301",
/* #122: "morekeys_currency_dollar" */ null,
/* #123: "morekeys_plus" */ null,
/* #124: "morekeys_less_than" */ null,
/* #125: "morekeys_greater_than" */ null,
/* #126: "morekeys_exclamation" */ null,
/* #127: "morekeys_currency_generic" */ null,
/* #128: "morekeys_symbols_1" */ null,
/* #129: "morekeys_symbols_2" */ null,
/* #130: "morekeys_symbols_3" */ null,
/* #131: "morekeys_symbols_4" */ null,
/* #132: "morekeys_symbols_5" */ null,
/* #133: "morekeys_symbols_6" */ null,
/* #134: "morekeys_symbols_7" */ null,
/* #135: "morekeys_symbols_8" */ null,
/* #136: "morekeys_symbols_9" */ null,
/* #137: "morekeys_symbols_0" */ null,
/* #138: "morekeys_am_pm" */ null,
/* #139: "keyspec_settings" */ null,
/* #140: "keyspec_action_next" */ null,
/* #141: "keyspec_action_previous" */ null,
/* #142: "keylabel_to_more_symbol" */ null,
/* #143: "keylabel_tablet_to_more_symbol" */ null,
/* #144: "keylabel_to_phone_numeric" */ null,
/* #145: "keylabel_to_phone_symbols" */ null,
/* #146: "keylabel_time_am" */ null,
/* #147: "keylabel_time_pm" */ null,
/* #148: "keyspecs_left_parenthesis_more_keys" */ null,
/* #149: "keyspecs_right_parenthesis_more_keys" */ null,
/* #150: "single_laqm_raqm" */ null,
/* #151: "single_raqm_laqm" */ null,
/* #152: "double_laqm_raqm" */ null,
/* #153: "double_raqm_laqm" */ null,
/* #154: "single_lqm_rqm" */ null,
/* #155: "single_9qm_lqm" */ null,
/* #156: "single_9qm_rqm" */ null,
/* #157: "single_rqm_9qm" */ null,
/* #158: "double_lqm_rqm" */ null,
/* #159: "double_9qm_lqm" */ null,
/* #160: "double_9qm_rqm" */ null,
/* #161: "double_rqm_9qm" */ null,
/* #162: "morekeys_single_quote" */ null,
/* #163: "morekeys_double_quote" */ null,
/* #164: "morekeys_tablet_double_quote" */ null,
// U+044F + U+0301: "я" CYRILLIC SMALL LETTER YA + ◌́ COMBINING ACUTE ACCENT
/* #165: "morekeys_cyrillic_ya" */ "\u044f\u0301",
// U+044E + U+0301: "ю" CYRILLIC SMALL LETTER YU + ◌́ COMBINING ACUTE ACCENT
/* #166: "morekeys_cyrillic_yu" */ "\u044e\u0301",
};

/* Locale si_LK: Sinhalese (Sri Lanka) */
private static final String[] TEXTS_si_LK = {
/* morekeys_a ~ */
Expand Down Expand Up @@ -4414,6 +4528,7 @@ public static String[] getTextsTable(final Locale locale) {
"rm" , TEXTS_rm, /* 1/ 2 Raeto-Romance */
"ro" , TEXTS_ro, /* 6/ 16 Romanian */
"ru" , TEXTS_ru, /* 9/ 32 Russian */
"sah" , TEXTS_sah, /* 9/ 32 Sakha */
"si_LK" , TEXTS_si_LK, /* 2/ 12 Sinhalese (Sri Lanka) */
"sk" , TEXTS_sk, /* 20/ 22 Slovak */
"sl" , TEXTS_sl, /* 8/ 20 Slovenian */
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,7 @@ private SubtypeLocaleUtils() {
private static final String LOCALE_ROMANIAN = "ro";
private static final String LOCALE_RUSSIAN = "ru";
private static final String LOCALE_SLOVAK = "sk";
private static final String LOCALE_SAKHA = "sah";
private static final String LOCALE_SLOVENIAN = "sl";
private static final String LOCALE_SERBIAN = "sr";
private static final String LOCALE_SERBIAN_LATIN = "sr_ZZ";
Expand Down Expand Up @@ -186,6 +187,7 @@ private SubtypeLocaleUtils() {
LOCALE_PORTUGUESE_PORTUGAL,
LOCALE_ROMANIAN,
LOCALE_RUSSIAN,
LOCALE_SAKHA,
LOCALE_SLOVAK,
LOCALE_SLOVENIAN,
LOCALE_SERBIAN,
Expand Down Expand Up @@ -244,6 +246,7 @@ public static List<String> getSupportedLocales() {
public static final String LAYOUT_NORDIC = "nordic";
public static final String LAYOUT_QWERTY = "qwerty";
public static final String LAYOUT_QWERTZ = "qwertz";
public static final String LAYOUT_SAKHA = "sakha";
public static final String LAYOUT_SERBIAN = "serbian";
public static final String LAYOUT_SERBIAN_QWERTZ = "serbian_qwertz";
public static final String LAYOUT_SPANISH = "spanish";
Expand Down Expand Up @@ -534,6 +537,8 @@ public List<Subtype> getSubtypes() {
addLayout(LAYOUT_NEPALI_ROMANIZED);
addLayout(LAYOUT_NEPALI_TRADITIONAL, R.string.subtype_traditional);
break;
case LOCALE_SAKHA:
addLayout(LAYOUT_SAKHA);
case LOCALE_SERBIAN:
addLayout(LAYOUT_SERBIAN);
break;
Expand Down
55 changes: 55 additions & 0 deletions app/src/main/res/xml-sw600dp/rows_sakha.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
<?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.
*/
-->

<merge
xmlns:latin="http://schemas.android.com/apk/res-auto"
>
<Row
latin:keyWidth="7.5%p"
>
<include
latin:keyboardLayout="@xml/rowkeys_east_slavic1" />
<Key
latin:keyStyle="deleteKeyStyle"
latin:keyWidth="fillRight" />
</Row>
<Row
latin:keyWidth="7.5%p"
>
<include
latin:keyboardLayout="@xml/rowkeys_east_slavic2" />
<Key
latin:keyStyle="enterKeyStyle"
latin:keyWidth="fillRight" />
</Row>
<Row
latin:keyWidth="7.3638%p"
>
<Key
latin:keyStyle="shiftKeyStyle"
latin:keyWidth="10.0%p" />
<include
latin:keyboardLayout="@xml/rowkeys_east_slavic3" />
<include
latin:keyboardLayout="@xml/keys_exclamation_question" />
</Row>
<include
latin:keyboardLayout="@xml/row_qwerty4" />
</merge>
38 changes: 38 additions & 0 deletions app/src/main/res/xml/kbd_sakha.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
<?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.
*/
-->

<switch xmlns:latin="http://schemas.android.com/apk/res-auto">
<case latin:showNumberRow="true">
<Keyboard
latin:verticalGap="@fraction/config_key_vertical_gap_5row"
latin:bonusHeight="@fraction/config_key_bonus_height_5row"
latin:rowHeight="20%p">
<include latin:keyboardLayout="@xml/key_styles_common" />
<include latin:keyboardLayout="@xml/row_qwerty0" />
<include latin:keyboardLayout="@xml/rows_sakha" />
</Keyboard>
</case>
<default>
<Keyboard>
<include latin:keyboardLayout="@xml/key_styles_common" />
<include latin:keyboardLayout="@xml/rows_sakha" />
</Keyboard>
</default>
</switch>
2 changes: 1 addition & 1 deletion app/src/main/res/xml/key_styles_currency.xml
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@
its unicode, although there is no font glyph for it as of November 2012. -->
<!-- TODO: The currency sign of Armenian Dram was created in 2012 and assigned U+058F for
its unicode, although there is no font glyph for it as of September 2013. -->
<case latin:languageCode="fa|hi|iw|he|lo|mn|ne|th|uk|ur|vi|ru">
<case latin:languageCode="fa|hi|iw|he|lo|mn|ne|th|uk|ur|vi|ru|sah">
<include latin:keyboardLayout="@xml/key_styles_currency_generic" />
</case>
<!-- si_LK: Sinhala (Sri Lanka) (Sri Lanka Rupee)
Expand Down
41 changes: 41 additions & 0 deletions app/src/main/res/xml/keyboard_layout_set_sakha.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
/*
**
** Copyright 2012, 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.
*/
-->

<KeyboardLayoutSet
xmlns:latin="http://schemas.android.com/apk/res-auto">
<Element
latin:elementName="alphabet"
latin:elementKeyboard="@xml/kbd_sakha" />
<Element
latin:elementName="symbols"
latin:elementKeyboard="@xml/kbd_symbols" />
<Element
latin:elementName="symbolsShifted"
latin:elementKeyboard="@xml/kbd_symbols_shift" />
<Element
latin:elementName="phone"
latin:elementKeyboard="@xml/kbd_phone" />
<Element
latin:elementName="phoneSymbols"
latin:elementKeyboard="@xml/kbd_phone_symbols" />
<Element
latin:elementName="number"
latin:elementKeyboard="@xml/kbd_number" />
</KeyboardLayoutSet>
Loading