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

Commit befa8fd4 authored by elektroschmock's avatar elektroschmock Committed by Gerrit Code Review
Browse files

Bring back productivity for QWERTZ keyboards 

Patch set - 1
http://review.cyanogenmod.com/#/c/24532/1
changed the productivity for QWERTZ keyboards in a bad way
because rowkeys_qwerty2.xml was also used as 2nd QWERTZ row.

For de_DE 'ä' and 'ß' are far more usual then '@' and '#'
Also exchange '$' with '€'

I hope this doesn't break other locales using QWERTZ

Patch set -2
Also use 'rowkeys_qwertz2.xml' for the 600dp and 768dp layouts
and enable AdditionalMoreKeys for row 1 on QWERTZ keyboards

Change-Id: I22d80778b56403c5d56a6a0e19a8393bbdcbeb1b
parent 95b4d7e5

java/res/xml-sw600dp/rows_qwertz.xml

+2 −3
Original line number Diff line number Diff line
@@ -27,8 +27,7 @@ 
        latin:keyWidth="9.0%p"

    >

        <include

            latin:keyboardLayout="@xml/rowkeys_qwertz1"

            latin:keyLabelFlags="disableAdditionalMoreKeys|disableKeyHintLabel" />

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

        <Key

            latin:keyStyle="deleteKeyStyle"

            latin:keyWidth="fillRight" />
@@ -37,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-sw768dp/rows_qwertz.xml

+2 −3
Original line number Diff line number Diff line
@@ -31,8 +31,7 @@ 
            latin:keyLabelFlags="alignLeft"

            latin:keyWidth="7.969%p" />

        <include

            latin:keyboardLayout="@xml/rowkeys_qwertz1"

            latin:keyLabelFlags="disableAdditionalMoreKeys|disableKeyHintLabel" />

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

        <Key

            latin:keyStyle="deleteKeyStyle"

            latin:keyWidth="fillRight"/>
@@ -45,7 +44,7 @@ 
            latin:keyLabelFlags="alignLeft"

            latin:keyWidth="11.172%p"/>

        <include

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

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

        <Key

            latin:keyStyle="enterKeyStyle"

            latin:keyWidth="fillRight" />

java/res/xml/rowkeys_qwertz2.xml

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

>

    <Key

        latin:keyLabel="a"

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

    <Key

        latin:keyLabel="s"

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

    <Key

        latin:keyLabel="d"

        latin:keyHintLabel="€"

        latin:additionalMoreKeys="€"

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

    <Key

        latin:keyLabel="f"

        latin:keyHintLabel="%"

        latin:additionalMoreKeys="%" />

    <Key

        latin:keyLabel="g"

        latin:keyHintLabel="&amp;"

        latin:additionalMoreKeys="&amp;"

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

    <Key

        latin:keyLabel="h"

        latin:keyHintLabel="*"

        latin:additionalMoreKeys="*"

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

    <Key

        latin:keyLabel="j"

        latin:keyHintLabel="-"

        latin:additionalMoreKeys="-"

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

    <Key

        latin:keyLabel="k"

        latin:keyHintLabel="+"

        latin:additionalMoreKeys="+"

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

    <Key

        latin:keyLabel="l"

        latin:keyHintLabel="_"

        latin:additionalMoreKeys="_"

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

</merge>

java/res/xml/rowkeys_qwertz3.xml

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

    <Key

        latin:keyLabel="y"

        latin:keyHintLabel="!"

        latin:additionalMoreKeys="!"

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

    <Key

        latin:keyLabel="x" />

        latin:keyLabel="x"

        latin:keyHintLabel="&quot;"

        latin:additionalMoreKeys="&quot;" />

    <Key

        latin:keyLabel="c"

        latin:keyHintLabel="&apos;"

        latin:additionalMoreKeys="&apos;"

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

    <Key

        latin:keyLabel="v"

        latin:keyHintLabel=":"

        latin:additionalMoreKeys=":"

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

    <Key

        latin:keyLabel="b" />

        latin:keyLabel="b"

        latin:keyHintLabel=";"

        latin:additionalMoreKeys=";" />

    <Key

        latin:keyLabel="n"

        latin:keyHintLabel="/"

        latin:additionalMoreKeys="/"

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

    <Key

        latin:keyLabel="m" />

        latin:keyLabel="m"

        latin:keyHintLabel="\?"

        latin:additionalMoreKeys="\\?" />

</merge>

java/res/xml/rows_qwertz.xml

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

    >

        <include

            latin:keyboardLayout="@xml/rowkeys_qwerty2"

            latin:keyboardLayout="@xml/rowkeys_qwertz2"

            latin:keyXPos="5%p" />

    </Row>

    <Row