Separate Greek semicolon key from row
Change-Id: Ie568da868a0bed4f72652cf7475bdeb752be1f5b
diff --git a/java/res/xml-sw600dp/key_greek_semicolon.xml b/java/res/xml-sw600dp/key_greek_semicolon.xml
new file mode 100644
index 0000000..3f09419
--- /dev/null
+++ b/java/res/xml-sw600dp/key_greek_semicolon.xml
@@ -0,0 +1,29 @@
+<?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"
+>
+ <Key
+ latin:keyLabel=";"
+ latin:keyHintLabel=":"
+ latin:moreKeys=":"
+ latin:keyStyle="hasShiftedLetterHintStyle" />
+</merge>
diff --git a/java/res/xml-sw600dp/rowkeys_greek1.xml b/java/res/xml-sw600dp/rowkeys_greek1.xml
index cd77b02..4eb7732 100644
--- a/java/res/xml-sw600dp/rowkeys_greek1.xml
+++ b/java/res/xml-sw600dp/rowkeys_greek1.xml
@@ -21,12 +21,7 @@
<merge
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
- <Key
- latin:keyLabel=";"
- latin:keyHintLabel=":"
- latin:moreKeys=":"
- latin:keyStyle="hasShiftedLetterHintStyle" />
- <!-- TODO: Should find a way to compound Greek dialytika tonos and other Greek letters. -->
+ <!-- TODO: Should find a way to compound Greek dialytika tonos and other Greek letters. -->
<!--
<switch>
<case
diff --git a/java/res/xml-sw600dp/rows_greek.xml b/java/res/xml-sw600dp/rows_greek.xml
index 7c2567c..293451b 100644
--- a/java/res/xml-sw600dp/rows_greek.xml
+++ b/java/res/xml-sw600dp/rows_greek.xml
@@ -27,6 +27,8 @@
latin:keyWidth="9.0%p"
>
<include
+ latin:keyboardLayout="@xml/key_greek_semicolon" />
+ <include
latin:keyboardLayout="@xml/rowkeys_greek1" />
<Key
latin:keyStyle="deleteKeyStyle"
diff --git a/java/res/xml-sw768dp/rows_greek.xml b/java/res/xml-sw768dp/rows_greek.xml
index 88e436a..4e399aa 100644
--- a/java/res/xml-sw768dp/rows_greek.xml
+++ b/java/res/xml-sw768dp/rows_greek.xml
@@ -31,6 +31,8 @@
latin:keyLabelFlags="alignLeft"
latin:keyWidth="7.969%p" />
<include
+ latin:keyboardLayout="@xml/key_greek_semicolon" />
+ <include
latin:keyboardLayout="@xml/rowkeys_greek1" />
</Row>
<Row
diff --git a/java/res/xml/key_greek_semicolon.xml b/java/res/xml/key_greek_semicolon.xml
new file mode 100644
index 0000000..a28b772
--- /dev/null
+++ b/java/res/xml/key_greek_semicolon.xml
@@ -0,0 +1,42 @@
+<?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"
+>
+ <switch>
+ <case
+ latin:keyboardSetElement="alphabetManualShifted|alphabetShiftLockShifted"
+ >
+ <Key
+ latin:keyLabel=":"
+ latin:keyHintLabel="1"
+ latin:moreKeys=";"
+ latin:additionalMoreKeys="1" />
+ </case>
+ <default>
+ <Key
+ latin:keyLabel=";"
+ latin:keyHintLabel="1"
+ latin:moreKeys=":"
+ latin:additionalMoreKeys="1" />
+ </default>
+ </switch>
+</merge>
diff --git a/java/res/xml/rowkeys_greek1.xml b/java/res/xml/rowkeys_greek1.xml
index c0a5cb9..4df49f8 100644
--- a/java/res/xml/rowkeys_greek1.xml
+++ b/java/res/xml/rowkeys_greek1.xml
@@ -21,24 +21,6 @@
<merge
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
- <switch>
- <case
- latin:keyboardSetElement="alphabetManualShifted|alphabetShiftLockShifted"
- >
- <Key
- latin:keyLabel=":"
- latin:keyHintLabel="1"
- latin:moreKeys=";"
- latin:additionalMoreKeys="1" />
- </case>
- <default>
- <Key
- latin:keyLabel=";"
- latin:keyHintLabel="1"
- latin:moreKeys=":"
- latin:additionalMoreKeys="1" />
- </default>
- </switch>
<!-- TODO: Should find a way to compound Greek dialytika tonos and other Greek letters. -->
<!--
<switch>
diff --git a/java/res/xml/rows_greek.xml b/java/res/xml/rows_greek.xml
index e00b927..ca6d240 100644
--- a/java/res/xml/rows_greek.xml
+++ b/java/res/xml/rows_greek.xml
@@ -27,6 +27,8 @@
latin:keyWidth="10%p"
>
<include
+ latin:keyboardLayout="@xml/key_greek_semicolon" />
+ <include
latin:keyboardLayout="@xml/rowkeys_greek1" />
</Row>
<Row