From 0b6f6729d20bda26b0237a3762bb8f2d2e88fee0 Mon Sep 17 00:00:00 2001
From: "Tadashi G. Takaoka" <takaoka@google.com>
Date: Tue, 24 Apr 2012 14:25:27 +0900
Subject: [PATCH] Move functional keys out from rowkeys_symbols{_shift}3.

Change-Id: Iee5e7e93e5f319551a8ad28c58813c00fc713308
---
 java/res/xml/rowkeys_symbols3.xml       | 8 --------
 java/res/xml/rowkeys_symbols_shift3.xml | 8 --------
 java/res/xml/rows_symbols.xml           | 8 ++++++++
 java/res/xml/rows_symbols_shift.xml     | 8 ++++++++
 4 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/java/res/xml/rowkeys_symbols3.xml b/java/res/xml/rowkeys_symbols3.xml
index 294e94d31..0518c1954 100644
--- a/java/res/xml/rowkeys_symbols3.xml
+++ b/java/res/xml/rowkeys_symbols3.xml
@@ -21,10 +21,6 @@
 <merge
     xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
 >
-    <Key
-        latin:keyStyle="toMoreSymbolKeyStyle"
-        latin:keyWidth="15%p"
-        latin:visualInsetsRight="1%p" />
     <!-- U+00A1: "¡" INVERTED EXCLAMATION MARK -->
     <Key
         latin:keyLabel="!"
@@ -45,8 +41,4 @@
     <Key
         latin:keyLabel="!text/keylabel_for_symbols_question"
         latin:moreKeys="!text/more_keys_for_symbols_question" />
-    <Key
-        latin:keyStyle="deleteKeyStyle"
-        latin:keyWidth="fillRight"
-        latin:visualInsetsLeft="1%p" />
 </merge>
diff --git a/java/res/xml/rowkeys_symbols_shift3.xml b/java/res/xml/rowkeys_symbols_shift3.xml
index f5db0fee6..a35af218f 100644
--- a/java/res/xml/rowkeys_symbols_shift3.xml
+++ b/java/res/xml/rowkeys_symbols_shift3.xml
@@ -21,10 +21,6 @@
 <merge
     xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
 >
-    <Key
-        latin:keyStyle="backFromMoreSymbolKeyStyle"
-        latin:keyWidth="15%p"
-        latin:visualInsetsRight="1%p" />
     <!-- U+2122: "™" TRADE MARK SIGN -->
     <Key
         latin:keyLabel="&#x2122;" />
@@ -43,8 +39,4 @@
         latin:keyLabel="\\" />
     <include
         latin:keyboardLayout="@xml/keys_less_greater" />
-    <Key
-        latin:keyStyle="deleteKeyStyle"
-        latin:keyWidth="fillRight"
-        latin:visualInsetsLeft="1%p" />
 </merge>
diff --git a/java/res/xml/rows_symbols.xml b/java/res/xml/rows_symbols.xml
index 2a73ffbf9..bd1a57e75 100644
--- a/java/res/xml/rows_symbols.xml
+++ b/java/res/xml/rows_symbols.xml
@@ -40,8 +40,16 @@
     <Row
         latin:keyWidth="10%p"
     >
+        <Key
+            latin:keyStyle="toMoreSymbolKeyStyle"
+            latin:keyWidth="15%p"
+            latin:visualInsetsRight="1%p" />
         <include
             latin:keyboardLayout="@xml/rowkeys_symbols3" />
+        <Key
+            latin:keyStyle="deleteKeyStyle"
+            latin:keyWidth="fillRight"
+            latin:visualInsetsLeft="1%p" />
     </Row>
     <include
         latin:keyboardLayout="@xml/row_symbols4" />
diff --git a/java/res/xml/rows_symbols_shift.xml b/java/res/xml/rows_symbols_shift.xml
index 0ab9715c1..9c03d90b5 100644
--- a/java/res/xml/rows_symbols_shift.xml
+++ b/java/res/xml/rows_symbols_shift.xml
@@ -40,8 +40,16 @@
     <Row
         latin:keyWidth="10%p"
     >
+        <Key
+            latin:keyStyle="backFromMoreSymbolKeyStyle"
+            latin:keyWidth="15%p"
+            latin:visualInsetsRight="1%p" />
         <include
             latin:keyboardLayout="@xml/rowkeys_symbols_shift3" />
+        <Key
+            latin:keyStyle="deleteKeyStyle"
+            latin:keyWidth="fillRight"
+            latin:visualInsetsLeft="1%p" />
     </Row>
     <include
         latin:keyboardLayout="@xml/row_symbols_shift4" />