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

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

Modularize keyboard XML files 

* Remove duplicated xml-sw768dp/keys_apostrophe_dash.xml
* Separate keys_apostrophe_dash.xml to key_apostorhe.xml and
  key_dash.ml
* Separate key_space.xml from row_qwerty4.xml
* Separate key_f1.xml from xml{,-sw600dp}/row_qwerty4.xml
* Separate keys_f1f2.xml from xml-sw768dp/row_qwerty4.xml
* Fix incorrectly named rows_symbols{,_shift}4.xml to
  row_symbols{,_shift}4.xml

Change-Id: Id71967a016a348174d1fc265b654dbc233c6562e
parent 6bfd5f63

java/res/xml-sw600dp/keys_apostrophe_dash.xml→java/res/xml-sw600dp/key_apostrophe.xml

+1 −16
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
<!--

/*

**

** Copyright 2011, 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.
@@ -45,19 +45,4 @@ 
                latin:keyStyle="hasShiftedLetterHintStyle" />

        </default>

    </switch>

    <switch>

        <case

            latin:mode="email"

        >

            <Key

                latin:keyLabel="_" />

        </case>

        <default>

            <Key

                latin:keyLabel="!text/keylabel_for_dash"

                latin:keyHintLabel="!text/keyhintlabel_for_dash"

                latin:moreKeys="!text/more_keys_for_dash"

                latin:keyStyle="hasShiftedLetterHintStyle" />

        </default>

    </switch>

</merge>

java/res/xml-sw600dp/kbd_hebrew_symbols.xml→java/res/xml-sw600dp/key_dash.xml

+17 −4
Original line number Diff line number Diff line
@@ -18,9 +18,22 @@ 
*/

-->



<Keyboard

<merge

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

>

    <include

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

</Keyboard>
 
    <switch>

        <case

            latin:mode="email"

        >

            <Key

                latin:keyLabel="_" />

        </case>

        <default>

            <Key

                latin:keyLabel="!text/keylabel_for_dash"

                latin:keyHintLabel="!text/keyhintlabel_for_dash"

                latin:moreKeys="!text/more_keys_for_dash"

                latin:keyStyle="hasShiftedLetterHintStyle" />

        </default>

    </switch>

</merge>

java/res/xml-sw600dp/kbd_spanish_symbols.xml→java/res/xml-sw600dp/key_f1.xml

+23 −4
Original line number Diff line number Diff line
@@ -18,9 +18,28 @@ 
*/

-->



<Keyboard

<merge

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

>

    <include

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

</Keyboard>
 
    <switch>

        <case

            latin:mode="email"

        >

            <Key

                latin:keyStyle="comKeyStyle" />

        </case>

        <case

            latin:mode="url"

        >

            <Key

                latin:keyStyle="comKeyStyle" />

        </case>

        <default>

            <Key

                latin:keyLabel="/"

                latin:keyHintLabel="\@"

                latin:moreKeys="\@"

                latin:keyStyle="hasShiftedLetterHintStyle" />

        </default>

    </switch>

</merge>