Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0ce38865 authored by Tadashi G. Takaoka's avatar Tadashi G. Takaoka Committed by Android (Google) Code Review
Browse files

Merge "Reorder Greek accented vowels"

parents 043d9bc2 d1cc4e0b

java/res/xml/rowkeys_greek1.xml

+4 −4
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ 
        latin:keySpec="ε"

        latin:keyHintLabel="3"

        latin:additionalMoreKeys="3"

        latin:moreKeys="έ" />

        latin:moreKeys="έ,%" />

    <!-- U+03C1: "ρ" GREEK SMALL LETTER RHO -->

    <Key

        latin:keySpec="&#x03C1;"
@@ -88,7 +88,7 @@ 
        latin:keySpec="&#x03C5;"

        latin:keyHintLabel="6"

        latin:additionalMoreKeys="6"

        latin:moreKeys="&#x03CD;,&#x03CB;,&#x03B0;" />

        latin:moreKeys="&#x03CD;,%,&#x03CB;,&#x03B0;" />

    <!-- U+03B8: "θ" GREEK SMALL LETTER THETA -->

    <Key

        latin:keySpec="&#x03B8;"
@@ -102,14 +102,14 @@ 
        latin:keySpec="&#x03B9;"

        latin:keyHintLabel="8"

        latin:additionalMoreKeys="8"

        latin:moreKeys="&#x03AF;,&#x03CA;,&#x0390;" />

        latin:moreKeys="&#x03AF;,%,&#x03CA;,&#x0390;" />

    <!-- U+03BF: "ο" GREEK SMALL LETTER OMICRON

         U+03CC: "ό" GREEK SMALL LETTER OMICRON WITH TONOS -->

    <Key

        latin:keySpec="&#x03BF;"

        latin:keyHintLabel="9"

        latin:additionalMoreKeys="9"

        latin:moreKeys="&#x03CC;" />

        latin:moreKeys="&#x03CC;,%" />

    <!-- U+03C0: "π" GREEK SMALL LETTER PI -->

    <Key

        latin:keySpec="&#x03C0;"

tests/src/com/android/inputmethod/keyboard/layout/Greek.java

+4 −4
Original line number Diff line number Diff line
@@ -85,7 +85,7 @@ public final class Greek extends LayoutBase { 
                    key(ROW1_2, moreKey("2")),

                    // U+03B5: "ε" GREEK SMALL LETTER EPSILON

                    // U+03AD: "έ" GREEK SMALL LETTER EPSILON WITH TONOS

                    key("\u03B5", joinMoreKeys("3", "\u03AD")),

                    key("\u03B5", joinMoreKeys("\u03AD", "3")),

                    // U+03C1: "ρ" GREEK SMALL LETTER RHO

                    key("\u03C1", moreKey("4")),

                    // U+03C4: "τ" GREEK SMALL LETTER TAU
@@ -94,17 +94,17 @@ public final class Greek extends LayoutBase { 
                    // 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("\u03C5", joinMoreKeys("6", "\u03CD", "\u03CB", "\u03B0")),

                    key("\u03C5", joinMoreKeys("\u03CD", "6", "\u03CB", "\u03B0")),

                    // U+03B8: "θ" GREEK SMALL LETTER THETA

                    key("\u03B8", moreKey("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("\u03B9", joinMoreKeys("8", "\u03AF", "\u03CA", "\u0390")),

                    key("\u03B9", joinMoreKeys("\u03AF", "8", "\u03CA", "\u0390")),

                    // U+03BF: "ο" GREEK SMALL LETTER OMICRON

                    // U+03CC: "ό" GREEK SMALL LETTER OMICRON WITH TONOS

                    key("\u03BF", joinMoreKeys("9", "\u03CC")),

                    key("\u03BF", joinMoreKeys("\u03CC", "9")),

                    // U+03C0: "π" GREEK SMALL LETTER PI

                    key("\u03C0", moreKey("0")))

            .setKeysOfRow(2,