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

Commit dd5e6e65 authored by Tadashi G. Takaoka's avatar Tadashi G. Takaoka
Browse files

Remove duplicated functional keys 

Bug: 6410931
Change-Id: I07e84729da00d335e3864b9324bb1261df8968f7
parent d16c838d

java/res/xml-sw600dp/key_smiley.xml

deleted100644 → 0
+0 −54
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="\@" />

        </case>

        <case

            latin:mode="url"

        >

            <Key

                latin:keyLabel="-"

                latin:keyHintLabel="_"

                latin:moreKeys="_"

                latin:keyStyle="hasShiftedLetterHintStyle" />

        </case>

        <case

            latin:imeAction="actionSearch"

        >

            <Key

                latin:keyLabel=":"

                latin:keyHintLabel="+"

                latin:moreKeys="+"

                latin:keyStyle="hasShiftedLetterHintStyle" />

        </case>

        <default>

            <Key

                latin:keyStyle="smileyKeyStyle" />

        </default>

    </switch>

</merge>

java/res/xml-sw600dp/key_f1.xml→java/res/xml-sw600dp/keys_f1f2.xml

+71 −0
Original line number Diff line number Diff line
@@ -23,11 +23,41 @@ 
>

    <switch>

        <case

            latin:mode="email|url"

            latin:mode="url"

        >

            <Key

                latin:keyStyle="comKeyStyle"

                latin:keyWidth="17.8%p" />

        </case>

        <default>

            <switch>

                <case

                    latin:mode="email"

                >

                    <Key

                        latin:keyStyle="comKeyStyle" />

                </case>

                <case

                    latin:imeAction="actionSearch"

                >

                    <Key

                        latin:keyLabel=":"

                        latin:keyHintLabel="+"

                        latin:moreKeys="+"

                        latin:keyStyle="hasShiftedLetterHintStyle" />

                </case>

                <default>

                    <Key

                        latin:keyStyle="smileyKeyStyle" />

                </default>

            </switch>

            <switch>

                <case

                    latin:mode="email"

                >

                    <Key

                        latin:keyLabel="\@" />

                </case>

                <default>

                    <Key

                        latin:keyLabel="/"
@@ -36,4 +66,6 @@ 
                        latin:keyStyle="hasShiftedLetterHintStyle" />

                </default>

            </switch>

        </default>

    </switch>

</merge>

java/res/xml-sw600dp/row_dvorak4.xml

+1 −3
Original line number Diff line number Diff line
@@ -28,9 +28,7 @@ 
            latin:keyStyle="toSymbolKeyStyle"

            latin:keyWidth="13.0%p" />

        <include

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

        <include

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

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

        <include

            latin:keyXPos="30.750%p"

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

java/res/xml-sw600dp/row_hebrew4.xml

+1 −3
Original line number Diff line number Diff line
@@ -28,9 +28,7 @@ 
            latin:keyStyle="toSymbolKeyStyle"

            latin:keyWidth="13.0%p" />

        <include

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

        <include

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

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

        <include

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

        <include

java/res/xml-sw600dp/row_pcqwerty5.xml

+2 −2
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ 
                    latin:keyWidth="10.5%p" />

            </case>

            <case

                latin:mode="email|url"

                latin:mode="url"

            >

                <Key

                    latin:keyStyle="comKeyStyle"
@@ -42,7 +42,7 @@ 
            </case>

            <default>

                <include

                    latin:keyboardLayout="@xml/key_smiley"

                    latin:keyboardLayout="@xml/keys_f1f2"

                    latin:keyXPos="18.5%p" />

            </default>

        </switch>