Merge "Add German QWERTY keyboard"

java/res/values-de-rZZ/donottranslate-altchars.xml

@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2011, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="alternates_for_a">ä,â,à,á,æ,ã,å,ā</string>
+    <string name="alternates_for_e">3,ė</string>
+    <string name="alternates_for_o">9,ö,ô,ò,ó,õ,œ,ø,ō</string>
+    <string name="alternates_for_u">7,ü,û,ù,ú,ū</string>
+    <string name="alternates_for_s">ß,ś,š</string>
+    <string name="alternates_for_n">ñ,ń</string>
+    <string name="alternates_for_y">6</string>
+    <string name="alternates_for_z"></string>
+</resources>

java/res/values/donottranslate.xml

@@ -150,9 +150,11 @@
     <string-array name="subtype_locale_exception_keys">
         <item>en_US</item>
         <item>en_GB</item>
+        <item>de_ZZ</item>
     </string-array>
     <string-array name="subtype_locale_exception_values">
         <item>English (US)</item>
         <item>English (UK)</item>
+        <item>Deutsch (QWERTY)</item>
     </string-array>
 </resources>

java/res/values/strings.xml

@@ -252,6 +252,8 @@
     <string name="subtype_mode_da_keyboard">Danish Keyboard</string>
     <!-- Description for German keyboard subtype [CHAR LIMIT=35] -->
     <string name="subtype_mode_de_keyboard">German Keyboard</string>
+    <!-- Description for German QWERTY keyboard subtype [CHAR LIMIT=35] -->
+    <string name="subtype_mode_de_qwerty_keyboard">German QWERTY Keyboard</string>
     <!-- Description for English (United Kingdom) keyboard subtype [CHAR LIMIT=35] -->
     <string name="subtype_mode_en_GB_keyboard">English (UK) Keyboard</string>
     <!-- Description for English (United States) keyboard subtype [CHAR LIMIT=35] -->

java/res/xml-de-rZZ/kbd_qwerty.xml

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2011, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+
+<Keyboard
+    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    latin:keyboardLocale="de"
+>
+    <include
+        latin:keyboardLayout="@xml/kbd_rows_qwerty" />
+</Keyboard>

java/res/xml/method.xml

@@ -73,6 +73,11 @@
             android:imeSubtypeLocale="de"
             android:imeSubtypeMode="keyboard"
     />
+    <subtype android:icon="@drawable/ic_subtype_keyboard"
+            android:label="@string/subtype_mode_de_qwerty_keyboard"
+            android:imeSubtypeLocale="de_ZZ"
+            android:imeSubtypeMode="keyboard"
+    />
 <!--     <subtype android:icon="@drawable/ic_subtype_mic" -->
 <!--             android:label="@string/subtype_mode_de_voice" -->
 <!--             android:imeSubtypeLocale="de" -->