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

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

am 052a8205: Microphone key on 10-inch tablet on the far right vs where it is on phones 

* commit '052a8205':
  Microphone key on 10-inch tablet on the far right vs where it is on phones
parents 960dce05 052a8205

java/res/xml-sw768dp/key_shortcut.xml

+4 −0
Original line number Diff line number Diff line
@@ -28,5 +28,9 @@ 
            <Key

                latin:keyStyle="shortcutKeyStyle" />

        </case>

        <default>

            <!-- The empty space instead of shortcut key. -->

            <Spacer />

        </default>

    </switch>

</merge>

java/res/xml-sw768dp/key_styles_common.xml

+0 −6
Original line number Diff line number Diff line
@@ -73,12 +73,6 @@ 
        latin:backgroundType="functional" />

    <include

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

    <key-style

        latin:styleName="defaultActionKeyStyle"

        latin:code="!code/key_action_enter"

        latin:keyIcon="!icon/undefined"

        latin:backgroundType="functional"

        latin:parentStyle="defaultEnterKeyStyle" />

    <key-style

        latin:styleName="spaceKeyStyle"

        latin:code="!code/key_space"

java/res/xml-sw768dp/keys_f1f2.xml

deleted100644 → 0
+0 −71
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="url"

        >

            <Key

                latin:keyStyle="comKeyStyle"

                latin:keyWidth="16.084%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="/"

                        latin:keyHintLabel="\@"

                        latin:moreKeys="\@"

                        latin:keyStyle="hasShiftedLetterHintStyle" />

                </default>

            </switch>

        </default>

    </switch>

</merge>

java/res/xml-sw768dp/row_dvorak4.xml

+8 −6
Original line number Diff line number Diff line
@@ -23,22 +23,24 @@ 
>

    <Row

        latin:keyWidth="8.047%p"

        latin:backgroundType="functional"

    >

        <include

            latin:keyXPos="5.782%p"

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

        <include

            latin:keyXPos="13.829%p"

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

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

        <include

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

        <include

            latin:keyXPos="29.923%p"

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

            latin:keyboardLayout="@xml/key_space"

            latin:backgroundType="normal" />

        <include

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

        <include

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

        <include

            latin:keyXPos="-8.047%p"

            latin:keyWidth="fillRight"

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

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

    </Row>

</merge>

java/res/xml-sw768dp/row_hebrew4.xml

+8 −6
Original line number Diff line number Diff line
@@ -23,20 +23,22 @@ 
>

    <Row

        latin:keyWidth="8.047%p"

        latin:backgroundType="functional"

    >

        <include

            latin:keyXPos="5.782%p"

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

        <include

            latin:keyXPos="13.829%p"

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

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

        <include

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

        <include

            latin:keyXPos="29.923%p"

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

            latin:keyboardLayout="@xml/key_space"

            latin:backgroundType="normal" />

        <include

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

        <include

            latin:keyXPos="-8.047%p"

            latin:keyWidth="fillRight"

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

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

    </Row>

</merge>