Make spacebar wider on phones

Bug: 4726951
Change-Id: I18e50d59cc6ba3670523a8979a274b14049ad815
main
Tadashi G. Takaoka 2011-06-20 19:17:19 +09:00
parent 905a6cdcba
commit c00ffa4ccf
6 changed files with 185 additions and 71 deletions

View File

@ -101,8 +101,8 @@
<key-style <key-style
latin:styleName="settingsKeyStyle" latin:styleName="settingsKeyStyle"
latin:code="@integer/key_settings" latin:code="@integer/key_settings"
latin:keyIcon="@drawable/sym_keyboard_settings_holo" latin:keyIcon="@drawable/sym_keyboard_settings"
latin:iconPreview="@drawable/sym_keyboard_settings_holo" latin:iconPreview="@drawable/sym_keyboard_settings"
latin:parentStyle="functionalKeyStyle" /> latin:parentStyle="functionalKeyStyle" />
<key-style <key-style
latin:styleName="spaceKeyStyle" latin:styleName="spaceKeyStyle"

View File

@ -23,39 +23,92 @@
> >
<switch> <switch>
<case <case
latin:mode="url" latin:hasSettingsKey="true"
> >
<Key
latin:keyLabel="/"
latin:keyStyle="settingsPopupStyle" />
</case>
<case
latin:mode="email"
>
<Key
latin:keyLabel="\@"
latin:keyStyle="settingsPopupStyle" />
</case>
<default>
<switch> <switch>
<case <case
latin:hasVoiceKey="true" latin:mode="url"
> >
<Key <Key
latin:keyStyle="micKeyStyle" /> latin:keyLabel="/"
latin:keyWidth="9.2%p"
latin:keyStyle="settingsPopupStyle" />
</case> </case>
<!-- latin:hasVoiceKey="false" -->
<case <case
latin:navigateAction="true" latin:mode="email"
> >
<Key <Key
latin:keyLabel="." latin:keyLabel="\@"
latin:keyWidth="9.2%p"
latin:keyStyle="settingsPopupStyle" /> latin:keyStyle="settingsPopupStyle" />
</case> </case>
<default> <default>
<switch>
<case
latin:hasVoiceKey="true"
>
<Key
latin:keyStyle="micKeyStyle"
latin:keyWidth="9.2%p" />
</case>
<!-- latin:hasVoiceKey="false" -->
<case
latin:navigateAction="true"
>
<Key
latin:keyLabel="."
latin:keyWidth="9.2%p"
latin:keyStyle="settingsPopupStyle" />
</case>
<default>
<Key
latin:keyLabel=","
latin:keyWidth="9.2%p"
latin:keyStyle="settingsPopupStyle" />
</default>
</switch>
</default>
</switch>
</case>
<!-- hasSettingsKey="false" -->
<default>
<switch>
<case
latin:mode="url"
>
<Key <Key
latin:keyLabel="," latin:keyLabel="/"
latin:keyStyle="settingsPopupStyle" /> latin:keyStyle="settingsPopupStyle" />
</case>
<case
latin:mode="email"
>
<Key
latin:keyLabel="\@"
latin:keyStyle="settingsPopupStyle" />
</case>
<default>
<switch>
<case
latin:hasVoiceKey="true"
>
<Key
latin:keyStyle="micKeyStyle" />
</case>
<!-- latin:hasVoiceKey="false" -->
<case
latin:navigateAction="true"
>
<Key
latin:keyLabel="."
latin:keyStyle="settingsPopupStyle" />
</case>
<default>
<Key
latin:keyLabel=","
latin:keyStyle="settingsPopupStyle" />
</default>
</switch>
</default> </default>
</switch> </switch>
</default> </default>

View File

@ -31,46 +31,68 @@
> >
<Key <Key
latin:keyStyle="toSymbolKeyStyle" latin:keyStyle="toSymbolKeyStyle"
latin:keyWidth="15%p" latin:keyWidth="13.75%p"
latin:keyEdgeFlags="left" /> latin:keyEdgeFlags="left" />
<Key <Key
latin:keyStyle="settingsKeyStyle" /> latin:keyStyle="settingsKeyStyle"
latin:keyWidth="9.2%p" />
<include <include
latin:keyboardLayout="@xml/kbd_qwerty_f1" /> latin:keyboardLayout="@xml/kbd_qwerty_f1" />
<Key <Key
latin:keyStyle="spaceKeyStyle" latin:keyStyle="spaceKeyStyle"
latin:keyWidth="30%p" /> latin:keyWidth="35.83%p" />
<switch>
<case
latin:navigateAction="true"
>
<Key
latin:keyStyle="tabKeyStyle"
latin:keyLabelOption="popupHint"
latin:popupCharacters="@string/alternates_for_web_tab_punctuation"
latin:keyWidth="9.2%p"
latin:maxPopupKeyboardColumn="8" />
</case>
<default>
<Key
latin:keyLabel="."
latin:keyLabelOption="popupHint"
latin:popupCharacters="@string/alternates_for_punctuation"
latin:keyWidth="9.2%p"
latin:maxPopupKeyboardColumn="7"
latin:keyStyle="functionalKeyStyle" />
</default>
</switch>
</case> </case>
<!-- latin:hasSettingsKey="false" --> <!-- latin:hasSettingsKey="false" -->
<default> <default>
<Key <Key
latin:keyStyle="toSymbolKeyStyle" latin:keyStyle="toSymbolKeyStyle"
latin:keyWidth="20%p" latin:keyWidth="15%p"
latin:keyEdgeFlags="left" /> latin:keyEdgeFlags="left" />
<include <include
latin:keyboardLayout="@xml/kbd_qwerty_f1" /> latin:keyboardLayout="@xml/kbd_qwerty_f1" />
<Key <Key
latin:keyStyle="spaceKeyStyle" latin:keyStyle="spaceKeyStyle"
latin:keyWidth="40%p" /> latin:keyWidth="50%p" />
</default> <switch>
</switch> <case
<switch> latin:navigateAction="true"
<case >
latin:navigateAction="true" <Key
> latin:keyStyle="tabKeyStyle"
<Key latin:keyLabelOption="popupHint"
latin:keyStyle="tabKeyStyle" latin:popupCharacters="@string/alternates_for_web_tab_punctuation"
latin:keyLabelOption="popupHint" latin:maxPopupKeyboardColumn="8" />
latin:popupCharacters="@string/alternates_for_web_tab_punctuation" </case>
latin:maxPopupKeyboardColumn="8" /> <default>
</case> <Key
<default> latin:keyLabel="."
<Key latin:keyLabelOption="popupHint"
latin:keyLabel="." latin:popupCharacters="@string/alternates_for_punctuation"
latin:keyLabelOption="popupHint" latin:maxPopupKeyboardColumn="7"
latin:popupCharacters="@string/alternates_for_punctuation" latin:keyStyle="functionalKeyStyle" />
latin:maxPopupKeyboardColumn="7" </default>
latin:keyStyle="functionalKeyStyle" /> </switch>
</default> </default>
</switch> </switch>
<switch> <switch>

View File

@ -23,16 +23,41 @@
> >
<switch> <switch>
<case <case
latin:hasVoiceKey="true" latin:hasSettingsKey="true"
> >
<Key <switch>
latin:keyStyle="micKeyStyle" /> <case
latin:hasVoiceKey="true"
>
<Key
latin:keyStyle="micKeyStyle"
latin:keyWidth="9.2%p" />
</case>
<!-- latin:hasVoiceKey="false" -->
<default>
<Key
latin:keyLabel=","
latin:keyWidth="9.2%p"
latin:keyStyle="settingsPopupStyle" />
</default>
</switch>
</case> </case>
<!-- latin:hasVoiceKey="false" --> <!-- hasSettingsKey="false" -->
<default> <default>
<Key <switch>
latin:keyLabel="," <case
latin:keyStyle="settingsPopupStyle" /> latin:hasVoiceKey="true"
>
<Key
latin:keyStyle="micKeyStyle" />
</case>
<!-- latin:hasVoiceKey="false" -->
<default>
<Key
latin:keyLabel=","
latin:keyStyle="settingsPopupStyle" />
</default>
</switch>
</default> </default>
</switch> </switch>
</merge> </merge>

View File

@ -31,35 +31,43 @@
> >
<Key <Key
latin:keyStyle="toAlphaKeyStyle" latin:keyStyle="toAlphaKeyStyle"
latin:keyWidth="15%p" latin:keyWidth="13.75%p"
latin:keyEdgeFlags="left" /> latin:keyEdgeFlags="left" />
<Key <Key
latin:keyStyle="settingsKeyStyle" /> latin:keyStyle="settingsKeyStyle"
latin:keyWidth="9.2%p" />
<include <include
latin:keyboardLayout="@xml/kbd_qwerty_f1" /> latin:keyboardLayout="@xml/kbd_qwerty_f1" />
<Key <Key
latin:keyStyle="spaceKeyStyle" latin:keyStyle="spaceKeyStyle"
latin:keyWidth="30%p" /> latin:keyWidth="35.83%p" />
<Key
latin:keyLabel="."
latin:keyLabelOption="popupHint"
latin:popupCharacters="@string/alternates_for_punctuation"
latin:keyWidth="9.2%p"
latin:maxPopupKeyboardColumn="7"
latin:keyStyle="functionalKeyStyle" />
</case> </case>
<!-- latin:hasSettingsKey="false" --> <!-- latin:hasSettingsKey="false" -->
<default> <default>
<Key <Key
latin:keyStyle="toAlphaKeyStyle" latin:keyStyle="toAlphaKeyStyle"
latin:keyWidth="20%p" latin:keyWidth="15%p"
latin:keyEdgeFlags="left" /> latin:keyEdgeFlags="left" />
<include <include
latin:keyboardLayout="@xml/kbd_symbols_f1" /> latin:keyboardLayout="@xml/kbd_symbols_f1" />
<Key <Key
latin:keyStyle="spaceKeyStyle" latin:keyStyle="spaceKeyStyle"
latin:keyWidth="40%p" /> latin:keyWidth="50%p" />
<Key
latin:keyLabel="."
latin:keyLabelOption="popupHint"
latin:popupCharacters="@string/alternates_for_punctuation"
latin:maxPopupKeyboardColumn="7"
latin:keyStyle="functionalKeyStyle" />
</default> </default>
</switch> </switch>
<Key
latin:keyLabel="."
latin:keyLabelOption="popupHint"
latin:popupCharacters="@string/alternates_for_punctuation"
latin:maxPopupKeyboardColumn="7"
latin:keyStyle="functionalKeyStyle" />
<switch> <switch>
<case <case
latin:mode="im" latin:mode="im"

View File

@ -31,23 +31,29 @@
> >
<Key <Key
latin:keyStyle="toAlphaKeyStyle" latin:keyStyle="toAlphaKeyStyle"
latin:keyWidth="15%p" latin:keyWidth="13.75%p"
latin:keyEdgeFlags="left" /> latin:keyEdgeFlags="left" />
<Key <Key
latin:keyStyle="settingsKeyStyle" /> latin:keyStyle="settingsKeyStyle"
latin:keyWidth="9.2%p" />
<Key <Key
latin:keyLabel="„" latin:keyLabel="„"
latin:popupCharacters="“,”,„,‟,«,»,,,," latin:popupCharacters="“,”,„,‟,«,»,,,,"
latin:keyWidth="9.2%p"
latin:keyStyle="nonPasswordFunctionalKeyStyle" /> latin:keyStyle="nonPasswordFunctionalKeyStyle" />
<Key <Key
latin:keyStyle="spaceKeyStyle" latin:keyStyle="spaceKeyStyle"
latin:keyWidth="30%p" /> latin:keyWidth="35.83%p" />
<Key
latin:keyLabel="…"
latin:keyWidth="9.2%p"
latin:keyStyle="nonPasswordFunctionalKeyStyle" />
</case> </case>
<!-- latin:hasSettingsKey="false" --> <!-- latin:hasSettingsKey="false" -->
<default> <default>
<Key <Key
latin:keyStyle="toAlphaKeyStyle" latin:keyStyle="toAlphaKeyStyle"
latin:keyWidth="20%p" latin:keyWidth="15%p"
latin:keyEdgeFlags="left" /> latin:keyEdgeFlags="left" />
<Key <Key
latin:keyLabel="„" latin:keyLabel="„"
@ -55,12 +61,12 @@
latin:keyStyle="nonPasswordFunctionalKeyStyle" /> latin:keyStyle="nonPasswordFunctionalKeyStyle" />
<Key <Key
latin:keyStyle="spaceKeyStyle" latin:keyStyle="spaceKeyStyle"
latin:keyWidth="40%p" /> latin:keyWidth="50%p" />
<Key
latin:keyLabel="…"
latin:keyStyle="nonPasswordFunctionalKeyStyle" />
</default> </default>
</switch> </switch>
<Key
latin:keyLabel="…"
latin:keyStyle="nonPasswordFunctionalKeyStyle" />
<switch> <switch>
<case <case
latin:mode="im" latin:mode="im"