Reorder keys around the spacebar

This CL reorders keys around the spacebar.
- On phone's symbols and symbols shift layout, the comma key is moved
  to the left of the spacebar to aligned with main layout.
- On tablet's layout, the comma key is moved to the left of the
  spacebar on all layout to aligned with the same layout of
  phone's. Also the comma key has "settings" as more keys.
- In Arabic and Perisan, the comma key of tablet already has some more keys
  This CL remove "/" and add "settings" instead.

Bug: 15281451
Change-Id: I6e0e75e4d4abfb1f356e7499be91424c7c57c58b

1 files changed, 54 insertions, 0 deletions

diff --git a/java/res/xml/key_styles_less_greater.xml b/java/res/xml/key_styles_less_greater.xml
new file mode 100644
index 000000000..db4c7984b
--- /dev/null
+++ b/java/res/xml/key_styles_less_greater.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2012, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+
+<merge
+    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+>
+    <!-- The less and greater keys' style which may have different label depending on locale. -->
+    <!-- Kept as a separate file for cleaner overriding by an overlay.  -->
+    <switch>
+        <case
+            latin:languageCode="fa"
+        >
+            <key-style
+                latin:styleName="lessKeyStyle"
+                latin:keySpec="!text/keyspec_left_double_angle_quote"
+                latin:backgroundType="functional"
+                latin:moreKeys="!text/morekeys_less_than" />
+            <key-style
+                latin:styleName="greaterKeyStyle"
+                latin:keySpec="!text/keyspec_right_double_angle_quote"
+                latin:backgroundType="functional"
+                latin:moreKeys="!text/morekeys_greater_than" />
+        </case>
+        <default>
+            <key-style
+                latin:styleName="lessKeyStyle"
+                latin:keySpec="!text/keyspec_less_than"
+                latin:backgroundType="functional"
+                latin:moreKeys="!text/morekeys_less_than" />
+            <key-style
+                latin:styleName="greaterKeyStyle"
+                latin:keySpec="!text/keyspec_greater_than"
+                latin:backgroundType="functional"
+                latin:moreKeys="!text/morekeys_greater_than" />
+        </default>
+    </switch>
+</merge>