Skip to content
Snippets Groups Projects
Commit 416534d0 authored by Tadashi G. Takaoka's avatar Tadashi G. Takaoka Committed by Android (Google) Code Review
Browse files

Merge "Make spacebar wider on phones"

parents 2951aa7e c00ffa4c
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
java/res/xml/kbd_key_styles.xml
+ 2
− 2
View file @ 416534d0
......@@ -101,8 +101,8 @@
<key-style
latin:styleName="settingsKeyStyle"
latin:code="@integer/key_settings"
latin:keyIcon="@drawable/sym_keyboard_settings_holo"
latin:iconPreview="@drawable/sym_keyboard_settings_holo"
latin:keyIcon="@drawable/sym_keyboard_settings"
latin:iconPreview="@drawable/sym_keyboard_settings"
latin:parentStyle="functionalKeyStyle" />
<key-style
latin:styleName="spaceKeyStyle"
......
java/res/xml/kbd_qwerty_f1.xml
+ 72
− 19
View file @ 416534d0
......@@ -23,39 +23,92 @@
>
<switch>
<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>
<case
latin:hasVoiceKey="true"
latin:mode="url"
>
<Key
latin:keyStyle="micKeyStyle" />
latin:keyLabel="/"
latin:keyWidth="9.2%p"
latin:keyStyle="settingsPopupStyle" />
</case>
<!-- latin:hasVoiceKey="false" -->
<case
latin:navigateAction="true"
latin:mode="email"
>
<Key
latin:keyLabel="."
latin:keyLabel="\@"
latin:keyWidth="9.2%p"
latin:keyStyle="settingsPopupStyle" />
</case>
<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
latin:keyLabel="/"
latin:keyStyle="settingsPopupStyle" />
</case>
<case
latin:mode="email"
>
<Key
latin:keyLabel=","
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>
</switch>
</default>
......
java/res/xml/kbd_qwerty_row4.xml
+ 46
− 24
View file @ 416534d0
......@@ -31,46 +31,68 @@
>
<Key
latin:keyStyle="toSymbolKeyStyle"
latin:keyWidth="15%p"
latin:keyWidth="13.75%p"
latin:keyEdgeFlags="left" />
<Key
latin:keyStyle="settingsKeyStyle" />
latin:keyStyle="settingsKeyStyle"
latin:keyWidth="9.2%p" />
<include
latin:keyboardLayout="@xml/kbd_qwerty_f1" />
<Key
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>
<!-- latin:hasSettingsKey="false" -->
<default>
<Key
latin:keyStyle="toSymbolKeyStyle"
latin:keyWidth="20%p"
latin:keyWidth="15%p"
latin:keyEdgeFlags="left" />
<include
latin:keyboardLayout="@xml/kbd_qwerty_f1" />
<Key
latin:keyStyle="spaceKeyStyle"
latin:keyWidth="40%p" />
</default>
</switch>
<switch>
<case
latin:navigateAction="true"
>
<Key
latin:keyStyle="tabKeyStyle"
latin:keyLabelOption="popupHint"
latin:popupCharacters="@string/alternates_for_web_tab_punctuation"
latin:maxPopupKeyboardColumn="8" />
</case>
<default>
<Key
latin:keyLabel="."
latin:keyLabelOption="popupHint"
latin:popupCharacters="@string/alternates_for_punctuation"
latin:maxPopupKeyboardColumn="7"
latin:keyStyle="functionalKeyStyle" />
latin:keyWidth="50%p" />
<switch>
<case
latin:navigateAction="true"
>
<Key
latin:keyStyle="tabKeyStyle"
latin:keyLabelOption="popupHint"
latin:popupCharacters="@string/alternates_for_web_tab_punctuation"
latin:maxPopupKeyboardColumn="8" />
</case>
<default>
<Key
latin:keyLabel="."
latin:keyLabelOption="popupHint"
latin:popupCharacters="@string/alternates_for_punctuation"
latin:maxPopupKeyboardColumn="7"
latin:keyStyle="functionalKeyStyle" />
</default>
</switch>
</default>
</switch>
<switch>
......
java/res/xml/kbd_symbols_f1.xml
+ 32
− 7
View file @ 416534d0
......@@ -23,16 +23,41 @@
>
<switch>
<case
latin:hasVoiceKey="true"
latin:hasSettingsKey="true"
>
<Key
latin:keyStyle="micKeyStyle" />
<switch>
<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>
<!-- latin:hasVoiceKey="false" -->
<!-- hasSettingsKey="false" -->
<default>
<Key
latin:keyLabel=","
latin:keyStyle="settingsPopupStyle" />
<switch>
<case
latin:hasVoiceKey="true"
>
<Key
latin:keyStyle="micKeyStyle" />
</case>
<!-- latin:hasVoiceKey="false" -->
<default>
<Key
latin:keyLabel=","
latin:keyStyle="settingsPopupStyle" />
</default>
</switch>
</default>
</switch>
</merge>
java/res/xml/kbd_symbols_row4.xml
+ 19
− 11
View file @ 416534d0
......@@ -31,35 +31,43 @@
>
<Key
latin:keyStyle="toAlphaKeyStyle"
latin:keyWidth="15%p"
latin:keyWidth="13.75%p"
latin:keyEdgeFlags="left" />
<Key
latin:keyStyle="settingsKeyStyle" />
latin:keyStyle="settingsKeyStyle"
latin:keyWidth="9.2%p" />
<include
latin:keyboardLayout="@xml/kbd_qwerty_f1" />
<Key
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>
<!-- latin:hasSettingsKey="false" -->
<default>
<Key
latin:keyStyle="toAlphaKeyStyle"
latin:keyWidth="20%p"
latin:keyWidth="15%p"
latin:keyEdgeFlags="left" />
<include
latin:keyboardLayout="@xml/kbd_symbols_f1" />
<Key
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>
</switch>
<Key
latin:keyLabel="."
latin:keyLabelOption="popupHint"
latin:popupCharacters="@string/alternates_for_punctuation"
latin:maxPopupKeyboardColumn="7"
latin:keyStyle="functionalKeyStyle" />
<switch>
<case
latin:mode="im"
......
java/res/xml/kbd_symbols_shift_row4.xml
+ 14
− 8
View file @ 416534d0
......@@ -31,23 +31,29 @@
>
<Key
latin:keyStyle="toAlphaKeyStyle"
latin:keyWidth="15%p"
latin:keyWidth="13.75%p"
latin:keyEdgeFlags="left" />
<Key
latin:keyStyle="settingsKeyStyle" />
latin:keyStyle="settingsKeyStyle"
latin:keyWidth="9.2%p" />
<Key
latin:keyLabel="„"
latin:popupCharacters="“,”,„,‟,«,»,‘,’,‚,‛"
latin:keyWidth="9.2%p"
latin:keyStyle="nonPasswordFunctionalKeyStyle" />
<Key
latin:keyStyle="spaceKeyStyle"
latin:keyWidth="30%p" />
latin:keyWidth="35.83%p" />
<Key
latin:keyLabel="…"
latin:keyWidth="9.2%p"
latin:keyStyle="nonPasswordFunctionalKeyStyle" />
</case>
<!-- latin:hasSettingsKey="false" -->
<default>
<Key
latin:keyStyle="toAlphaKeyStyle"
latin:keyWidth="20%p"
latin:keyWidth="15%p"
latin:keyEdgeFlags="left" />
<Key
latin:keyLabel="„"
......@@ -55,12 +61,12 @@
latin:keyStyle="nonPasswordFunctionalKeyStyle" />
<Key
latin:keyStyle="spaceKeyStyle"
latin:keyWidth="40%p" />
latin:keyWidth="50%p" />
<Key
latin:keyLabel="…"
latin:keyStyle="nonPasswordFunctionalKeyStyle" />
</default>
</switch>
<Key
latin:keyLabel="…"
latin:keyStyle="nonPasswordFunctionalKeyStyle" />
<switch>
<case
latin:mode="im"
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment