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

This commit is contained in:
Tadashi G. Takaoka 2011-04-07 21:43:28 -07:00 committed by Android (Google) Code Review
commit 50cce07f59

View file

@ -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>