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

Commit 4022a799 authored by satok's avatar satok Committed by Android (Google) Code Review
Browse files

Merge "Add subtype languages" into honeycomb

parents 89764ad4 be324535

java/res/drawable/ic_subtype_mic_it.png

0 → 100644
+2.5 KiB
Loading image diff...

java/res/drawable/ic_subtype_mic_nl.png

0 → 100644
+2.5 KiB
Loading image diff...

java/res/values/strings.xml

+4 −0
Original line number Diff line number Diff line
@@ -266,10 +266,14 @@ 
    <string name="subtype_mode_es_voice">Spanish Voice</string>

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

    <string name="subtype_mode_fr_voice">French Voice</string>

    <!-- Description for Italian voice input subtype [CHAR LIMIT=35] -->

    <string name="subtype_mode_it_voice">Italian Voice</string>

    <!-- Description for Japanese voice input subtype [CHAR LIMIT=35] -->

    <string name="subtype_mode_ja_voice">Japanese Voice</string>

    <!-- Description for Korean voice input subtype [CHAR LIMIT=35] -->

    <string name="subtype_mode_ko_voice">Korean Voice</string>

    <!-- Description for Dutch voice input subtype [CHAR LIMIT=35] -->

    <string name="subtype_mode_nl_voice">Dutch Voice</string>

    <!-- Description for Polish voice input subtype [CHAR LIMIT=35] -->

    <string name="subtype_mode_pl_voice">Polish Voice</string>

    <!-- Description for Portuguese voice input subtype [CHAR LIMIT=35] -->

java/res/xml/method.xml

+10 −0
Original line number Diff line number Diff line
@@ -154,6 +154,11 @@ 
            android:imeSubtypeLocale="fr"

            android:imeSubtypeMode="voice"

    />

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

            android:label="@string/subtype_mode_it_voice"

            android:imeSubtypeLocale="it"

            android:imeSubtypeMode="voice"

    />

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

            android:label="@string/subtype_mode_ko_voice"

            android:imeSubtypeLocale="ko"
@@ -164,6 +169,11 @@ 
            android:imeSubtypeLocale="ja"

            android:imeSubtypeMode="voice"

    />

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

            android:label="@string/subtype_mode_nl_voice"

            android:imeSubtypeLocale="nl"

            android:imeSubtypeMode="voice"

    />

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

            android:label="@string/subtype_mode_pl_voice"

            android:imeSubtypeLocale="pl"

java/src/com/android/inputmethod/latin/SubtypeSwitcher.java

+1 −1
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ import java.util.Locale; 
import java.util.Map;



public class SubtypeSwitcher {

    private static final boolean DBG = false;

    private static final boolean DBG = LatinImeLogger.sDBG;

    private static final String TAG = "SubtypeSwitcher";



    private static final char LOCALE_SEPARATER = '_';