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

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

Merge "Use kbd_row3_comman_period.xml"

parents ab7cb71b 3db07d05

java/res/xml-sw600dp/kbd_rows_azerty.xml

+2 −22
Original line number Diff line number Diff line
@@ -120,28 +120,8 @@ 
            latin:moreKeys="@string/more_keys_for_n" />

        <Key

            latin:keyLabel="\'" />

        <switch>

            <case

                latin:mode="email"

            >

                <Key

                    latin:keyLabel="," />

                <Key

                    latin:keyLabel="." />

            </case>

            <default>

                <Key

                    latin:keyLabel=","

                    latin:keyLabelFlags="hasUppercaseLetter"

                    latin:keyHintLabel="!"

                    latin:moreKeys="!" />

                <Key

                    latin:keyLabel="."

                    latin:keyLabelFlags="hasUppercaseLetter"

                    latin:keyHintLabel="\?"

                    latin:moreKeys="\?" />

            </default>

        </switch>

        <include

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

        <include

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

    </Row>

java/res/xml-sw600dp/kbd_rows_bulgarian.xml

+2 −22
Original line number Diff line number Diff line
@@ -105,28 +105,8 @@ 
            latin:keyLabel="м" />

        <Key

            latin:keyLabel="ю" />

        <switch>

            <case

                latin:mode="email"

            >

                <Key

                    latin:keyLabel="," />

                <Key

                    latin:keyLabel="." />

            </case>

            <default>

                <Key

                    latin:keyLabel=","

                    latin:keyLabelFlags="hasUppercaseLetter"

                    latin:keyHintLabel="!"

                    latin:moreKeys="!" />

                <Key

                    latin:keyLabel="."

                    latin:keyLabelFlags="hasUppercaseLetter"

                    latin:keyHintLabel="\?"

                    latin:moreKeys="\?" />

            </default>

        </switch>

        <include

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

        <Spacer

            latin:keyXPos="-10.000%p"

            latin:keyWidth="0%p" />

java/res/xml-sw600dp/kbd_rows_qwertz.xml

+2 −22
Original line number Diff line number Diff line
@@ -87,28 +87,8 @@ 
            latin:moreKeys="@string/more_keys_for_n" />

        <Key

            latin:keyLabel="m" />

        <switch>

            <case

                latin:mode="email"

            >

                <Key

                    latin:keyLabel="," />

                <Key

                    latin:keyLabel="." />

            </case>

            <default>

                <Key

                    latin:keyLabel=","

                    latin:keyLabelFlags="hasUppercaseLetter"

                    latin:keyHintLabel="!"

                    latin:moreKeys="!" />

                <Key

                    latin:keyLabel="."

                    latin:keyLabelFlags="hasUppercaseLetter"

                    latin:keyHintLabel="\?"

                    latin:moreKeys="\?" />

            </default>

        </switch>

        <include

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

        <include

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

    </Row>

java/res/xml-sw600dp/kbd_rows_slavic.xml

+2 −22
Original line number Diff line number Diff line
@@ -114,28 +114,8 @@ 
            latin:keyLabel="б" />

        <Key

            latin:keyLabel="ю" />

        <switch>

            <case

                latin:mode="email"

            >

                <Key

                    latin:keyLabel="," />

                <Key

                    latin:keyLabel="." />

            </case>

            <default>

                <Key

                    latin:keyLabel=","

                    latin:keyLabelFlags="hasUppercaseLetter"

                    latin:keyHintLabel="!"

                    latin:moreKeys="!" />

                <Key

                    latin:keyLabel="."

                    latin:keyLabelFlags="hasUppercaseLetter"

                    latin:keyHintLabel="\?"

                    latin:moreKeys="\?" />

            </default>

        </switch>

        <include

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

        <include

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

    </Row>

java/res/xml-sw768dp/kbd_row3_comma_period.xml

deleted100644 → 0
+0 −46
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

/*

**

** Copyright 2011, 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:mode="email"

        >

            <Key

                latin:keyLabel="," />

            <Key

                latin:keyLabel="." />

        </case>

        <default>

            <Key

                latin:keyLabel=","

                latin:keyLabelFlags="hasUppercaseLetter"

                latin:keyHintLabel="!"

                latin:moreKeys="!" />

            <Key

                latin:keyLabel="."

                latin:keyLabelFlags="hasUppercaseLetter"

                latin:keyHintLabel="\?"

                latin:moreKeys="\?" />

        </default>

    </switch>

</merge>