Add Dargwa(Urakhi) layout (#1127)

This commit is contained in:
Arsen Abdusalamov 2025-01-13 22:26:46 +03:00 committed by GitHub
parent 0076f04639
commit a4b07d6de2
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
7 changed files with 55 additions and 3 deletions

View file

@ -0,0 +1,35 @@
й
ц
у ӯ ӱ ý ӱ́
к ҟ ҝ ҡ
е ē ë е́ ë́
н
г ґ ғ ꚕ
ш
щ
з ҙ
х ҳ ẋ
ъ
ф
ы
в w
а ā ӓ á ӓ́
п ԥ
р ҏ
о о̄ ӧ ó ӧ́
л
д
ж җ
э э̄ э́
Ӏ
я я̄ я́ ǽ æ ǣ
ч ҹ
с
м
и ӣ и́
т ԏ
ь
б ҕ
ю ю́

View file

@ -190,7 +190,7 @@ object LocaleUtils {
fun getLocaleDisplayNameInLocale(locale: Locale, resources: Resources, displayLocale: Locale): String { fun getLocaleDisplayNameInLocale(locale: Locale, resources: Resources, displayLocale: Locale): String {
val languageTag = locale.toLanguageTag() val languageTag = locale.toLanguageTag()
if (languageTag == SubtypeLocaleUtils.NO_LANGUAGE) return resources.getString(R.string.subtype_no_language) if (languageTag == SubtypeLocaleUtils.NO_LANGUAGE) return resources.getString(R.string.subtype_no_language)
if (locale.script() != locale.language.constructLocale().script() || locale.language == "mns" || locale.language == "xdq") { if (locale.script() != locale.language.constructLocale().script() || locale.language == "mns" || locale.language == "xdq" || locale.language=="dru") {
val resId = resources.getIdentifier( val resId = resources.getIdentifier(
"subtype_${languageTag.replace("-", "_")}", "subtype_${languageTag.replace("-", "_")}",
"string", "string",

View file

@ -165,7 +165,7 @@ object ScriptUtils {
"ar", "ur", "fa" -> SCRIPT_ARABIC "ar", "ur", "fa" -> SCRIPT_ARABIC
"hy" -> SCRIPT_ARMENIAN "hy" -> SCRIPT_ARMENIAN
"bn" -> SCRIPT_BENGALI "bn" -> SCRIPT_BENGALI
"sr", "mk", "ru", "uk", "mn", "be", "kk", "ky", "bg", "xdq", "cv", "mhr", "mns" -> SCRIPT_CYRILLIC "sr", "mk", "ru", "uk", "mn", "be", "kk", "ky", "bg", "xdq", "cv", "mhr", "mns", "dru" -> SCRIPT_CYRILLIC
"ka" -> SCRIPT_GEORGIAN "ka" -> SCRIPT_GEORGIAN
"el" -> SCRIPT_GREEK "el" -> SCRIPT_GREEK
"iw" -> SCRIPT_HEBREW "iw" -> SCRIPT_HEBREW

View file

@ -60,6 +60,7 @@
<string name="subtype_with_layout_es_US">Испанский (США) (<xliff:g id="KEYBOARD_LAYOUT" example="QWERTY">%s</xliff:g>)</string> <string name="subtype_with_layout_es_US">Испанский (США) (<xliff:g id="KEYBOARD_LAYOUT" example="QWERTY">%s</xliff:g>)</string>
<string name="subtype_with_layout_hi_Latn">Хинглиш (<xliff:g id="KEYBOARD_LAYOUT" example="QWERTY">%s</xliff:g>)</string> <string name="subtype_with_layout_hi_Latn">Хинглиш (<xliff:g id="KEYBOARD_LAYOUT" example="QWERTY">%s</xliff:g>)</string>
<string name="subtype_with_layout_mns">Мансийский (<xliff:g id="KEYBOARD_LAYOUT" example="QWERTY">%s</xliff:g>)</string> <string name="subtype_with_layout_mns">Мансийский (<xliff:g id="KEYBOARD_LAYOUT" example="QWERTY">%s</xliff:g>)</string>
<string name="subtype_with_layout_dru">Урахинский (<xliff:g id="KEYBOARD_LAYOUT" example="QWERTY">%s</xliff:g>)</string>
<string name="subtype_with_layout_xdq">Кайтагский (<xliff:g id="KEYBOARD_LAYOUT" example="QWERTY">%s</xliff:g>)</string> <string name="subtype_with_layout_xdq">Кайтагский (<xliff:g id="KEYBOARD_LAYOUT" example="QWERTY">%s</xliff:g>)</string>
<string name="subtype_with_layout_sr_Latn">Сербский (<xliff:g id="KEYBOARD_LAYOUT" example="QWERTY">%s</xliff:g>)</string> <string name="subtype_with_layout_sr_Latn">Сербский (<xliff:g id="KEYBOARD_LAYOUT" example="QWERTY">%s</xliff:g>)</string>
<string name="subtype_generic_traditional"><xliff:g id="LANGUAGE_NAME" example="Непальский">%s</xliff:g> (Традиционная)</string> <string name="subtype_generic_traditional"><xliff:g id="LANGUAGE_NAME" example="Непальский">%s</xliff:g> (Традиционная)</string>
@ -153,6 +154,7 @@
<string name="settings_no_limit">Без ограничения</string> <string name="settings_no_limit">Без ограничения</string>
<string name="clipboard_history_retention_time">Время хранения журнала буфера обмена</string> <string name="clipboard_history_retention_time">Время хранения журнала буфера обмена</string>
<string name="subtype_with_layout_bn_BD"><xliff:g id="LANGUAGE_NAME" example="Бенгальский">%s</xliff:g> (Акхор)</string> <string name="subtype_with_layout_bn_BD"><xliff:g id="LANGUAGE_NAME" example="Бенгальский">%s</xliff:g> (Акхор)</string>
<string name="subtype_dru">Даргинский (Урахи)</string>
<string name="subtype_no_language_workman">Латиница (Workman)</string> <string name="subtype_no_language_workman">Латиница (Workman)</string>
<string name="key_borders">Контуры клавиш</string> <string name="key_borders">Контуры клавиш</string>
<string name="day_night_mode">Использовать тему системы</string> <string name="day_night_mode">Использовать тему системы</string>

View file

@ -15,6 +15,7 @@
<item>es-US</item> <item>es-US</item>
<item>hi-Latn</item> <item>hi-Latn</item>
<item>mns</item> <item>mns</item>
<item>dru</item>
<item>xdq</item> <item>xdq</item>
<item>sr-Latn</item> <item>sr-Latn</item>
</string-array> </string-array>
@ -23,11 +24,13 @@
<string-array name="subtype_locale_displayed_in_root_locale"> <string-array name="subtype_locale_displayed_in_root_locale">
<item>hi-Latn</item> <item>hi-Latn</item>
<item>mns</item> <item>mns</item>
<item>dru</item>
<item>xdq</item> <item>xdq</item>
<item>sr-Latn</item> <item>sr-Latn</item>
</string-array> </string-array>
<string name="subtype_in_root_locale_hi_Latn" translatable="false" tools:keep="@string/subtype_in_root_locale_hi_Latn">Hinglish</string> <string name="subtype_in_root_locale_hi_Latn" translatable="false" tools:keep="@string/subtype_in_root_locale_hi_Latn">Hinglish</string>
<string name="subtype_in_root_locale_mns" translatable="false" tools:keep="@string/subtype_in_root_locale_mns">Ма̄ньси</string> <string name="subtype_in_root_locale_mns" translatable="false" tools:keep="@string/subtype_in_root_locale_mns">Ма̄ньси</string>
<string name="subtype_in_root_locale_dru" translatable="false" tools:keep="@string/subtype_in_root_locale_dru">ХӀурухъла лугъат</string>
<string name="subtype_in_root_locale_xdq" translatable="false" tools:keep="@string/subtype_in_root_locale_xdq">Хайдаҡьан</string> <string name="subtype_in_root_locale_xdq" translatable="false" tools:keep="@string/subtype_in_root_locale_xdq">Хайдаҡьан</string>
<string name="subtype_in_root_locale_sr_Latn" translatable="false" tools:keep="@string/subtype_in_root_locale_sr_Latn">Srpski</string> <string name="subtype_in_root_locale_sr_Latn" translatable="false" tools:keep="@string/subtype_in_root_locale_sr_Latn">Srpski</string>

View file

@ -348,6 +348,8 @@
<!-- Description for Serbian (Latin) keyboard subtype with explicit keyboard layout [CHAR LIMIT=25] <!-- Description for Serbian (Latin) keyboard subtype with explicit keyboard layout [CHAR LIMIT=25]
This should be identical to subtype_sr_ZZ aside from the trailing (%s). --> This should be identical to subtype_sr_ZZ aside from the trailing (%s). -->
<string name="subtype_with_layout_mns" tools:keep="@string/subtype_with_layout_mns">Mansi (<xliff:g id="KEYBOARD_LAYOUT" example="QWERTY">%s</xliff:g>)</string> <string name="subtype_with_layout_mns" tools:keep="@string/subtype_with_layout_mns">Mansi (<xliff:g id="KEYBOARD_LAYOUT" example="QWERTY">%s</xliff:g>)</string>
<string name="subtype_dru">Dargwa (Urakhi)</string>
<string name="subtype_with_layout_dru" tools:keep="@string/subtype_with_layout_dru">Urakhi (<xliff:g id="KEYBOARD_LAYOUT" example="QWERTY">%s</xliff:g>)</string>
<string name="subtype_with_layout_xdq" tools:keep="@string/subtype_with_layout_xdq">Kaitag (<xliff:g id="KEYBOARD_LAYOUT" example="QWERTY">%s</xliff:g>)</string> <string name="subtype_with_layout_xdq" tools:keep="@string/subtype_with_layout_xdq">Kaitag (<xliff:g id="KEYBOARD_LAYOUT" example="QWERTY">%s</xliff:g>)</string>
<!-- Description for Serbian (Latin) keyboard subtype with explicit keyboard layout [CHAR LIMIT=25] <!-- Description for Serbian (Latin) keyboard subtype with explicit keyboard layout [CHAR LIMIT=25]
This should be identical to subtype_sr_ZZ aside from the trailing (%s). --> This should be identical to subtype_sr_ZZ aside from the trailing (%s). -->

View file

@ -25,6 +25,7 @@
cs: Czech/qwertz cs: Czech/qwertz
cv: Chuvash/chuvash cv: Chuvash/chuvash
da: Danish/qwerty+ da: Danish/qwerty+
dru: Dargwa (Urakhi)/dargwa_urakhi
de: German/qwertz de: German/qwertz
de_DE: German (Germany)/qwertz+ de_DE: German (Germany)/qwertz+
de_CH: German (Switzerland)/qwertz+ de_CH: German (Switzerland)/qwertz+
@ -667,6 +668,15 @@
android:imeSubtypeExtraValue="KeyboardLayoutSet=russian,EmojiCapable" android:imeSubtypeExtraValue="KeyboardLayoutSet=russian,EmojiCapable"
android:isAsciiCapable="false" android:isAsciiCapable="false"
/> />
<subtype android:icon="@drawable/ic_ime_switcher"
android:label="@string/subtype_dru"
android:subtypeId="0x0e7f02d3"
android:imeSubtypeLocale="dru"
android:languageTag="dru"
android:imeSubtypeMode="keyboard"
android:imeSubtypeExtraValue="KeyboardLayoutSet=dargwa_urakhi,EmojiCapable"
android:isAsciiCapable="false"
/>
<subtype android:icon="@drawable/ic_ime_switcher" <subtype android:icon="@drawable/ic_ime_switcher"
android:label="@string/subtype_xdq" android:label="@string/subtype_xdq"
android:subtypeId="0xa3f4d8e2" android:subtypeId="0xa3f4d8e2"