Adds Spanish(US) Keyboard as an option for those who want an ñ-less keyboard

Change-Id: If488e78d3578c9ed2e34fd9173f9ef5405d56ef2

4 files changed, 39 insertions, 2 deletions

diff --git a/java/res/values/strings.xml b/java/res/values/strings.xml
index e00547a62..ce3490fe5 100644
--- a/java/res/values/strings.xml
+++ b/java/res/values/strings.xml
@@ -339,6 +339,8 @@
     <string name="subtype_en_GB">English (UK)</string>
     <!-- Description for English (United States) keyboard subtype [CHAR LIMIT=22] -->
     <string name="subtype_en_US">English (US)</string>
+    
+    <string name="subtype_es_US">Spanish (US)</string>
 
     <!-- Title of an option for usability study mode -->
     <string name="prefs_usability_study_mode">Usability study mode</string>
diff --git a/java/res/xml-es-rUS/kbd_qwerty.xml b/java/res/xml-es-rUS/kbd_qwerty.xml
new file mode 100644
index 000000000..d71935848
--- /dev/null
+++ b/java/res/xml-es-rUS/kbd_qwerty.xml
@@ -0,0 +1,28 @@
+<?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="es-US"
+>
+<include
+        latin:keyboardLayout="@xml/kbd_rows_qwerty" />
+
+</Keyboard>
diff --git a/java/res/xml-es/kbd_qwerty.xml b/java/res/xml-es/kbd_qwerty.xml
index 568f4d652..dfe80c98e 100644
--- a/java/res/xml-es/kbd_qwerty.xml
+++ b/java/res/xml-es/kbd_qwerty.xml
@@ -20,8 +20,9 @@
 
 <Keyboard
     xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
-    latin:keyboardLocale="es,es_US"
+    latin:keyboardLocale="es"
 >
-    <include
+<include
         latin:keyboardLayout="@xml/kbd_rows_spanish" />
+
 </Keyboard>
diff --git a/java/res/xml/method.xml b/java/res/xml/method.xml
index 959f1dbc6..a1363926e 100644
--- a/java/res/xml/method.xml
+++ b/java/res/xml/method.xml
@@ -82,6 +82,12 @@
             android:imeSubtypeExtraValue="AsciiCapable,SupportTouchPositionCorrection"
     />
     <subtype android:icon="@drawable/ic_subtype_keyboard"
+            android:label="@string/subtype_es_US"
+            android:imeSubtypeLocale="es-US"
+            android:imeSubtypeMode="keyboard"
+            android:imeSubtypeExtraValue="AsciiCapable,KeyboardLocale=es_US,SupportTouchPositionCorrection"
+    />
+    <subtype android:icon="@drawable/ic_subtype_keyboard"
             android:label="@string/subtype_generic"
             android:imeSubtypeLocale="fi"
             android:imeSubtypeMode="keyboard"