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

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

Merge "Separate Greek semicolon key from row"

parents 0acfaa77 b30e7192

java/res/xml-sw600dp/key_greek_semicolon.xml

0 → 100644
+29 −0
Original line number Diff line number Diff line 
<?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>

java/res/xml-sw600dp/rowkeys_greek1.xml

+1 −6
Original line number Diff line number Diff line
@@ -21,11 +21,6 @@ 
<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. -->

    <!--

    <switch>

java/res/xml-sw600dp/rows_greek.xml

+2 −0
Original line number Diff line number Diff line
@@ -26,6 +26,8 @@ 
    <Row

        latin:keyWidth="9.0%p"

    >

        <include

            latin:keyboardLayout="@xml/key_greek_semicolon" />

        <include

            latin:keyboardLayout="@xml/rowkeys_greek1" />

        <Key

java/res/xml-sw768dp/rows_greek.xml

+2 −0
Original line number Diff line number Diff line
@@ -30,6 +30,8 @@ 
            latin:keyStyle="tabKeyStyle"

            latin:keyLabelFlags="alignLeft"

            latin:keyWidth="7.969%p" />

        <include

            latin:keyboardLayout="@xml/key_greek_semicolon" />

        <include

            latin:keyboardLayout="@xml/rowkeys_greek1" />

    </Row>

java/res/xml/key_greek_semicolon.xml

0 → 100644
+42 −0
Original line number Diff line number Diff line 
<?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>