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: I742cc6d1d890c095610f1e8b9ac91a044ec540b7main
parent
e7c0e73a19
commit
cf4eff3f59
|
@ -23,44 +23,73 @@
|
|||
>
|
||||
<switch>
|
||||
<case
|
||||
latin:mode="url"
|
||||
latin:hasSettingsKey="true"
|
||||
>
|
||||
<Key
|
||||
latin:keyLabel="/"
|
||||
latin:keyHintIcon="@drawable/hint_popup"
|
||||
latin:popupCharacters="@string/alternates_for_settings_slash"
|
||||
latin:isFunctional="true" />
|
||||
</case>
|
||||
<case
|
||||
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"
|
||||
latin:mode="url"
|
||||
>
|
||||
<Key
|
||||
latin:keyStyle="micKeyStyle" />
|
||||
latin:keyLabel="/"
|
||||
latin:isFunctional="true" />
|
||||
</case>
|
||||
<case
|
||||
latin:hasVoiceKey="false"
|
||||
latin:mode="email"
|
||||
>
|
||||
<Key
|
||||
latin:keyLabel="\@"
|
||||
latin:isFunctional="true" />
|
||||
</case>
|
||||
<default>
|
||||
<switch>
|
||||
<case
|
||||
latin:hasSettingsKey="true"
|
||||
latin:hasVoiceKey="true"
|
||||
>
|
||||
<Key
|
||||
latin:keyStyle="micKeyStyle" />
|
||||
</case>
|
||||
<case
|
||||
latin:hasVoiceKey="false"
|
||||
>
|
||||
<Key
|
||||
latin:keyLabel=","
|
||||
latin:isFunctional="true" />
|
||||
</case>
|
||||
</switch>
|
||||
</default>
|
||||
</switch>
|
||||
</case>
|
||||
<!-- latin:hasSettingsKey="false" -->
|
||||
<default>
|
||||
<switch>
|
||||
<case
|
||||
latin:mode="url"
|
||||
>
|
||||
<Key
|
||||
latin:keyLabel="/"
|
||||
latin:keyHintIcon="@drawable/hint_popup"
|
||||
latin:popupCharacters="@string/alternates_for_settings_slash"
|
||||
latin:isFunctional="true" />
|
||||
</case>
|
||||
<case
|
||||
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:hasSettingsKey="false"
|
||||
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>
|
||||
|
|
Loading…
Reference in New Issue