Merge "Add settings key to table keyboard" into honeycomb

main
Tadashi G. Takaoka 2011-01-18 00:50:51 -08:00 committed by Android (Google) Code Review
commit 4e73674943
8 changed files with 34 additions and 7 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.4 KiB

View File

@ -65,6 +65,12 @@
latin:keyHintIcon="@drawable/hint_popup_holo" latin:keyHintIcon="@drawable/hint_popup_holo"
latin:popupCharacters="@string/alternates_for_smiley" latin:popupCharacters="@string/alternates_for_smiley"
latin:maxPopupKeyboardColumn="5" /> latin:maxPopupKeyboardColumn="5" />
<key-style
latin:styleName="settingsKeyStyle"
latin:code="@integer/key_settings"
latin:keyIcon="@drawable/sym_keyboard_settings_holo"
latin:iconPreview="@drawable/sym_keyboard_feedback_settings"
latin:parentStyle="functionalKeyStyle" />
<key-style <key-style
latin:styleName="micKeyStyle" latin:styleName="micKeyStyle"
latin:code="@integer/key_voice" latin:code="@integer/key_voice"
@ -113,6 +119,12 @@
latin:keyHintIcon="@drawable/hint_popup_holo" latin:keyHintIcon="@drawable/hint_popup_holo"
latin:popupCharacters="@string/alternates_for_smiley" latin:popupCharacters="@string/alternates_for_smiley"
latin:maxPopupKeyboardColumn="5" /> latin:maxPopupKeyboardColumn="5" />
<key-style
latin:styleName="settingsKeyStyle"
latin:code="@integer/key_settings"
latin:keyIcon="@drawable/sym_bkeyboard_settings"
latin:iconPreview="@drawable/sym_keyboard_feedback_settings"
latin:parentStyle="functionalKeyStyle" />
<key-style <key-style
latin:styleName="micKeyStyle" latin:styleName="micKeyStyle"
latin:code="@integer/key_voice" latin:code="@integer/key_voice"

View File

@ -120,7 +120,10 @@
<!-- There is an empty area bellow the "More" key and left of the "space" key. To ignore <!-- There is an empty area bellow the "More" key and left of the "space" key. To ignore
the touch event on the area, "space" is intentionally not marked as a left edge key. --> the touch event on the area, "space" is intentionally not marked as a left edge key. -->
<Spacer <Spacer
latin:horizontalGap="16.406%p" /> latin:horizontalGap="8.362%p" />
<Key
latin:keyStyle="settingsKeyStyle"
latin:keyWidth="8.042%p" />
<Key <Key
latin:keyStyle="nonSpecialBackgroundSpaceKeyStyle" latin:keyStyle="nonSpecialBackgroundSpaceKeyStyle"
latin:keyWidth="24.127%p" /> latin:keyWidth="24.127%p" />

View File

@ -128,10 +128,13 @@
<!-- There is an empty area bellow the "More" key and left of the "space" key. To ignore <!-- There is an empty area bellow the "More" key and left of the "space" key. To ignore
the touch event on the area, "space" is intentionally not marked as a left edge key. --> the touch event on the area, "space" is intentionally not marked as a left edge key. -->
<Spacer <Spacer
latin:horizontalGap="20.427%p" /> latin:horizontalGap="12.340%p" />
<Key
latin:keyStyle="settingsKeyStyle"
latin:keyWidth="8.042%p" />
<Key <Key
latin:keyStyle="nonSpecialBackgroundSpaceKeyStyle" latin:keyStyle="nonSpecialBackgroundSpaceKeyStyle"
latin:keyWidth="16.085%p" /> latin:keyWidth="16.084%p" />
<Spacer <Spacer
latin:horizontalGap="8.479%p" /> latin:horizontalGap="8.479%p" />
<Key <Key

View File

@ -140,7 +140,10 @@
<!-- There is an empty area bellow the "More" key and left of the "space" key. To ignore <!-- There is an empty area bellow the "More" key and left of the "space" key. To ignore
the touch event on the area, "space" is intentionally not marked as a left edge key. --> the touch event on the area, "space" is intentionally not marked as a left edge key. -->
<Spacer <Spacer
latin:horizontalGap="16.406%p" /> latin:horizontalGap="8.362%p" />
<Key
latin:keyStyle="settingsKeyStyle"
latin:keyWidth="8.042%p" />
<Key <Key
latin:keyStyle="nonSpecialBackgroundSpaceKeyStyle" latin:keyStyle="nonSpecialBackgroundSpaceKeyStyle"
latin:keyWidth="24.127%p" /> latin:keyWidth="24.127%p" />

View File

@ -26,7 +26,9 @@
latin:keyWidth="8.042%p" latin:keyWidth="8.042%p"
> >
<Spacer <Spacer
latin:horizontalGap="16.404%p" /> latin:horizontalGap="8.362%p" />
<Key
latin:keyStyle="settingsKeyStyle" />
<switch> <switch>
<case <case
latin:mode="email" latin:mode="email"

View File

@ -149,7 +149,9 @@
latin:keyWidth="8.042%p" latin:keyWidth="8.042%p"
> >
<Spacer <Spacer
latin:horizontalGap="16.404%p" /> latin:horizontalGap="8.362%p" />
<Key
latin:keyStyle="settingsKeyStyle" />
<Key <Key
latin:keyLabel="/" /> latin:keyLabel="/" />
<Key <Key

View File

@ -135,7 +135,9 @@
latin:keyWidth="8.042%p" latin:keyWidth="8.042%p"
> >
<Spacer <Spacer
latin:horizontalGap="32.488%p" /> latin:horizontalGap="24.446%p" />
<Key
latin:keyStyle="settingsKeyStyle" />
<Key <Key
latin:keyStyle="spaceKeyStyle" latin:keyStyle="spaceKeyStyle"
latin:keyWidth="37.454%p" /> latin:keyWidth="37.454%p" />