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

Commit 754b385d authored by Tadashi G. Takaoka's avatar Tadashi G. Takaoka Committed by Android Git Automerger
Browse files

am 960dce05: am 268a442d: Microphone key on 7-inch tablet on the far right vs where it is on phones 

* commit '960dce05':
  Microphone key on 7-inch tablet on the far right vs where it is on phones
parents 562239bf 960dce05

java/res/xml-sw600dp/key_apostrophe.xml

+1 −10
Original line number Diff line number Diff line
@@ -23,20 +23,11 @@ 
>

    <switch>

        <case

            latin:mode="email"

            latin:mode="email|url"

        >

            <Key

                latin:keyLabel="-" />

        </case>

        <case

            latin:mode="url"

        >

            <Key

                latin:keyLabel="/"

                latin:keyHintLabel=":"

                latin:moreKeys=":"

                latin:keyStyle="hasShiftedLetterHintStyle" />

        </case>

        <default>

            <Key

                latin:keyLabel="!text/keylabel_for_apostrophe"

java/res/xml-sw600dp/key_dash.xml

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ 
>

    <switch>

        <case

            latin:mode="email"

            latin:mode="email|url"

        >

            <Key

                latin:keyLabel="_" />

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

+62 −0
Original line number Diff line number Diff line
@@ -23,40 +23,33 @@ 
>

    <switch>

        <case

            latin:keyboardLayoutSetElement="symbols"

            latin:mode="url"

        >

            <Key

                latin:keyStyle="comKeyStyle"

                latin:keyWidth="18.0%p" />

                latin:keyLabel=":" />

        </case>

        <default>

            <switch>

        <case

                    latin:mode="email"

            latin:keyboardLayoutSetElement="symbols"

        >

            <Key

                        latin:keyStyle="comKeyStyle" />

                latin:keyLabel="\@" />

        </case>

        <!-- keyboardLayoutSetElement != "symbols" -->

        <case

                    latin:imeAction="actionSearch"

            latin:mode="email"

        >

            <Key

                        latin:keyLabel=":"

                        latin:keyHintLabel="+"

                        latin:moreKeys="+"

                        latin:keyStyle="hasShiftedLetterHintStyle" />

                latin:keyLabel="\@" />

        </case>

                <default>

                    <Key

                        latin:keyStyle="smileyKeyStyle" />

                </default>

            </switch>

            <switch>

        <case

                    latin:mode="email"

            latin:mode="url"

        >

            <Key

                        latin:keyLabel="\@" />

                latin:keyLabel="/"

                latin:keyHintLabel=":"

                latin:moreKeys=":"

                latin:keyStyle="hasShiftedLetterHintStyle" />

        </case>

        <default>

            <Key
@@ -66,6 +59,4 @@ 
                latin:keyStyle="hasShiftedLetterHintStyle" />

        </default>

    </switch>

        </default>

    </switch>

</merge>

java/res/xml-sw600dp/key_f2.xml

0 → 100644
+45 −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:mode="email|url"

        >

            <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>

</merge>

java/res/xml-sw600dp/key_question_exclamation.xml

+1 −10
Original line number Diff line number Diff line
@@ -23,20 +23,11 @@ 
>

    <switch>

        <case

            latin:mode="email"

            latin:mode="email|url"

        >

            <Key

                latin:keyLabel="-" />

        </case>

        <case

            latin:mode="url"

        >

            <Key

                latin:keyLabel="/"

                latin:keyHintLabel=":"

                latin:moreKeys=":"

                latin:keyStyle="hasShiftedLetterHintStyle" />

        </case>

        <default>

            <Key

                latin:keyLabel="\?"