From a33a4e345b409395e1ce43d91b2b18a2eee8b0e1 Mon Sep 17 00:00:00 2001
From: Satoshi Kataoka <satok@google.com>
Date: Fri, 6 Sep 2013 12:18:42 +0900
Subject: Rename key_space

Bug: 9059539
Change-Id: I0231ac53f8cf778d087cafeb5b3629b145cca9a9
---
 java/res/xml/key_space_30.xml       | 41 -------------------------------------
 java/res/xml/key_space_3kw.xml      | 41 +++++++++++++++++++++++++++++++++++++
 java/res/xml/row_symbols4.xml       |  2 +-
 java/res/xml/row_symbols_shift4.xml |  2 +-
 4 files changed, 43 insertions(+), 43 deletions(-)
 delete mode 100644 java/res/xml/key_space_30.xml
 create mode 100644 java/res/xml/key_space_3kw.xml

(limited to 'java')

diff --git a/java/res/xml/key_space_30.xml b/java/res/xml/key_space_30.xml
deleted file mode 100644
index 20ec882df..000000000
--- a/java/res/xml/key_space_30.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2013, 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"
->
-    <switch>
-        <case
-            latin:languageSwitchKeyEnabled="true"
-        >
-            <Key
-                latin:keyStyle="languageSwitchKeyStyle" />
-            <Key
-                latin:keyStyle="spaceKeyStyle"
-                latin:keyWidth="20%p" />
-        </case>
-        <!-- languageSwitchKeyEnabled="false" -->
-        <default>
-            <Key
-                latin:keyStyle="spaceKeyStyle"
-                latin:keyWidth="30%p" />
-        </default>
-    </switch>
-</merge>
diff --git a/java/res/xml/key_space_3kw.xml b/java/res/xml/key_space_3kw.xml
new file mode 100644
index 000000000..20ec882df
--- /dev/null
+++ b/java/res/xml/key_space_3kw.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2013, 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"
+>
+    <switch>
+        <case
+            latin:languageSwitchKeyEnabled="true"
+        >
+            <Key
+                latin:keyStyle="languageSwitchKeyStyle" />
+            <Key
+                latin:keyStyle="spaceKeyStyle"
+                latin:keyWidth="20%p" />
+        </case>
+        <!-- languageSwitchKeyEnabled="false" -->
+        <default>
+            <Key
+                latin:keyStyle="spaceKeyStyle"
+                latin:keyWidth="30%p" />
+        </default>
+    </switch>
+</merge>
diff --git a/java/res/xml/row_symbols4.xml b/java/res/xml/row_symbols4.xml
index 91d244a9f..72be06d6e 100644
--- a/java/res/xml/row_symbols4.xml
+++ b/java/res/xml/row_symbols4.xml
@@ -46,7 +46,7 @@
         </switch>
         <include
             latin:keyXPos="35%p"
-            latin:keyboardLayout="@xml/key_space_30" />
+            latin:keyboardLayout="@xml/key_space_3kw" />
         <include
             latin:keyboardLayout="@xml/keys_comma_period" />
         <Key
diff --git a/java/res/xml/row_symbols_shift4.xml b/java/res/xml/row_symbols_shift4.xml
index 7e83ef06c..9b71f6aa4 100644
--- a/java/res/xml/row_symbols_shift4.xml
+++ b/java/res/xml/row_symbols_shift4.xml
@@ -31,7 +31,7 @@
             latin:keyboardLayout="@xml/keys_less_greater" />
         <include
             latin:keyXPos="35%p"
-            latin:keyboardLayout="@xml/key_space_30" />
+            latin:keyboardLayout="@xml/key_space_3kw" />
         <include
             latin:keyboardLayout="@xml/keys_comma_period" />
         <Key
-- 
cgit v1.2.3-83-g751a