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

Unverified Commit a147d024 authored by Kim's avatar Kim Committed by Michael Bestas
Browse files

Unbreak QWERTZ keyboards 

Adding "more" keys to ALL the keys broke QWERTZ keyboards.
Fix it by adding seperate XMLs for QWERTZ.

Change-Id: Iccf10139cf02cab2a773c7085aadac8538359a16
parent b83060a8

java/res/xml-sw600dp/rows_qwertz.xml

+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ 
        latin:keyWidth="9.0%p"

    >

        <include

            latin:keyboardLayout="@xml/rowkeys_qwerty2"

            latin:keyboardLayout="@xml/rowkeys_qwertz2"

            latin:keyXPos="4.5%p" />

        <Key

            latin:keyStyle="enterKeyStyle"

java/res/xml/rowkeys_qwertz2.xml

0 → 100644
+30 −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"

>

    <!-- a,s,d,f,g -->

    <include

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

    <!-- h,j,k,l -->

    <include

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

</merge>

java/res/xml/rowkeys_qwertz2_left5.xml

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

<!--

/*

**

** Copyright 2014, 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"

>

    <Key

        latin:keySpec="a"

        latin:moreKeys="!text/morekeys_a" />

    <Key

        latin:keySpec="s"

        latin:moreKeys="!text/morekeys_s" />

    <Key

        latin:keySpec="d"

        latin:keyHintLabel="€"

        latin:additionalMoreKeys="€"

        latin:moreKeys="!text/morekeys_d" />

    <Key

        latin:keySpec="f"

        latin:keyHintLabel="%"

        latin:additionalMoreKeys="%" />

    <Key

        latin:keySpec="g"

        latin:keyHintLabel="&amp;"

        latin:additionalMoreKeys="&amp;"

        latin:moreKeys="!text/morekeys_g" />

</merge>

java/res/xml/rowkeys_qwertz2_right4.xml

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

<!--

/*

**

** Copyright 2014, 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"

>

    <Key

        latin:keySpec="h"

        latin:keyHintLabel="-"

        latin:additionalMoreKeys="-"

        latin:moreKeys="!text/morekeys_h" />

    <Key

        latin:keySpec="j"

        latin:keyHintLabel="+"

        latin:additionalMoreKeys="+"

        latin:moreKeys="!text/morekeys_j" />

    <Key

        latin:keySpec="k"

        latin:keyHintLabel="("

        latin:additionalMoreKeys="("

        latin:moreKeys="!text/morekeys_k" />

    <Key

        latin:keySpec="l"

        latin:keyHintLabel=")"

        latin:additionalMoreKeys=")"

        latin:moreKeys="!text/morekeys_l" />

</merge>

java/res/xml/rowkeys_qwertz3.xml

+17 −3
Original line number Diff line number Diff line
@@ -23,20 +23,34 @@ 
>

    <Key

        latin:keySpec="y"

        latin:keyHintLabel="*"

        latin:additionalMoreKeys="*"

        latin:moreKeys="!text/morekeys_y" />

    <Key

        latin:keySpec="x" />

        latin:keySpec="x"

        latin:keyHintLabel="&quot;"

        latin:additionalMoreKeys="&quot;" />

    <Key

        latin:keySpec="c"

        latin:keyHintLabel="&apos;"

        latin:additionalMoreKeys="&apos;"

        latin:moreKeys="!text/morekeys_c" />

    <Key

        latin:keySpec="v"

        latin:keyHintLabel=":"

        latin:additionalMoreKeys=":"

        latin:moreKeys="!text/morekeys_v" />

    <Key

        latin:keySpec="b" />

        latin:keySpec="b"

        latin:keyHintLabel=";"

        latin:additionalMoreKeys=";" />

    <Key

        latin:keySpec="n"

        latin:keyHintLabel="!"

        latin:additionalMoreKeys="!"

        latin:moreKeys="!text/morekeys_n" />

    <Key

        latin:keySpec="m" />

        latin:keySpec="m"

        latin:keyHintLabel="\?"

        latin:additionalMoreKeys="\\?" />

</merge>