am 56169dcf: am 4022a799: Merge "Add subtype languages" into honeycomb

* commit '56169dcf6a4d0d84a0a3699427e2e593effec5bc':
  Add subtype languages

5 files changed, 15 insertions, 1 deletions

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 000000000..03c0b6982
--- /dev/null
+++ b/java/res/drawable/ic_subtype_mic_it.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 000000000..03c0b6982
--- /dev/null
+++ b/java/res/drawable/ic_subtype_mic_nl.png
diff --git a/java/res/values/strings.xml b/java/res/values/strings.xml
index 2d0797d49..a664aaf78 100644
--- a/java/res/values/strings.xml
+++ b/java/res/values/strings.xml
@@ -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] -->
diff --git a/java/res/xml/method.xml b/java/res/xml/method.xml
index 482b35f4c..aabc95874 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"
diff --git a/java/src/com/android/inputmethod/latin/SubtypeSwitcher.java b/java/src/com/android/inputmethod/latin/SubtypeSwitcher.java
index a9bd114f3..99d31d4d2 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.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 = '_';