Merge "Add a mic key to tablet keyboard tentatively for implementation"

main
Tadashi G. Takaoka 2010-12-06 21:18:52 -08:00 committed by Android (Google) Code Review
commit 3b03887f1c
7 changed files with 27 additions and 1 deletions

View File

@ -50,7 +50,6 @@
latin:keyIcon="@drawable/sym_keyboard_return_holo" latin:keyIcon="@drawable/sym_keyboard_return_holo"
latin:iconPreview="@drawable/sym_keyboard_feedback_return" latin:iconPreview="@drawable/sym_keyboard_feedback_return"
latin:parentStyle="functionalKeyStyle" /> latin:parentStyle="functionalKeyStyle" />
1
<key-style <key-style
latin:styleName="spaceKeyStyle" latin:styleName="spaceKeyStyle"
latin:codes="@integer/key_space" latin:codes="@integer/key_space"
@ -69,6 +68,12 @@
latin:keyOutputText=";-) " latin:keyOutputText=";-) "
latin:keyHintIcon="@drawable/hint_popup_holo" latin:keyHintIcon="@drawable/hint_popup_holo"
latin:popupKeyboard="@xml/popup_smileys" /> latin:popupKeyboard="@xml/popup_smileys" />
<key-style
latin:styleName="micKeyStyle"
latin:codes="@integer/key_voice"
latin:keyIcon="@drawable/sym_keyboard_mic"
latin:iconPreview="@drawable/sym_keyboard_feedback_mic"
latin:parentStyle="functionalKeyStyle" />
</case> </case>
<case <case
latin:colorScheme="black" latin:colorScheme="black"
@ -113,6 +118,12 @@
latin:keyOutputText=";-) " latin:keyOutputText=";-) "
latin:keyHintIcon="@drawable/hint_popup_holo" latin:keyHintIcon="@drawable/hint_popup_holo"
latin:popupKeyboard="@xml/popup_smileys" /> latin:popupKeyboard="@xml/popup_smileys" />
<key-style
latin:styleName="micKeyStyle"
latin:codes="@integer/key_voice"
latin:keyIcon="@drawable/sym_bkeyboard_mic"
latin:iconPreview="@drawable/sym_keyboard_feedback_mic"
latin:parentStyle="functionalKeyStyle" />
</case> </case>
</switch> </switch>
<key-style <key-style

View File

@ -128,6 +128,9 @@
latin:keyLabel="0" /> latin:keyLabel="0" />
<Key <Key
latin:keyLabel="#" /> latin:keyLabel="#" />
<Key
latin:keyStyle="micKeyStyle"
latin:keyWidth="8.042%p" />
<!-- There is an empty area bellow the "Enter" key and right of the "#" key. To ignore <!-- There is an empty area bellow the "Enter" key and right of the "#" key. To ignore
the touch event on the area, "#" is intentionally not marked as a right edge key. --> the touch event on the area, "#" is intentionally not marked as a right edge key. -->
</Row> </Row>

View File

@ -136,6 +136,9 @@
latin:keyStyle="num0KeyStyle" /> latin:keyStyle="num0KeyStyle" />
<Key <Key
latin:keyStyle="numPoundKeyStyle" /> latin:keyStyle="numPoundKeyStyle" />
<Key
latin:keyStyle="micKeyStyle"
latin:keyWidth="8.042%p" />
<!-- There is an empty area bellow the "Enter" key and right of the "#" key. To ignore <!-- There is an empty area bellow the "Enter" key and right of the "#" key. To ignore
the touch event on the area, "#" is intentionally not marked as a right edge key. --> the touch event on the area, "#" is intentionally not marked as a right edge key. -->
</Row> </Row>

View File

@ -148,6 +148,9 @@
latin:keyStyle="num0KeyStyle" /> latin:keyStyle="num0KeyStyle" />
<Key <Key
latin:keyStyle="numPoundKeyStyle" /> latin:keyStyle="numPoundKeyStyle" />
<Key
latin:keyStyle="micKeyStyle"
latin:keyWidth="8.042%p" />
<!-- There is an empty area bellow the "Enter" key and right of the "#" key. To ignore <!-- There is an empty area bellow the "Enter" key and right of the "#" key. To ignore
the touch event on the area, "#" is intentionally not marked as a right edge key. --> the touch event on the area, "#" is intentionally not marked as a right edge key. -->
</Row> </Row>

View File

@ -104,5 +104,7 @@
latin:popupCharacters="_" /> latin:popupCharacters="_" />
</default> </default>
</switch> </switch>
<Key
latin:keyStyle="micKeyStyle" />
</Row> </Row>
</merge> </merge>

View File

@ -178,5 +178,7 @@
latin:popupCharacters="“”«»˝" /> latin:popupCharacters="“”«»˝" />
<Key <Key
latin:keyLabel="_" /> latin:keyLabel="_" />
<Key
latin:keyStyle="micKeyStyle" />
</Row> </Row>
</Keyboard> </Keyboard>

View File

@ -142,5 +142,7 @@
<Key <Key
latin:keyStyle="spaceKeyStyle" latin:keyStyle="spaceKeyStyle"
latin:keyWidth="37.454%p" /> latin:keyWidth="37.454%p" />
<Key
latin:keyStyle="micKeyStyle" />
</Row> </Row>
</Keyboard> </Keyboard>