commit e0502496da24e658124538bb0bd9a867e4c1d1c0
author Satoshi Kataoka <satok@google.com> Wed Sep 04 08:53:12 2013 +0000
committer Satoshi Kataoka <satok@google.com> Wed Sep 04 18:22:59 2013 +0900
tree 5fe1e769ecabc4cdfa024c75d89f8d13f80b0616
parent e3150664ae4d8d007b8571b5bd0fd2259aac3a20

Revert "Remove symbols shifted layout"

This reverts commit c02a365485cb777137cbab8ff8f60c4b36fa0f7a.

Change-Id: I11d31632469a594c0637f035bdd74ba60b2ac33e

java/res/xml/rowkeys_symbols2.xml

diff --git a/java/res/xml/rowkeys_symbols2.xml b/java/res/xml/rowkeys_symbols2.xml
index 9d629f1..3e27f15 100644
--- a/java/res/xml/rowkeys_symbols2.xml
+++ b/java/res/xml/rowkeys_symbols2.xml
@@ -43,12 +43,8 @@
                 latin:keyLabel="\#" />
         </default>
     </switch>
-    <!-- TODO: Remove key_currency.xml and uncomment the following definition. -->
-<!--     <Key -->
-<!--         latin:keyLabel="!text/keylabel_for_currency" -->
-<!--         latin:moreKeys="!text/more_keys_for_currency" /> -->
-    <include
-        latin:keyboardLayout="@xml/key_currency" />
+    <Key
+        latin:keyStyle="currencyKeyStyle" />
     <Key
         latin:keyLabel="!text/keylabel_for_symbols_percent"
         latin:moreKeys="!text/more_keys_for_symbols_percent" />
@@ -57,27 +53,15 @@
     <Key
         latin:keyLabel="*"
         latin:moreKeys="!text/more_keys_for_star" />
-    <!-- U+00B1: "±" PLUS-MINUS SIGN
-         U+00D7: "×" MULTIPLICATION SIGN
-         U+00F7: "÷" DIVISION SIGN
-         U+221A: "√" SQUARE ROOT -->
-     <Key
+    <!-- U+2013: "–" EN DASH
+         U+2014: "—" EM DASH
+         U+00B7: "·" MIDDLE DOT -->
+    <Key
+        latin:keyLabel="-"
+        latin:moreKeys="_,&#x2013;,&#x2014;,&#x00B7;" />
+    <Key
         latin:keyLabel="+"
-        latin:moreKeys="!text/more_keys_for_plus,&#x00B1;,&#x00D7;,&#x00F7;,&#x221A;" />
-    <!-- U+221E: "∞" INFINITY
-         U+2264: "≤" LESS-THAN OR EQUAL TO
-         U+2265: "≥" GREATER-THAN EQUAL TO
-         U+2260: "≠" NOT EQUAL TO
-         U+2248: "≈" ALMOST EQUAL TO -->
-    <Key
-        latin:keyLabel="="
-        latin:moreKeys="!fixedColumnOrder!5,&#x221E;,&#x2264;,&#x2265;,&#x2260;,&#x2248;" />
-    <Key
-        latin:keyLabel="("
-        latin:code="!code/key_left_parenthesis"
-        latin:moreKeys="!text/more_keys_for_left_parenthesis" />
-    <Key
-        latin:keyLabel=")"
-        latin:code="!code/key_right_parenthesis"
-        latin:moreKeys="!text/more_keys_for_right_parenthesis" />
+        latin:moreKeys="!text/more_keys_for_plus" />
+    <include
+        latin:keyboardLayout="@xml/keys_parentheses" />
 </merge>