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

Commit 25b5e627 authored by Tadashi G. Takaoka's avatar Tadashi G. Takaoka Committed by Android (Google) Code Review
Browse files

Merge "Modularize keyboard XML files"

parents e42ec2a6 9fa0a2e8

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>