From f12023c7fbce8f76f3042b5f10fd9478533f1955 Mon Sep 17 00:00:00 2001
From: "Tadashi G. Takaoka" <takaoka@google.com>
Date: Fri, 12 Nov 2010 09:50:19 -0800
Subject: [PATCH] Add more symbol characters to popup mini-keyboard

Bug: 3124752
Change-Id: I6b6f5bfd57a58db7273c4db461095413892552ae
---
 java/res/xml-xlarge/kbd_symbols.xml       | 68 +++++++++++++++++------
 java/res/xml-xlarge/kbd_symbols_shift.xml | 34 +++++++++---
 2 files changed, 76 insertions(+), 26 deletions(-)

diff --git a/java/res/xml-xlarge/kbd_symbols.xml b/java/res/xml-xlarge/kbd_symbols.xml
index 53981513b..102853320 100644
--- a/java/res/xml-xlarge/kbd_symbols.xml
+++ b/java/res/xml-xlarge/kbd_symbols.xml
@@ -34,25 +34,39 @@
             latin:isModifier="true"
             latin:keyEdgeFlags="left" />
         <Key
-            latin:keyLabel="1" />
+            latin:keyLabel="1"
+            latin:popupKeyboard="@xml/kbd_popup_template"
+            latin:popupCharacters="¹½⅓¼⅛" />
         <Key
-            latin:keyLabel="2" />
+            latin:keyLabel="2"
+            latin:popupKeyboard="@xml/kbd_popup_template"
+            latin:popupCharacters="²⅔" />
         <Key
-            latin:keyLabel="3" />
+            latin:keyLabel="3"
+            latin:popupKeyboard="@xml/kbd_popup_template"
+            latin:popupCharacters="³¾⅜" />
         <Key
-            latin:keyLabel="4" />
+            latin:keyLabel="4"
+            latin:popupKeyboard="@xml/kbd_popup_template"
+            latin:popupCharacters="⁴" />
         <Key
-            latin:keyLabel="5" />
+            latin:keyLabel="5"
+            latin:popupKeyboard="@xml/kbd_popup_template"
+            latin:popupCharacters="⅝" />
         <Key
             latin:keyLabel="6" />
         <Key
-            latin:keyLabel="7" />
+            latin:keyLabel="7"
+            latin:popupKeyboard="@xml/kbd_popup_template"
+            latin:popupCharacters="⅞" />
         <Key
             latin:keyLabel="8" />
         <Key
             latin:keyLabel="9" />
         <Key
-            latin:keyLabel="0" />
+            latin:keyLabel="0"
+            latin:popupKeyboard="@xml/kbd_popup_template"
+            latin:popupCharacters="ⁿ∅" />
         <Key
             latin:codes="@integer/key_delete"
             latin:keyIcon="@drawable/sym_keyboard_delete"
@@ -74,21 +88,35 @@
         <Key
             latin:keyLabel="#" />
         <Key
-            latin:keyLabel="$" />
+            latin:keyLabel="$"
+            latin:popupKeyboard="@xml/kbd_popup_template"
+            latin:popupCharacters="¢£€¥₣₤₱" />
         <Key
-            latin:keyLabel="%" />
+            latin:keyLabel="%"
+            latin:popupKeyboard="@xml/kbd_popup_template"
+            latin:popupCharacters="‰" />
         <Key
             latin:keyLabel="&amp;" />
         <Key
-            latin:keyLabel="*" />
+            latin:keyLabel="*"
+            latin:popupKeyboard="@xml/kbd_popup_template"
+            latin:popupCharacters="†‡★" />
         <Key
-            latin:keyLabel="-" />
+            latin:keyLabel="-"
+            latin:popupKeyboard="@xml/kbd_popup_template"
+            latin:popupCharacters="_–—" />
         <Key
-            latin:keyLabel="+" />
+            latin:keyLabel="+"
+            latin:popupKeyboard="@xml/kbd_popup_template"
+            latin:popupCharacters="±" />
         <Key
-            latin:keyLabel="(" />
+            latin:keyLabel="("
+            latin:popupKeyboard="@xml/kbd_popup_template"
+            latin:popupCharacters="[{&lt;" />
         <Key
-            latin:keyLabel=")" />
+            latin:keyLabel=")"
+            latin:popupKeyboard="@xml/kbd_popup_template"
+            latin:popupCharacters="]}&gt;" />
         <Key
             latin:codes="@integer/key_return"
             latin:keyIcon="@drawable/sym_keyboard_return"
@@ -107,7 +135,9 @@
             latin:isSticky="true"
             latin:keyEdgeFlags="left" />
         <Key
-            latin:keyLabel="&quot;" />
+            latin:keyLabel="&quot;"
+            latin:popupKeyboard="@xml/kbd_popup_template"
+            latin:popupCharacters="“”«»˝" />
         <Key
             latin:keyLabel="\'" />
         <Key
@@ -121,9 +151,13 @@
         <Key
             latin:keyLabel="." />
         <Key
-            latin:keyLabel="!" />
+            latin:keyLabel="!"
+            latin:popupKeyboard="@xml/kbd_popup_template"
+            latin:popupCharacters="¡" />
         <Key
-            latin:keyLabel="\?" />
+            latin:keyLabel="\?"
+            latin:popupKeyboard="@xml/kbd_popup_template"
+            latin:popupCharacters="¿" />
         <Key
             latin:codes="@integer/key_shift"
             latin:keyLabel="@string/label_more_key"
diff --git a/java/res/xml-xlarge/kbd_symbols_shift.xml b/java/res/xml-xlarge/kbd_symbols_shift.xml
index b8f8136d3..d6de3a0cd 100644
--- a/java/res/xml-xlarge/kbd_symbols_shift.xml
+++ b/java/res/xml-xlarge/kbd_symbols_shift.xml
@@ -40,11 +40,15 @@
         <Key
             latin:keyLabel="|" />
         <Key
-            latin:keyLabel="•" />
+            latin:keyLabel="•"
+            latin:popupKeyboard="@xml/kbd_popup_template"
+            latin:popupCharacters="♪♥♠♦♣" />
         <Key
             latin:keyLabel="√" />
         <Key
-            latin:keyLabel="π" />
+            latin:keyLabel="π"
+            latin:popupKeyboard="@xml/kbd_popup_template"
+            latin:popupCharacters="Π" />
         <Key
             latin:keyLabel="÷" />
         <Key
@@ -78,11 +82,15 @@
         <Key
             latin:keyLabel="¥" />
         <Key
-            latin:keyLabel="^" />
-        <Key
+            latin:keyLabel="^"
+            latin:popupKeyboard="@xml/kbd_popup_template"
+            latin:popupCharacters="↑↓←→" />
+         <Key
             latin:keyLabel="_" />
         <Key
-            latin:keyLabel="=" />
+            latin:keyLabel="="
+            latin:popupKeyboard="@xml/kbd_popup_template"
+            latin:popupCharacters="≠≈∞" />
         <Key
             latin:keyLabel="±" />
         <Key
@@ -107,17 +115,25 @@
             latin:isSticky="true"
             latin:keyEdgeFlags="left" />
         <Key
-            latin:keyLabel="&lt;" />
+            latin:keyLabel="&lt;"
+            latin:popupKeyboard="@xml/kbd_popup_template"
+            latin:popupCharacters="≤«‹" />
         <Key
-            latin:keyLabel="&gt;" />
+            latin:keyLabel="&gt;"
+            latin:popupKeyboard="@xml/kbd_popup_template"
+            latin:popupCharacters="≥»›" />
         <Key
             latin:keyLabel="©" />
         <Key
-            latin:keyLabel="®" />
+            latin:keyLabel="®"
+            latin:popupKeyboard="@xml/kbd_popup_template"
+            latin:popupCharacters="™" />
         <Key
             latin:keyLabel="\\" />
         <Key
-            latin:keyLabel="°" />
+            latin:keyLabel="°"
+            latin:popupKeyboard="@xml/kbd_popup_template"
+            latin:popupCharacters="¶§" />
         <Key
             latin:keyLabel="∞" />
         <Key