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

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

Remove language switch key from symbols and symbols shift keyboard 

This change also fixes the background color of the left keys of the space key.

Bug: 12407208
Change-Id: Id869605146e9f72835f892c3c7ae14f118177394
parent e91559a1

java/res/xml/key_space_3kw.xml

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

<!--

/*

**

** Copyright 2013, 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:languageSwitchKeyEnabled="true"

        >

            <Key

                latin:keyStyle="languageSwitchKeyStyle" />

            <Key

                latin:keyStyle="spaceKeyStyle"

                latin:keyWidth="20%p" />

        </case>

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

        <default>

            <Key

                latin:keyStyle="spaceKeyStyle"

                latin:keyWidth="30%p" />

        </default>

    </switch>

</merge>

java/res/xml/key_space_symbols.xml

+4 −2
Original line number Diff line number Diff line
@@ -21,6 +21,8 @@ 
<merge

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

>

    <include

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

    <Key

        latin:backgroundType="normal"

        latin:keyStyle="spaceKeyStyle"

        latin:keyWidth="30%p" />

</merge>

java/res/xml/keys_comma_period_symbols.xml

+2 −4
Original line number Diff line number Diff line
@@ -22,11 +22,9 @@ 
    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"

>

    <Key

        latin:keyLabel=","

        latin:backgroundType="functional" />

        latin:keyLabel="," />

    <!-- U+2026: "…" HORIZONTAL ELLIPSIS -->

    <Key

        latin:keyLabel="."

        latin:moreKeys="&#x2026;"

        latin:backgroundType="functional" />

        latin:moreKeys="&#x2026;" />

</merge>

java/res/xml/rows_symbols.xml

+1 −0
Original line number Diff line number Diff line
@@ -54,6 +54,7 @@ 
    </Row>

    <Row

        latin:keyWidth="10%p"

        latin:backgroundType="functional"

    >

        <Key

            latin:keyStyle="toAlphaKeyStyle"

java/res/xml/rows_symbols_shift.xml

+1 −0
Original line number Diff line number Diff line
@@ -54,6 +54,7 @@ 
    </Row>

    <Row

        latin:keyWidth="10%p"

        latin:backgroundType="functional"

    >

        <Key

            latin:keyStyle="toAlphaKeyStyle"