commit c02a365485cb777137cbab8ff8f60c4b36fa0f7a
author Tadashi G. Takaoka <takaoka@google.com> Thu Aug 15 12:05:14 2013 +0900
committer Tadashi G. Takaoka <takaoka@google.com> Fri Aug 23 13:41:46 2013 +0900
tree 61eb79faca7607761451a7211fb7dca8bd3ffb8f
parent e1bd7e583d14a46d4d2d13371e9fbb9816cfb726

Remove symbols shifted layout

Bug: 9059539
Change-Id: I7fe6520e4eafcb7e1748b8bf011333c7e0da7ac2

java/res/xml/rowkeys_symbols2.xml

diff --git a/java/res/xml/rowkeys_symbols2.xml b/java/res/xml/rowkeys_symbols2.xml
index 3e27f15..9d629f1 100644
--- a/java/res/xml/rowkeys_symbols2.xml
+++ b/java/res/xml/rowkeys_symbols2.xml
@@ -43,8 +43,12 @@
                 latin:keyLabel="\#" />
         </default>
     </switch>
-    <Key
-        latin:keyStyle="currencyKeyStyle" />
+    <!-- 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:keyLabel="!text/keylabel_for_symbols_percent"
         latin:moreKeys="!text/more_keys_for_symbols_percent" />
@@ -53,15 +57,27 @@
     <Key
         latin:keyLabel="*"
         latin:moreKeys="!text/more_keys_for_star" />
-    <!-- U+2013: "–" EN DASH
-         U+2014: "—" EM DASH
-         U+00B7: "·" MIDDLE DOT -->
-    <Key
-        latin:keyLabel="-"
-        latin:moreKeys="_,&#x2013;,&#x2014;,&#x00B7;" />
-    <Key
+    <!-- U+00B1: "±" PLUS-MINUS SIGN
+         U+00D7: "×" MULTIPLICATION SIGN
+         U+00F7: "÷" DIVISION SIGN
+         U+221A: "√" SQUARE ROOT -->
+     <Key
         latin:keyLabel="+"
-        latin:moreKeys="!text/more_keys_for_plus" />
-    <include
-        latin:keyboardLayout="@xml/keys_parentheses" />
+        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" />
 </merge>