Breakdown Greek keyboard into rows
Change-Id: I160c0e26058b3841b3820ec95b91d59b295339ca
diff --git a/java/res/xml/rows_greek.xml b/java/res/xml/rows_greek.xml
index 24b5c18..e00b927 100644
--- a/java/res/xml/rows_greek.xml
+++ b/java/res/xml/rows_greek.xml
@@ -26,138 +26,15 @@
<Row
latin:keyWidth="10%p"
>
- <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>
- <case
- latin:keyboardSetElement="alphabetManualShifted|alphabetShiftLockShifted"
- >
- U+0385: "΅" GREEK DIALYTIKA TONOS
- <Key
- latin:keyLabel="΅"
- latin:keyHintLabel="2"
- latin:additionalMoreKeys="2" />
- </case>
- <default>
- -->
- <!-- U+03C2: "ς" GREEK SMALL LETTER FINAL SIGMA -->
- <Key
- latin:keyLabel="ς"
- latin:keyLabelFlags="preserveCase"
- latin:keyHintLabel="2"
- latin:additionalMoreKeys="2" />
- <!--
- </default>
- </switch>
- -->
- <!-- U+03B5: "ε" GREEK SMALL LETTER EPSILON
- U+03AD: "έ" GREEK SMALL LETTER EPSILON WITH TONOS -->
- <Key
- latin:keyLabel="ε"
- latin:keyHintLabel="3"
- latin:additionalMoreKeys="3"
- latin:moreKeys="έ" />
- <!-- U+03C1: "ρ" GREEK SMALL LETTER RHO -->
- <Key
- latin:keyLabel="ρ"
- latin:keyHintLabel="4"
- latin:additionalMoreKeys="4" />
- <!-- U+03C4: "τ" GREEK SMALL LETTER TAU -->
- <Key
- latin:keyLabel="τ"
- latin:keyHintLabel="5"
- latin:additionalMoreKeys="5" />
- <!-- U+03C5: "υ" GREEK SMALL LETTER UPSILON
- U+03CD: "ύ" GREEK SMALL LETTER UPSILON WITH TONOS
- U+03CB: "ϋ" GREEK SMALL LETTER UPSILON WITH DIALYTIKA
- U+03B0: "ΰ" GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND TONOS -->
- <Key
- latin:keyLabel="υ"
- latin:keyHintLabel="6"
- latin:additionalMoreKeys="6"
- latin:moreKeys="ύ,ϋ,ΰ" />
- <!-- U+03B8: "θ" GREEK SMALL LETTER THETA -->
- <Key
- latin:keyLabel="θ"
- latin:keyHintLabel="7"
- latin:additionalMoreKeys="7" />
- <!-- U+03B9: "ι" GREEK SMALL LETTER IOTA
- U+03AF: "ί" GREEK SMALL LETTER IOTA WITH TONOS
- U+03CA: "ϊ" GREEK SMALL LETTER IOTA WITH DIALYTIKA
- U+0390: "ΐ" GREEK SMALL LETTER IOTA WITH DIALYTIKA AND TONOS -->
- <Key
- latin:keyLabel="ι"
- latin:keyHintLabel="8"
- latin:additionalMoreKeys="8"
- latin:moreKeys="ί,ϊ,ΐ" />
- <!-- U+03BF: "ο" GREEK SMALL LETTER OMICRON
- U+03CC: "ό" GREEK SMALL LETTER OMICRON WITH TONOS -->
- <Key
- latin:keyLabel="ο"
- latin:keyHintLabel="9"
- latin:additionalMoreKeys="9"
- latin:moreKeys="ό" />
- <!-- U+03C0: "π" GREEK SMALL LETTER PI -->
- <Key
- latin:keyLabel="π"
- latin:keyHintLabel="0"
- latin:additionalMoreKeys="0"
- latin:keyWidth="fillRight" />
+ <include
+ latin:keyboardLayout="@xml/rowkeys_greek1" />
</Row>
<Row
latin:keyWidth="10%p"
>
- <!-- U+03B1: "α" GREEK SMALL LETTER ALPHA
- U+03AC: "ά" GREEK SMALL LETTER ALPHA WITH TONOS -->
- <Key
- latin:keyLabel="α"
- latin:moreKeys="ά"
+ <include
+ latin:keyboardLayout="@xml/rowkeys_greek2"
latin:keyXPos="5%p" />
- <!-- U+03C3: "σ" GREEK SMALL LETTER SIGMA -->
- <Key
- latin:keyLabel="σ" />
- <!-- U+03B4: "δ" GREEK SMALL LETTER DELTA -->
- <Key
- latin:keyLabel="δ" />
- <!-- U+03C6: "φ" GREEK SMALL LETTER PHI -->
- <Key
- latin:keyLabel="φ" />
- <!-- U+03B3: "γ" GREEK SMALL LETTER GAMMA -->
- <Key
- latin:keyLabel="γ" />
- <!-- U+03B7: "η" GREEK SMALL LETTER ETA
- U+03AE: "ή" GREEK SMALL LETTER ETA WITH TONOS -->
- <Key
- latin:keyLabel="η"
- latin:moreKeys="ή" />
- <!-- U+03BE: "ξ" GREEK SMALL LETTER XI -->
- <Key
- latin:keyLabel="ξ" />
- <!-- U+03BA: "κ" GREEK SMALL LETTER KAPPA -->
- <Key
- latin:keyLabel="κ" />
- <!-- U+03BB: "λ" GREEK SMALL LETTER LAMDA -->
- <Key
- latin:keyLabel="λ" />
- <!-- Here is 5%p space -->
</Row>
<Row
latin:keyWidth="10%p"
@@ -166,34 +43,13 @@
latin:keyStyle="shiftKeyStyle"
latin:keyWidth="15%p"
latin:visualInsetsRight="1%p" />
- <!-- U+03B6: "ζ" GREEK SMALL LETTER ZETA -->
- <Key
- latin:keyLabel="ζ" />
- <!-- U+03C7: "χ" GREEK SMALL LETTER CHI -->
- <Key
- latin:keyLabel="χ" />
- <!-- U+03C8: "ψ" GREEK SMALL LETTER PSI -->
- <Key
- latin:keyLabel="ψ" />
- <!-- U+03C9: "ω" GREEK SMALL LETTER OMEGA
- U+03CE: "ώ" GREEK SMALL LETTER OMEGA WITH TONOS -->
- <Key
- latin:keyLabel="ω"
- latin:moreKeys="ώ" />
- <!-- U+03B2: "β" GREEK SMALL LETTER BETA -->
- <Key
- latin:keyLabel="β" />
- <!-- U+03BD: "ν" GREEK SMALL LETTER NU -->
- <Key
- latin:keyLabel="ν" />
- <!-- U+03BC: "μ" GREEK SMALL LETTER MU -->
- <Key
- latin:keyLabel="μ" />
+ <include
+ latin:keyboardLayout="@xml/rowkeys_greek3" />
<Key
latin:keyStyle="deleteKeyStyle"
latin:keyWidth="fillRight"
latin:visualInsetsLeft="1%p" />
</Row>
- <include
+ <include
latin:keyboardLayout="@xml/row_qwerty4" />
</merge>