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

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

Fix the bottom row of tablet keyboard layout 

This CL eliminates "_" and "/" keys from the bottom row of tablet
keyboard.  This CL also reorganizes the bottom row of tablet Dvorak
keyboard.

Bug: 16603887
Change-Id: Ic1570836dea1a475bed5d43aeb6a351507bf5428
parent 2637be27

java/res/xml-sw600dp/key_comma.xml

+24 −15
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
<!--

/*

**

** Copyright 2014, The Android Open Source Project

** 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.
@@ -21,27 +21,36 @@ 
<merge

    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"

>

    <!-- The table comma key which may have settings as popup key. -->

    <!-- Kept as a separate file for cleaner overriding by an overlay.  -->

    <key-style

        latin:styleName="baseTabletCommaKeyStyle"

        latin:keySpec="!text/keyspec_tablet_comma"

        latin:keyHintLabel="!text/keyhintlabel_tablet_comma"

        latin:keyLabelFlags="hasPopupHint"

        latin:parentStyle="hasShiftedLetterHintStyle" />

    <switch>

        <case

            latin:clobberSettingsKey="true"

            latin:mode="url"

        >

            <Key

                latin:keySpec="/"

                latin:keyStyle="settingsMoreKeysStyle" />

        </case>

        <case

            latin:mode="email"

        >

            <Key

                latin:moreKeys="!text/morekeys_tablet_comma"

                latin:keyStyle="baseTabletCommaKeyStyle" />

                latin:keySpec="\@"

                latin:keyStyle="settingsMoreKeysStyle" />

        </case>

        <case

            latin:keyboardLayoutSet="dvorak"

        >

            <Key

                latin:keySpec="!"

                latin:moreKeys="!text/morekeys_exclamation,%"

                latin:keyStyle="settingsMoreKeysStyle" />

        </case>

        <!-- clobberSettingsKey="false" -->

        <default>

            <Key

                latin:moreKeys="!text/morekeys_tablet_comma,!text/keyspec_settings"

                latin:keyStyle="baseTabletCommaKeyStyle" />

                latin:keySpec="!text/keyspec_tablet_comma"

                latin:moreKeys="!text/morekeys_tablet_comma,%"

                latin:keyHintLabel="!text/keyhintlabel_tablet_comma"

                latin:keyLabelFlags="hasPopupHint"

                latin:keyStyle="settingsMoreKeysStyle" />

        </default>

    </switch>

</merge>

java/res/xml-sw600dp/key_f1.xml

deleted100644 → 0
+0 −36
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"

        >

            <Key

                latin:keySpec="\@" />

        </case>

        <default>

            <Key

                latin:keySpec="/" />

        </default>

    </switch>

</merge>

java/res/xml-sw600dp/key_period.xml

+7 −0
Original line number Diff line number Diff line
@@ -35,6 +35,13 @@ 
                latin:moreKeys="!autoColumnOrder!8,\\,,.,',#,),(,/,;,@,:,-,&quot;,+,\\%,&amp;"

                latin:backgroundType="functional" />

        </case>

        <case

            latin:keyboardLayoutSet="dvorak"

        >

            <Key

                latin:keySpec="\?"

                latin:moreKeys="!text/morekeys_tablet_period,!text/morekeys_question" />

        </case>

        <default>

            <Key

                latin:keySpec="!text/keyspec_tablet_period"

java/res/xml-sw600dp/key_question_exclamation.xml

deleted100644 → 0
+0 −39
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:keySpec="-" />

        </case>

        <default>

            <Key

                latin:keySpec="\?"

                latin:keyHintLabel="!"

                latin:moreKeys="!"

                latin:keyStyle="hasShiftedLetterHintStyle" />

        </default>

    </switch>

</merge>

java/res/xml-sw600dp/key_space_5kw.xml→java/res/xml-sw600dp/key_space_7kw.xml

+4 −4
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ 
                latin:keyStyle="languageSwitchKeyStyle" />

            <Key

                latin:keyStyle="spaceKeyStyle"

                latin:keyWidth="27.0%p" />

                latin:keyWidth="45.0%p" />

            <Key

                latin:keyStyle="zwnjKeyStyle" />

        </case>
@@ -44,7 +44,7 @@ 
        >

            <Key

                latin:keyStyle="spaceKeyStyle"

                latin:keyWidth="36.0%p" />

                latin:keyWidth="54.0%p" />

            <Key

                latin:keyStyle="zwnjKeyStyle" />

        </case>
@@ -55,13 +55,13 @@ 
                latin:keyStyle="languageSwitchKeyStyle" />

            <Key

                latin:keyStyle="spaceKeyStyle"

                latin:keyWidth="36.0%p" />

                latin:keyWidth="54.0%p" />

        </case>

        <!-- languageSwitchKeyEnabled="false" -->

        <default>

            <Key

                latin:keyStyle="spaceKeyStyle"

                latin:keyWidth="45.0%p" />

                latin:keyWidth="63.0%p" />

        </default>

    </switch>

</merge>