commit e491be6e8690ffb8359887838fa12d5873346be5
author Tadashi G. Takaoka <takaoka@google.com> Mon Mar 05 11:39:07 2012 +0900
committer Tadashi G. Takaoka <takaoka@google.com> Mon Mar 05 14:22:52 2012 +0900
tree 3612d6f703b6b328460e271bc318a8f3940ee464
parent 04bc787ce7ab0e6abd1eb6a6e75464bfaed5d626

Support embedded more key

This is a followup change to Ie10b3e0b.

Change-Id: I1f91d96e32357b83bd0546537d561d638b6ff0c6

java/res/xml/key_styles_number.xml

diff --git a/java/res/xml/key_styles_number.xml b/java/res/xml/key_styles_number.xml
index 3627836..1fc2169 100644
--- a/java/res/xml/key_styles_number.xml
+++ b/java/res/xml/key_styles_number.xml
@@ -41,14 +41,9 @@
         latin:styleName="numberKeyStyle"
         latin:keyLabelFlags="alignLeftOfCenter|hasHintLabel"
         latin:parentStyle="numKeyStyle" />
-    <!-- U+0030: "0" DIGIT ZERO
-         U+002B: "+" PLUS SIGN -->
     <key-style
         latin:styleName="num0KeyStyle"
-        latin:code="0x0030"
-        latin:altCode="0x002B"
-        latin:keyLabel="0 +"
-        latin:keyActionFlags="enableLongPress"
+        latin:keyLabel="0"
         latin:parentStyle="numberKeyStyle" />
     <key-style
         latin:styleName="num1KeyStyle"

java/res/xml/rows_number_normal.xml

diff --git a/java/res/xml/rows_number_normal.xml b/java/res/xml/rows_number_normal.xml
index 91b1fe9..6f9429c 100644
--- a/java/res/xml/rows_number_normal.xml
+++ b/java/res/xml/rows_number_normal.xml
@@ -111,13 +111,11 @@
             <case
                 latin:mode="datetime"
             >
-                <!-- U+002F: "/" SOLIDUS
-                     U+003A: ":" COLON -->
+                <!-- U+002F: "/" SOLIDUS -->
                 <Key
                     latin:code="0x002F"
-                    latin:altCode="0x003A"
                     latin:keyLabel="/ :"
-                    latin:keyActionFlags="enableLongPress"
+                    latin:moreKeys="!embeddedMoreKey!,:"
                     latin:keyStyle="numKeyStyle" />
             </case>
             <default>

java/res/xml/rows_phone.xml

diff --git a/java/res/xml/rows_phone.xml b/java/res/xml/rows_phone.xml
index 60296d0..630b24e 100644
--- a/java/res/xml/rows_phone.xml
+++ b/java/res/xml/rows_phone.xml
@@ -63,8 +63,12 @@
     <Row>
         <Key
             latin:keyStyle="numPhoneToSymbolKeyStyle" />
+        <!-- U+0030: "0" DIGIT ZERO -->
         <Key
-            latin:keyStyle="num0KeyStyle" />
+            latin:keyStyle="num0KeyStyle"
+            latin:code="0x0030"
+            latin:keyLabel="0 +"
+            latin:moreKeys="!embeddedMoreKey!,+" />
         <Key
             latin:keyStyle="numSpaceKeyStyle" />
         <Key