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

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

Remove "settings" key popup from "slash" and "atmark" key 

Removing "settings" key popup from these keys when there's a dedicated
"settings" key in the layout.

This is followup chnage of I119528c0.

Bug: 4196879
Change-Id: I742cc6d1d890c095610f1e8b9ac91a044ec540b7
parent e7c0e73a

java/res/xml/kbd_qwerty_f1.xml

+52 −23
Original line number Diff line number Diff line
@@ -20,6 +20,10 @@ 


<merge

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

>

    <switch>

        <case

            latin:hasSettingsKey="true"

        >

            <switch>

                <case
@@ -27,8 +31,6 @@ 
                >

                    <Key

                        latin:keyLabel="/"

                latin:keyHintIcon="@drawable/hint_popup"

                latin:popupCharacters="@string/alternates_for_settings_slash"

                        latin:isFunctional="true" />

                </case>

                <case
@@ -36,8 +38,6 @@ 
                >

                    <Key

                        latin:keyLabel="\@"

                latin:keyHintIcon="@drawable/hint_popup"

                latin:popupCharacters="@string/alternates_for_settings_at"

                        latin:isFunctional="true" />

                </case>

                <default>
@@ -51,16 +51,45 @@ 
                        <case

                            latin:hasVoiceKey="false"

                        >

                            <Key

                                latin:keyLabel=","

                                latin:isFunctional="true" />

                        </case>

                    </switch>

                </default>

            </switch>

        </case>

        <!-- latin:hasSettingsKey="false" -->

        <default>

            <switch>

                <case

                            latin:hasSettingsKey="true"

                    latin:mode="url"

                >

                    <Key

                                latin:keyLabel=","

                        latin:keyLabel="/"

                        latin:keyHintIcon="@drawable/hint_popup"

                        latin:popupCharacters="@string/alternates_for_settings_slash"

                        latin:isFunctional="true" />

                </case>

                <case

                            latin:hasSettingsKey="false"

                    latin:mode="email"

                >

                    <Key

                        latin:keyLabel="\@"

                        latin:keyHintIcon="@drawable/hint_popup"

                        latin:popupCharacters="@string/alternates_for_settings_at"

                        latin:isFunctional="true" />

                </case>

                <default>

                    <switch>

                        <case

                            latin:hasVoiceKey="true"

                        >

                            <Key

                                latin:keyStyle="micKeyStyle" />

                        </case>

                        <case

                            latin:hasVoiceKey="false"

                        >

                            <Key

                                latin:keyLabel=","
@@ -69,7 +98,7 @@ 
                                latin:isFunctional="true" />

                        </case>

                    </switch>

                </case>

                </default>

            </switch>

        </default>

    </switch>