Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e6371769 authored by Tadashi G. Takaoka's avatar Tadashi G. Takaoka Committed by Android (Google) Code Review
Browse files

Merge "Add Finnish and Hungarian keyboard subtype"

parents 23eb0fa0 1b580e3f

java/res/values/strings.xml

+4 −0
Original line number Diff line number Diff line
@@ -258,12 +258,16 @@ 
    <string name="subtype_mode_en_US_keyboard">English (US) Keyboard</string>

    <!-- Description for Spanish keyboard subtype [CHAR LIMIT=35] -->

    <string name="subtype_mode_es_keyboard">Spanish Keyboard</string>

    <!-- Description for Finnish keyboard subtype [CHAR LIMIT=35] -->

    <string name="subtype_mode_fi_keyboard">Finnish Keyboard</string>

    <!-- Description for French keyboard subtype [CHAR LIMIT=35] -->

    <string name="subtype_mode_fr_keyboard">French Keyboard</string>

    <!-- Description for French (Canada) keyboard subtype [CHAR LIMIT=35] -->

    <string name="subtype_mode_fr_CA_keyboard">French (Canada) Keyboard</string>

    <!-- Description for French (Switzerland) keyboard subtype [CHAR LIMIT=35] -->

    <string name="subtype_mode_fr_CH_keyboard">French (Switzerland) Keyboard</string>

    <!-- Description for Hungarian keyboard subtype [CHAR LIMIT=35] -->

    <string name="subtype_mode_hu_keyboard">Hungarian Keyboard</string>

    <!-- Description for Hebrew keyboard subtype [CHAR LIMIT=35] -->

    <!-- Java uses the deprecated "iw" code instead of the standard "he" code -->

    <string name="subtype_mode_iw_keyboard">Hebrew Keyboard</string>

java/res/xml/method.xml

+11 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 
<!-- The attributes in this XML file provide configuration information -->

<!-- for the Input Method Manager. -->



<!-- Keyboard: en_US, en_GB, cs, da, de, es, es_US, fr, fr_CA, fr_CH, it, nb, nl, sr, sv -->

<!-- Keyboard: en_US, en_GB, ar, cs, da, de, es, es_US, fi, fr, fr_CA, fr_CH, hu, it, iw, nb, nl, pl, pt, ru, sr, sv -->

<!-- Voice: af, cs, da, de, en, es, fr, it, ja, ko, nl, pl, pt, ru, tr, yue, zh, zu -->

<!-- TODO: use <lang>_keyboard icon instead of a common keyboard icon. -->

<!-- TODO: use <lang>_mic icon instead of a common mic icon. -->
@@ -90,6 +90,11 @@ 
<!--             android:imeSubtypeMode="voice" -->

<!--             android:imeSubtypeExtraValue="excludeFromLastInputMethod,requireNetworkConnectivity" -->

<!--     /> -->

    <subtype android:icon="@drawable/ic_subtype_keyboard"

            android:label="@string/subtype_mode_fi_keyboard"

            android:imeSubtypeLocale="fi"

            android:imeSubtypeMode="keyboard"

    />

    <subtype android:icon="@drawable/ic_subtype_keyboard"

            android:label="@string/subtype_mode_fr_keyboard"

            android:imeSubtypeLocale="fr"
@@ -111,6 +116,11 @@ 
            android:imeSubtypeLocale="fr_CH"

            android:imeSubtypeMode="keyboard"

    />

    <subtype android:icon="@drawable/ic_subtype_keyboard"

            android:label="@string/subtype_mode_hu_keyboard"

            android:imeSubtypeLocale="hu"

            android:imeSubtypeMode="keyboard"

    />

    <subtype android:icon="@drawable/ic_subtype_keyboard"

            android:label="@string/subtype_mode_it_keyboard"

            android:imeSubtypeLocale="it"