commit be324535f63420a283d5eb4ed889052b2c941c31
author satok <satok@google.com> Thu Jan 20 01:08:13 2011 +0900
committer satok <satok@google.com> Thu Jan 20 01:15:09 2011 +0900
tree d2d777679ea066da09301185ad8001656f8a78b6
parent 08ca36d0383a7d222d58709f55c497f3432dc229

Add subtype languages

Change-Id: Ib251bd63f79281a4dc1739b213b16e8a936ea319

java/res/drawable/ic_subtype_mic_it.png

diff --git a/java/res/drawable/ic_subtype_mic_it.png b/java/res/drawable/ic_subtype_mic_it.png
new file mode 100644
index 0000000..03c0b69
--- /dev/null
+++ b/java/res/drawable/ic_subtype_mic_it.png
Binary files differ

java/res/drawable/ic_subtype_mic_nl.png

diff --git a/java/res/drawable/ic_subtype_mic_nl.png b/java/res/drawable/ic_subtype_mic_nl.png
new file mode 100644
index 0000000..03c0b69
--- /dev/null
+++ b/java/res/drawable/ic_subtype_mic_nl.png
Binary files differ

java/res/values/strings.xml

diff --git a/java/res/values/strings.xml b/java/res/values/strings.xml
index 6f0f2fb..9f83d9a 100644
--- a/java/res/values/strings.xml
+++ b/java/res/values/strings.xml
@@ -263,10 +263,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

diff --git a/java/res/xml/method.xml b/java/res/xml/method.xml
index 482b35f..aabc958 100644
--- a/java/res/xml/method.xml
+++ b/java/res/xml/method.xml
@@ -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

diff --git a/java/src/com/android/inputmethod/latin/SubtypeSwitcher.java b/java/src/com/android/inputmethod/latin/SubtypeSwitcher.java
index a9bd114..99d31d4 100644
--- a/java/src/com/android/inputmethod/latin/SubtypeSwitcher.java
+++ b/java/src/com/android/inputmethod/latin/SubtypeSwitcher.java
@@ -41,7 +41,7 @@
 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 = '_';