Add a number alternation to English popup mini keyboard

This change is only for English locale.  For other locales we should
need specification because keyboard layout and alternations are
different by locale.

Bug: 2959169
Change-Id: Ib63f53ce6c30d75eff78777aa0049b05d58ce55f

4 files changed, 71 insertions, 12 deletions

diff --git a/java/res/values-en/donottranslate.xml b/java/res/values-en/donottranslate.xml
new file mode 100644
index 000000000..f5692735a
--- /dev/null
+++ b/java/res/values-en/donottranslate.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2008, 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">
+    <!-- Accented forms of "e" -->
+    <string name="alternates_for_e">èéêë3</string>
+    <!-- Accented forms of "i" -->
+    <string name="alternates_for_i">ìíîï8</string>
+    <!-- Accented forms of "o" -->
+    <string name="alternates_for_o">òóôõöœø9</string>
+    <!-- Accented forms of "u" -->
+    <string name="alternates_for_u">ùúûü7</string>
+    <!-- Accented forms of "y" -->
+    <string name="alternates_for_y">ýÿ6</string>
+</resources>
diff --git a/java/res/values/donottranslate.xml b/java/res/values/donottranslate.xml
index b7bfd9c3a..97b645c4a 100644
--- a/java/res/values/donottranslate.xml
+++ b/java/res/values/donottranslate.xml
@@ -24,16 +24,22 @@
     <string name="sentence_separators">.,!?)</string>
     <!-- Symbols that are suggested between words -->
     <string name="suggested_punctuations">!?,\u0022\u0027:()-/@_</string>
+    <!-- Accented characters related to "q" -->
+    <string name="alternates_for_q">1</string>
+    <!-- Accented characters related to "w" -->
+    <string name="alternates_for_w">2</string>
     <!-- Accented characters related to "d" -->
     <string name="alternates_for_d"></string>
     <!-- Accented characters related to "r" -->
-    <string name="alternates_for_r"></string>
+    <string name="alternates_for_r">4</string>
     <!-- Accented characters related to "t" -->
-    <string name="alternates_for_t"></string>
+    <string name="alternates_for_t">5</string>
     <!-- Accented characters related to "z" -->
     <string name="alternates_for_z"></string>
     <!-- Accented characters related to "l" -->
     <string name="alternates_for_l"></string>
     <!-- Accented characters related to "g" -->
     <string name="alternates_for_g"></string>
+    <!-- Accented characters related to "p" -->
+    <string name="alternates_for_p">0</string>
 </resources>
diff --git a/java/res/xml/kbd_qwerty.xml b/java/res/xml/kbd_qwerty.xml
index 0a0691dd1..0aeaf6cc7 100755
--- a/java/res/xml/kbd_qwerty.xml
+++ b/java/res/xml/kbd_qwerty.xml
@@ -29,18 +29,26 @@
     >
 
     <Row>
-        <Key android:codes="113" android:keyLabel="q" android:keyEdgeFlags="left"/>
-        <Key android:codes="119" android:keyLabel="w"/>
+        <Key android:codes="113" android:keyLabel="q" android:keyEdgeFlags="left"
+                android:popupKeyboard="@xml/kbd_popup_template"
+                android:popupCharacters="@string/alternates_for_q"
+        />
+        <Key android:codes="119" android:keyLabel="w"
+                android:popupKeyboard="@xml/kbd_popup_template"
+                android:popupCharacters="@string/alternates_for_w"
+        />
         <Key android:codes="101" android:keyLabel="e"
                 android:popupKeyboard="@xml/kbd_popup_template"
                 android:popupCharacters="@string/alternates_for_e"
         />
         <Key android:codes="114" android:keyLabel="r"
                 android:popupKeyboard="@xml/kbd_popup_template"
-                android:popupCharacters="@string/alternates_for_r"/>
+                android:popupCharacters="@string/alternates_for_r"
+        />
         <Key android:codes="116" android:keyLabel="t"
                 android:popupKeyboard="@xml/kbd_popup_template"
-                android:popupCharacters="@string/alternates_for_t"/>
+                android:popupCharacters="@string/alternates_for_t"
+        />
         <Key android:codes="121" android:keyLabel="y"
                 android:popupKeyboard="@xml/kbd_popup_template"
                 android:popupCharacters="@string/alternates_for_y"
@@ -57,7 +65,10 @@
                 android:popupKeyboard="@xml/kbd_popup_template"
                 android:popupCharacters="@string/alternates_for_o"
         />
-        <Key android:codes="112" android:keyLabel="p" android:keyEdgeFlags="right"/>
+        <Key android:codes="112" android:keyLabel="p" android:keyEdgeFlags="right"
+                android:popupKeyboard="@xml/kbd_popup_template"
+                android:popupCharacters="@string/alternates_for_p"
+        />
     </Row>
 
     <Row>
diff --git a/java/res/xml/kbd_qwerty_black.xml b/java/res/xml/kbd_qwerty_black.xml
index 286547283..8b68d7500 100755
--- a/java/res/xml/kbd_qwerty_black.xml
+++ b/java/res/xml/kbd_qwerty_black.xml
@@ -26,18 +26,26 @@
     >
 
     <Row>
-        <Key android:codes="113" android:keyLabel="q" android:keyEdgeFlags="left"/>
-        <Key android:codes="119" android:keyLabel="w"/>
+        <Key android:codes="113" android:keyLabel="q" android:keyEdgeFlags="left"
+                android:popupKeyboard="@xml/kbd_popup_template"
+                android:popupCharacters="@string/alternates_for_q"
+        />
+        <Key android:codes="119" android:keyLabel="w"
+                android:popupKeyboard="@xml/kbd_popup_template"
+                android:popupCharacters="@string/alternates_for_w"
+        />
         <Key android:codes="101" android:keyLabel="e"
                 android:popupKeyboard="@xml/kbd_popup_template"
                 android:popupCharacters="@string/alternates_for_e"
         />
         <Key android:codes="114" android:keyLabel="r"
                 android:popupKeyboard="@xml/kbd_popup_template"
-                android:popupCharacters="@string/alternates_for_r"/>
+                android:popupCharacters="@string/alternates_for_r"
+        />
         <Key android:codes="116" android:keyLabel="t"
                 android:popupKeyboard="@xml/kbd_popup_template"
-                android:popupCharacters="@string/alternates_for_t"/>
+                android:popupCharacters="@string/alternates_for_t"
+        />
         <Key android:codes="121" android:keyLabel="y"
                 android:popupKeyboard="@xml/kbd_popup_template"
                 android:popupCharacters="@string/alternates_for_y"
@@ -54,7 +62,10 @@
                 android:popupKeyboard="@xml/kbd_popup_template"
                 android:popupCharacters="@string/alternates_for_o"
         />
-        <Key android:codes="112" android:keyLabel="p" android:keyEdgeFlags="right"/>
+        <Key android:codes="112" android:keyLabel="p" android:keyEdgeFlags="right"
+                android:popupKeyboard="@xml/kbd_popup_template"
+                android:popupCharacters="@string/alternates_for_p"
+        />
     </Row>
 
     <Row>