am 673aed42: Add settings button

Merge commit '673aed42c3b291fc9f81ead58ca35a5d150f4dce' into gingerbread-plus-aosp

* commit '673aed42c3b291fc9f81ead58ca35a5d150f4dce':
  Add settings button
main
satok 2010-08-30 22:06:33 -07:00 committed by Android Git Automerger
commit 28f6351df3
14 changed files with 93 additions and 293 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 729 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 729 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 KiB

View File

@ -20,5 +20,6 @@
<resources> <resources>
<!-- Keycode for F1 (function) key. This one switches between language switch & comma/.com --> <!-- Keycode for F1 (function) key. This one switches between language switch & comma/.com -->
<integer name="key_settings">-100</integer>
<integer name="key_f1">-103</integer> <integer name="key_f1">-103</integer>
</resources> </resources>

View File

@ -1,106 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
/*
**
** Copyright 2008, The Android Open Source Project
**
** Licensed under the Apache License, Version 2.0 (the "License");
** you may not use this file except in compliance with the License.
** You may obtain a copy of the License at
**
** http://www.apache.org/licenses/LICENSE-2.0
**
** Unless required by applicable law or agreed to in writing, software
** distributed under the License is distributed on an "AS IS" BASIS,
** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
** See the License for the specific language governing permissions and
** limitations under the License.
*/
-->
<Keyboard xmlns:android="http://schemas.android.com/apk/res/android"
android:keyWidth="10%p"
android:horizontalGap="0px"
android:verticalGap="0px"
android:keyHeight="@dimen/key_height"
>
<Row>
<Key android:keyLabel="a"
android:popupKeyboard="@xml/kbd_popup_template"
android:popupCharacters="@string/alternates_for_a"
android:keyEdgeFlags="left" />
<Key android:keyLabel="b" />
<Key android:keyLabel="c"
android:popupKeyboard="@xml/kbd_popup_template"
android:popupCharacters="@string/alternates_for_c" />
<Key android:keyLabel="d" />
<Key android:keyLabel="e"
android:popupKeyboard="@xml/kbd_popup_template"
android:popupCharacters="@string/alternates_for_e" />
<Key android:keyLabel="f" />
<Key android:keyLabel="g" />
<Key android:keyLabel="h" />
<Key android:keyLabel="i"
android:popupKeyboard="@xml/kbd_popup_template"
android:popupCharacters="@string/alternates_for_i" />
<Key android:keyLabel="j" android:keyEdgeFlags="right" />
</Row>
<Row>
<Key android:keyLabel="k" android:keyEdgeFlags="left" />
<Key android:keyLabel="l" />
<Key android:keyLabel="m" />
<Key android:keyLabel="n"
android:popupKeyboard="@xml/kbd_popup_template"
android:popupCharacters="@string/alternates_for_n" />
<Key android:keyLabel="o"
android:popupKeyboard="@xml/kbd_popup_template"
android:popupCharacters="@string/alternates_for_o" />
<Key android:keyLabel="p" />
<Key android:keyLabel="q" />
<Key android:keyLabel="r" />
<Key android:keyLabel="s"
android:popupKeyboard="@xml/kbd_popup_template"
android:popupCharacters="@string/alternates_for_s" />
<Key android:keyLabel="t" android:keyEdgeFlags="right" />
</Row>
<Row>
<Key android:codes="-1" android:keyIcon="@drawable/sym_keyboard_shift"
android:keyWidth="15%p" android:isModifier="true"
android:iconPreview="@drawable/sym_keyboard_feedback_shift"
android:isSticky="true" android:keyEdgeFlags="left"/>
<Key android:keyLabel="u"
android:popupKeyboard="@xml/kbd_popup_template"
android:popupCharacters="@string/alternates_for_u" />
<Key android:keyLabel="v"/>
<Key android:keyLabel="w"/>
<Key android:keyLabel="x"/>
<Key android:keyLabel="y"
android:popupKeyboard="@xml/kbd_popup_template"
android:popupCharacters="@string/alternates_for_y"
/>
<Key android:keyLabel="z"/>
<Key android:keyLabel=","/>
<Key android:codes="-5" android:keyIcon="@drawable/sym_keyboard_delete"
android:keyWidth="15%p" android:keyEdgeFlags="right"
android:iconPreview="@drawable/sym_keyboard_feedback_delete"
android:isRepeatable="true"/>
</Row>
<Row android:rowEdgeFlags="bottom">
<Key android:codes="-3" android:keyIcon="@drawable/sym_keyboard_done"
android:iconPreview="@drawable/sym_keyboard_feedback_done"
android:keyWidth="20%p" android:keyEdgeFlags="left"/>
<Key android:codes="-2" android:keyLabel="123" android:keyWidth="15%p"/>
<Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space"
android:iconPreview="@drawable/sym_keyboard_feedback_space"
android:keyWidth="30%p" android:isRepeatable="true"/>
<Key android:codes="46" android:keyLabel="."
android:popupKeyboard="@xml/popup_punctuation"
android:keyWidth="15%p"/>
<Key android:codes="10" android:keyIcon="@drawable/sym_keyboard_return"
android:iconPreview="@drawable/sym_keyboard_feedback_return"
android:keyWidth="20%p" android:keyEdgeFlags="right"/>
</Row>
</Keyboard>

View File

@ -1,106 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
/*
**
** Copyright 2010, The Android Open Source Project
**
** Licensed under the Apache License, Version 2.0 (the "License");
** you may not use this file except in compliance with the License.
** You may obtain a copy of the License at
**
** http://www.apache.org/licenses/LICENSE-2.0
**
** Unless required by applicable law or agreed to in writing, software
** distributed under the License is distributed on an "AS IS" BASIS,
** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
** See the License for the specific language governing permissions and
** limitations under the License.
*/
-->
<Keyboard xmlns:android="http://schemas.android.com/apk/res/android"
android:keyWidth="10%p"
android:horizontalGap="0px"
android:verticalGap="0px"
android:keyHeight="@dimen/key_height"
>
<Row>
<Key android:keyLabel="a"
android:popupKeyboard="@xml/kbd_popup_template"
android:popupCharacters="@string/alternates_for_a"
android:keyEdgeFlags="left" />
<Key android:keyLabel="b" />
<Key android:keyLabel="c"
android:popupKeyboard="@xml/kbd_popup_template"
android:popupCharacters="@string/alternates_for_c" />
<Key android:keyLabel="d" />
<Key android:keyLabel="e"
android:popupKeyboard="@xml/kbd_popup_template"
android:popupCharacters="@string/alternates_for_e" />
<Key android:keyLabel="f" />
<Key android:keyLabel="g" />
<Key android:keyLabel="h" />
<Key android:keyLabel="i"
android:popupKeyboard="@xml/kbd_popup_template"
android:popupCharacters="@string/alternates_for_i" />
<Key android:keyLabel="j" android:keyEdgeFlags="right" />
</Row>
<Row>
<Key android:keyLabel="k" android:keyEdgeFlags="left" />
<Key android:keyLabel="l" />
<Key android:keyLabel="m" />
<Key android:keyLabel="n"
android:popupKeyboard="@xml/kbd_popup_template"
android:popupCharacters="@string/alternates_for_n" />
<Key android:keyLabel="o"
android:popupKeyboard="@xml/kbd_popup_template"
android:popupCharacters="@string/alternates_for_o" />
<Key android:keyLabel="p" />
<Key android:keyLabel="q" />
<Key android:keyLabel="r" />
<Key android:keyLabel="s"
android:popupKeyboard="@xml/kbd_popup_template"
android:popupCharacters="@string/alternates_for_s" />
<Key android:keyLabel="t" android:keyEdgeFlags="right" />
</Row>
<Row>
<Key android:codes="-1" android:keyIcon="@drawable/sym_bkeyboard_shift"
android:keyWidth="15%p" android:isModifier="true"
android:iconPreview="@drawable/sym_keyboard_feedback_shift"
android:isSticky="true" android:keyEdgeFlags="left"/>
<Key android:keyLabel="u"
android:popupKeyboard="@xml/kbd_popup_template"
android:popupCharacters="@string/alternates_for_u" />
<Key android:keyLabel="v"/>
<Key android:keyLabel="w"/>
<Key android:keyLabel="x"/>
<Key android:keyLabel="y"
android:popupKeyboard="@xml/kbd_popup_template"
android:popupCharacters="@string/alternates_for_y"
/>
<Key android:keyLabel="z"/>
<Key android:keyLabel=","/>
<Key android:codes="-5" android:keyIcon="@drawable/sym_bkeyboard_delete"
android:keyWidth="15%p" android:keyEdgeFlags="right"
android:iconPreview="@drawable/sym_keyboard_feedback_delete"
android:isRepeatable="true"/>
</Row>
<Row android:rowEdgeFlags="bottom">
<Key android:codes="-3" android:keyIcon="@drawable/sym_bkeyboard_done"
android:iconPreview="@drawable/sym_keyboard_feedback_done"
android:keyWidth="20%p" android:keyEdgeFlags="left"/>
<Key android:codes="-2" android:keyLabel="123" android:keyWidth="15%p"/>
<Key android:codes="32" android:keyIcon="@drawable/sym_bkeyboard_space"
android:iconPreview="@drawable/sym_keyboard_feedback_space"
android:keyWidth="30%p" android:isRepeatable="true"/>
<Key android:codes="46" android:keyLabel="."
android:popupKeyboard="@xml/popup_punctuation"
android:keyWidth="15%p"/>
<Key android:codes="10" android:keyIcon="@drawable/sym_bkeyboard_return"
android:iconPreview="@drawable/sym_keyboard_feedback_return"
android:keyWidth="20%p" android:keyEdgeFlags="right"/>
</Row>
</Keyboard>

View File

@ -111,74 +111,81 @@
<Row android:keyboardMode="@+id/mode_normal" android:rowEdgeFlags="bottom"> <Row android:keyboardMode="@+id/mode_normal" android:rowEdgeFlags="bottom">
<Key android:codes="-2" android:keyLabel="@string/label_symbol_key" <Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
android:keyWidth="20%p" android:keyEdgeFlags="left"/> android:keyWidth="15%p" android:keyEdgeFlags="left"/>
<Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings"
android:iconPreview="@drawable/sym_keyboard_feedback_settings"
android:keyWidth="10%p"/>
<Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_keyboard_mic" <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_keyboard_mic"
android:iconPreview="@drawable/sym_keyboard_feedback_mic" android:iconPreview="@drawable/sym_keyboard_feedback_mic"
android:keyWidth="10%p"/> android:keyWidth="10%p"/>
<Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space" <Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space"
android:iconPreview="@drawable/sym_keyboard_feedback_space" android:iconPreview="@drawable/sym_keyboard_feedback_space"
android:keyWidth="40%p" android:isRepeatable="true"/> android:keyWidth="30%p" android:isRepeatable="true"/>
<Key android:codes="46" android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" <Key android:codes="46" android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"
android:keyWidth="10%p"/> android:keyWidth="10%p"/>
<Key android:codes="10" android:keyIcon="@drawable/sym_keyboard_return" <Key android:codes="10" android:keyIcon="@drawable/sym_keyboard_return"
android:iconPreview="@drawable/sym_keyboard_feedback_return" android:iconPreview="@drawable/sym_keyboard_feedback_return"
android:keyWidth="20%p" android:keyEdgeFlags="right"/> android:keyWidth="25%p" android:keyEdgeFlags="right"/>
</Row> </Row>
<Row android:keyboardMode="@+id/mode_url" android:rowEdgeFlags="bottom"> <Row android:keyboardMode="@+id/mode_url" android:rowEdgeFlags="bottom">
<Key android:codes="-2" android:keyLabel="@string/label_symbol_key" <Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
android:keyWidth="20%p" android:keyEdgeFlags="left"/> android:keyWidth="15%p" android:keyEdgeFlags="left"/>
<Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings"
android:iconPreview="@drawable/sym_keyboard_feedback_settings"
android:keyWidth="10%p"/>
<Key android:keyLabel="/" android:keyWidth="10%p"/> <Key android:keyLabel="/" android:keyWidth="10%p"/>
<Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space" <Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space"
android:iconPreview="@drawable/sym_keyboard_feedback_space" android:iconPreview="@drawable/sym_keyboard_feedback_space"
android:keyWidth="40%p" android:isRepeatable="true"/> android:keyWidth="30%p" android:isRepeatable="true"/>
<!--Key android:keyLabel="@string/popular_domain_0"
android:keyOutputText="@string/popular_domain_0"
android:popupKeyboard="@xml/popup_domains"
android:keyWidth="20%p"/-->
<Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"
android:keyWidth="10%p"/> android:keyWidth="10%p"/>
<Key android:codes="10" android:keyIcon="@drawable/sym_keyboard_return" <Key android:codes="10" android:keyIcon="@drawable/sym_keyboard_return"
android:iconPreview="@drawable/sym_keyboard_feedback_return" android:iconPreview="@drawable/sym_keyboard_feedback_return"
android:keyWidth="20%p" android:keyEdgeFlags="right"/> android:keyWidth="25%p" android:keyEdgeFlags="right"/>
</Row> </Row>
<Row android:keyboardMode="@+id/mode_email" android:rowEdgeFlags="bottom"> <Row android:keyboardMode="@+id/mode_email" android:rowEdgeFlags="bottom">
<Key android:codes="-2" android:keyLabel="@string/label_symbol_key" <Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
android:keyWidth="20%p" android:keyEdgeFlags="left"/> android:keyWidth="15%p" android:keyEdgeFlags="left"/>
<Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings"
android:iconPreview="@drawable/sym_keyboard_feedback_settings"
android:keyWidth="10%p"/>
<Key android:keyLabel="\@"/> <Key android:keyLabel="\@"/>
<Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space" <Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space"
android:iconPreview="@drawable/sym_keyboard_feedback_space" android:iconPreview="@drawable/sym_keyboard_feedback_space"
android:keyWidth="40%p" android:isRepeatable="true"/> android:keyWidth="30%p" android:isRepeatable="true"/>
<!--Key android:keyLabel="@string/popular_domain_0"
android:keyOutputText="@string/popular_domain_0"
android:popupKeyboard="@xml/popup_domains"
android:keyWidth="20%p"/-->
<Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"/> <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"/>
<Key android:codes="10" android:keyIcon="@drawable/sym_keyboard_return" <Key android:codes="10" android:keyIcon="@drawable/sym_keyboard_return"
android:iconPreview="@drawable/sym_keyboard_feedback_return" android:iconPreview="@drawable/sym_keyboard_feedback_return"
android:keyWidth="20%p" android:keyEdgeFlags="right"/> android:keyWidth="25%p" android:keyEdgeFlags="right"/>
</Row> </Row>
<Row android:keyboardMode="@+id/mode_im" android:rowEdgeFlags="bottom"> <Row android:keyboardMode="@+id/mode_im" android:rowEdgeFlags="bottom">
<Key android:codes="-2" android:keyLabel="@string/label_symbol_key" <Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
android:keyWidth="20%p" android:keyEdgeFlags="left"/> android:keyWidth="15%p" android:keyEdgeFlags="left"/>
<Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings"
android:iconPreview="@drawable/sym_keyboard_feedback_settings"
android:keyWidth="10%p"/>
<Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_keyboard_mic" <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_keyboard_mic"
android:iconPreview="@drawable/sym_keyboard_feedback_mic" android:iconPreview="@drawable/sym_keyboard_feedback_mic"
android:keyWidth="10%p"/> android:keyWidth="10%p"/>
<Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space" <Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space"
android:iconPreview="@drawable/sym_keyboard_feedback_space" android:iconPreview="@drawable/sym_keyboard_feedback_space"
android:keyWidth="40%p" android:isRepeatable="true"/> android:keyWidth="30%p" android:isRepeatable="true"/>
<Key android:codes="46" android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" <Key android:codes="46" android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"
android:keyWidth="10%p"/> android:keyWidth="10%p"/>
<Key android:keyLabel=":-)" android:keyOutputText=":-) " <Key android:keyLabel=":-)" android:keyOutputText=":-) "
android:popupKeyboard="@xml/popup_smileys" android:popupKeyboard="@xml/popup_smileys"
android:keyWidth="20%p" android:keyEdgeFlags="right"/> android:keyWidth="25%p" android:keyEdgeFlags="right"/>
</Row> </Row>
<Row android:keyboardMode="@+id/mode_webentry" android:rowEdgeFlags="bottom"> <Row android:keyboardMode="@+id/mode_webentry" android:rowEdgeFlags="bottom">
<Key android:codes="-2" android:keyLabel="@string/label_symbol_key" <Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
android:keyWidth="20%p" android:keyEdgeFlags="left"/> android:keyWidth="10%p" android:keyEdgeFlags="left"/>
<Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings"
android:iconPreview="@drawable/sym_keyboard_feedback_settings"
android:keyWidth="10%p"/>
<Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_keyboard_mic" <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_keyboard_mic"
android:iconPreview="@drawable/sym_keyboard_feedback_mic" android:iconPreview="@drawable/sym_keyboard_feedback_mic"
android:keyWidth="10%p"/> android:keyWidth="10%p"/>
@ -187,12 +194,11 @@
android:keyWidth="20%p" android:isRepeatable="true"/> android:keyWidth="20%p" android:isRepeatable="true"/>
<Key android:codes="9" android:keyIcon="@drawable/sym_keyboard_tab" <Key android:codes="9" android:keyIcon="@drawable/sym_keyboard_tab"
android:iconPreview="@drawable/sym_keyboard_feedback_tab" android:iconPreview="@drawable/sym_keyboard_feedback_tab"
android:keyWidth="20%p"/> android:keyWidth="15%p"/>
<Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"/> <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"
android:keyWidth="10%p"/>
<Key android:codes="10" android:keyIcon="@drawable/sym_keyboard_return" <Key android:codes="10" android:keyIcon="@drawable/sym_keyboard_return"
android:iconPreview="@drawable/sym_keyboard_feedback_return" android:iconPreview="@drawable/sym_keyboard_feedback_return"
android:keyWidth="20%p" android:keyEdgeFlags="right"/> android:keyWidth="15%p" android:keyEdgeFlags="right"/>
</Row> </Row>
</Keyboard> </Keyboard>

View File

@ -111,74 +111,81 @@
<Row android:keyboardMode="@+id/mode_normal" android:rowEdgeFlags="bottom"> <Row android:keyboardMode="@+id/mode_normal" android:rowEdgeFlags="bottom">
<Key android:codes="-2" android:keyLabel="@string/label_symbol_key" <Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
android:keyWidth="20%p" android:keyEdgeFlags="left"/> android:keyWidth="15%p" android:keyEdgeFlags="left"/>
<Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings"
android:iconPreview="@drawable/sym_keyboard_feedback_settings"
android:keyWidth="10%p"/>
<Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_bkeyboard_mic" <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_bkeyboard_mic"
android:iconPreview="@drawable/sym_keyboard_feedback_mic" android:iconPreview="@drawable/sym_keyboard_feedback_mic"
android:keyWidth="10%p"/> android:keyWidth="10%p"/>
<Key android:codes="32" android:keyIcon="@drawable/sym_bkeyboard_space" <Key android:codes="32" android:keyIcon="@drawable/sym_bkeyboard_space"
android:iconPreview="@drawable/sym_keyboard_feedback_space" android:iconPreview="@drawable/sym_keyboard_feedback_space"
android:keyWidth="40%p" android:isRepeatable="true"/> android:keyWidth="30%p" android:isRepeatable="true"/>
<Key android:codes="46" android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" <Key android:codes="46" android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"
android:keyWidth="10%p"/> android:keyWidth="10%p"/>
<Key android:codes="10" android:keyIcon="@drawable/sym_bkeyboard_return" <Key android:codes="10" android:keyIcon="@drawable/sym_bkeyboard_return"
android:iconPreview="@drawable/sym_keyboard_feedback_return" android:iconPreview="@drawable/sym_keyboard_feedback_return"
android:keyWidth="20%p" android:keyEdgeFlags="right"/> android:keyWidth="25%p" android:keyEdgeFlags="right"/>
</Row> </Row>
<Row android:keyboardMode="@+id/mode_url" android:rowEdgeFlags="bottom"> <Row android:keyboardMode="@+id/mode_url" android:rowEdgeFlags="bottom">
<Key android:codes="-2" android:keyLabel="@string/label_symbol_key" <Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
android:keyWidth="20%p" android:keyEdgeFlags="left"/> android:keyWidth="15%p" android:keyEdgeFlags="left"/>
<Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings"
android:iconPreview="@drawable/sym_keyboard_feedback_settings"
android:keyWidth="10%p"/>
<Key android:keyLabel="/" android:keyWidth="10%p"/> <Key android:keyLabel="/" android:keyWidth="10%p"/>
<Key android:codes="32" android:keyIcon="@drawable/sym_bkeyboard_space" <Key android:codes="32" android:keyIcon="@drawable/sym_bkeyboard_space"
android:iconPreview="@drawable/sym_keyboard_feedback_space" android:iconPreview="@drawable/sym_keyboard_feedback_space"
android:keyWidth="40%p" android:isRepeatable="true"/> android:keyWidth="30%p" android:isRepeatable="true"/>
<!--Key android:keyLabel="@string/popular_domain_0"
android:keyOutputText="@string/popular_domain_0"
android:popupKeyboard="@xml/popup_domains"
android:keyWidth="20%p"/-->
<Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"
android:keyWidth="10%p"/> android:keyWidth="10%p"/>
<Key android:codes="10" android:keyIcon="@drawable/sym_bkeyboard_return" <Key android:codes="10" android:keyIcon="@drawable/sym_bkeyboard_return"
android:iconPreview="@drawable/sym_keyboard_feedback_return" android:iconPreview="@drawable/sym_keyboard_feedback_return"
android:keyWidth="20%p" android:keyEdgeFlags="right"/> android:keyWidth="25%p" android:keyEdgeFlags="right"/>
</Row> </Row>
<Row android:keyboardMode="@+id/mode_email" android:rowEdgeFlags="bottom"> <Row android:keyboardMode="@+id/mode_email" android:rowEdgeFlags="bottom">
<Key android:codes="-2" android:keyLabel="@string/label_symbol_key" <Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
android:keyWidth="20%p" android:keyEdgeFlags="left"/> android:keyWidth="15%p" android:keyEdgeFlags="left"/>
<Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings"
android:iconPreview="@drawable/sym_keyboard_feedback_settings"
android:keyWidth="10%p"/>
<Key android:keyLabel="\@"/> <Key android:keyLabel="\@"/>
<Key android:codes="32" android:keyIcon="@drawable/sym_bkeyboard_space" <Key android:codes="32" android:keyIcon="@drawable/sym_bkeyboard_space"
android:iconPreview="@drawable/sym_keyboard_feedback_space" android:iconPreview="@drawable/sym_keyboard_feedback_space"
android:keyWidth="40%p" android:isRepeatable="true"/> android:keyWidth="30%p" android:isRepeatable="true"/>
<!--Key android:keyLabel="@string/popular_domain_0"
android:keyOutputText="@string/popular_domain_0"
android:popupKeyboard="@xml/popup_domains"
android:keyWidth="20%p"/-->
<Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"/> <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"/>
<Key android:codes="10" android:keyIcon="@drawable/sym_bkeyboard_return" <Key android:codes="10" android:keyIcon="@drawable/sym_bkeyboard_return"
android:iconPreview="@drawable/sym_keyboard_feedback_return" android:iconPreview="@drawable/sym_keyboard_feedback_return"
android:keyWidth="20%p" android:keyEdgeFlags="right"/> android:keyWidth="25%p" android:keyEdgeFlags="right"/>
</Row> </Row>
<Row android:keyboardMode="@+id/mode_im" android:rowEdgeFlags="bottom"> <Row android:keyboardMode="@+id/mode_im" android:rowEdgeFlags="bottom">
<Key android:codes="-2" android:keyLabel="@string/label_symbol_key" <Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
android:keyWidth="20%p" android:keyEdgeFlags="left"/> android:keyWidth="15%p" android:keyEdgeFlags="left"/>
<Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings"
android:iconPreview="@drawable/sym_keyboard_feedback_settings"
android:keyWidth="10%p"/>
<Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_bkeyboard_mic" <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_bkeyboard_mic"
android:iconPreview="@drawable/sym_keyboard_feedback_mic" android:iconPreview="@drawable/sym_keyboard_feedback_mic"
android:keyWidth="10%p"/> android:keyWidth="10%p"/>
<Key android:codes="32" android:keyIcon="@drawable/sym_bkeyboard_space" <Key android:codes="32" android:keyIcon="@drawable/sym_bkeyboard_space"
android:iconPreview="@drawable/sym_keyboard_feedback_space" android:iconPreview="@drawable/sym_keyboard_feedback_space"
android:keyWidth="40%p" android:isRepeatable="true"/> android:keyWidth="30%p" android:isRepeatable="true"/>
<Key android:codes="46" android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" <Key android:codes="46" android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"
android:keyWidth="10%p"/> android:keyWidth="10%p"/>
<Key android:keyLabel=":-)" android:keyOutputText=":-) " <Key android:keyLabel=":-)" android:keyOutputText=":-) "
android:popupKeyboard="@xml/popup_smileys" android:popupKeyboard="@xml/popup_smileys"
android:keyWidth="20%p" android:keyEdgeFlags="right"/> android:keyWidth="25%p" android:keyEdgeFlags="right"/>
</Row> </Row>
<Row android:keyboardMode="@+id/mode_webentry" android:rowEdgeFlags="bottom"> <Row android:keyboardMode="@+id/mode_webentry" android:rowEdgeFlags="bottom">
<Key android:codes="-2" android:keyLabel="@string/label_symbol_key" <Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
android:keyWidth="20%p" android:keyEdgeFlags="left"/> android:keyWidth="10%p" android:keyEdgeFlags="left"/>
<Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings"
android:iconPreview="@drawable/sym_keyboard_feedback_settings"
android:keyWidth="10%p"/>
<Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_bkeyboard_mic" <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_bkeyboard_mic"
android:iconPreview="@drawable/sym_keyboard_feedback_mic" android:iconPreview="@drawable/sym_keyboard_feedback_mic"
android:keyWidth="10%p"/> android:keyWidth="10%p"/>
@ -187,11 +194,12 @@
android:keyWidth="20%p" android:isRepeatable="true"/> android:keyWidth="20%p" android:isRepeatable="true"/>
<Key android:codes="9" android:keyIcon="@drawable/sym_bkeyboard_tab" <Key android:codes="9" android:keyIcon="@drawable/sym_bkeyboard_tab"
android:iconPreview="@drawable/sym_keyboard_feedback_tab" android:iconPreview="@drawable/sym_keyboard_feedback_tab"
android:keyWidth="20%p"/> android:keyWidth="15%p"/>
<Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"/> <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"
android:keyWidth="10%p"/>
<Key android:codes="10" android:keyIcon="@drawable/sym_bkeyboard_return" <Key android:codes="10" android:keyIcon="@drawable/sym_bkeyboard_return"
android:iconPreview="@drawable/sym_keyboard_feedback_return" android:iconPreview="@drawable/sym_keyboard_feedback_return"
android:keyWidth="20%p" android:keyEdgeFlags="right"/> android:keyWidth="15%p" android:keyEdgeFlags="right"/>
</Row> </Row>
</Keyboard> </Keyboard>

View File

@ -123,16 +123,19 @@
<Row android:rowEdgeFlags="bottom"> <Row android:rowEdgeFlags="bottom">
<Key android:codes="-2" android:keyLabel="@string/label_alpha_key" <Key android:codes="-2" android:keyLabel="@string/label_alpha_key"
android:keyWidth="20%p" android:keyEdgeFlags="left"/> android:keyWidth="15%p" android:keyEdgeFlags="left"/>
<Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings"
android:iconPreview="@drawable/sym_keyboard_feedback_settings"
android:keyWidth="10%p"/>
<Key android:codes="@integer/key_f1" android:keyWidth="10%p"/> <Key android:codes="@integer/key_f1" android:keyWidth="10%p"/>
<Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space" <Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space"
android:keyWidth="40%p" android:keyWidth="30%p"
android:iconPreview="@drawable/sym_keyboard_feedback_space" android:iconPreview="@drawable/sym_keyboard_feedback_space"
android:isRepeatable="true"/> android:isRepeatable="true"/>
<Key android:codes="46" android:keyLabel="." <Key android:codes="46" android:keyLabel="."
android:popupKeyboard="@xml/popup_punctuation" android:popupKeyboard="@xml/popup_punctuation"
android:keyWidth="10%p"/> android:keyWidth="10%p"/>
<Key android:codes="10" android:keyIcon="@drawable/sym_keyboard_return" android:keyWidth="20%p" android:keyEdgeFlags="right" <Key android:codes="10" android:keyIcon="@drawable/sym_keyboard_return" android:keyWidth="25%p" android:keyEdgeFlags="right"
android:iconPreview="@drawable/sym_keyboard_feedback_return" android:iconPreview="@drawable/sym_keyboard_feedback_return"
/> />
</Row> </Row>

View File

@ -123,16 +123,19 @@
<Row android:rowEdgeFlags="bottom"> <Row android:rowEdgeFlags="bottom">
<Key android:codes="-2" android:keyLabel="@string/label_alpha_key" <Key android:codes="-2" android:keyLabel="@string/label_alpha_key"
android:keyWidth="20%p" android:keyEdgeFlags="left"/> android:keyWidth="15%p" android:keyEdgeFlags="left"/>
<Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings"
android:iconPreview="@drawable/sym_keyboard_feedback_settings"
android:keyWidth="10%p"/>
<Key android:codes="@integer/key_f1" android:keyWidth="10%p"/> <Key android:codes="@integer/key_f1" android:keyWidth="10%p"/>
<Key android:codes="32" android:keyIcon="@drawable/sym_bkeyboard_space" <Key android:codes="32" android:keyIcon="@drawable/sym_bkeyboard_space"
android:keyWidth="40%p" android:keyWidth="30%p"
android:iconPreview="@drawable/sym_keyboard_feedback_space" android:iconPreview="@drawable/sym_keyboard_feedback_space"
android:isRepeatable="true"/> android:isRepeatable="true"/>
<Key android:codes="46" android:keyLabel="." <Key android:codes="46" android:keyLabel="."
android:popupKeyboard="@xml/popup_punctuation" android:popupKeyboard="@xml/popup_punctuation"
android:keyWidth="10%p"/> android:keyWidth="10%p"/>
<Key android:codes="10" android:keyIcon="@drawable/sym_bkeyboard_return" android:keyWidth="20%p" android:keyEdgeFlags="right" <Key android:codes="10" android:keyIcon="@drawable/sym_bkeyboard_return" android:keyWidth="25%p" android:keyEdgeFlags="right"
android:iconPreview="@drawable/sym_keyboard_feedback_return" android:iconPreview="@drawable/sym_keyboard_feedback_return"
/> />
</Row> </Row>

View File

@ -89,16 +89,19 @@
</Row> </Row>
<Row android:rowEdgeFlags="bottom"> <Row android:rowEdgeFlags="bottom">
<Key android:codes="-2" android:keyLabel="@string/label_alpha_key" android:keyWidth="20%p" <Key android:codes="-2" android:keyLabel="@string/label_alpha_key" android:keyWidth="15%p"
android:keyEdgeFlags="left"/> android:keyEdgeFlags="left"/>
<Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings"
android:iconPreview="@drawable/sym_keyboard_feedback_settings"
android:keyWidth="10%p"/>
<Key android:keyLabel="„" android:keyWidth="10%p" /> <Key android:keyLabel="„" android:keyWidth="10%p" />
<Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space" <Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space"
android:keyWidth="40%p" android:keyWidth="30%p"
android:iconPreview="@drawable/sym_keyboard_feedback_space" android:iconPreview="@drawable/sym_keyboard_feedback_space"
android:isRepeatable="true"/> android:isRepeatable="true"/>
<Key android:keyLabel="…" android:keyWidth="10%p" /> <Key android:keyLabel="…" android:keyWidth="10%p" />
<Key android:codes="10" android:keyIcon="@drawable/sym_keyboard_return" <Key android:codes="10" android:keyIcon="@drawable/sym_keyboard_return"
android:keyWidth="20%p" android:keyEdgeFlags="right" android:keyWidth="25%p" android:keyEdgeFlags="right"
android:iconPreview="@drawable/sym_keyboard_feedback_return" android:iconPreview="@drawable/sym_keyboard_feedback_return"
/> />
</Row> </Row>

View File

@ -89,16 +89,19 @@
</Row> </Row>
<Row android:rowEdgeFlags="bottom"> <Row android:rowEdgeFlags="bottom">
<Key android:codes="-2" android:keyLabel="@string/label_alpha_key" android:keyWidth="20%p" <Key android:codes="-2" android:keyLabel="@string/label_alpha_key" android:keyWidth="15%p"
android:keyEdgeFlags="left"/> android:keyEdgeFlags="left"/>
<Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings"
android:iconPreview="@drawable/sym_keyboard_feedback_settings"
android:keyWidth="10%p"/>
<Key android:keyLabel="„" android:keyWidth="10%p" /> <Key android:keyLabel="„" android:keyWidth="10%p" />
<Key android:codes="32" android:keyIcon="@drawable/sym_bkeyboard_space" <Key android:codes="32" android:keyIcon="@drawable/sym_bkeyboard_space"
android:keyWidth="40%p" android:keyWidth="30%p"
android:iconPreview="@drawable/sym_keyboard_feedback_space" android:iconPreview="@drawable/sym_keyboard_feedback_space"
android:isRepeatable="true"/> android:isRepeatable="true"/>
<Key android:keyLabel="…" android:keyWidth="10%p" /> <Key android:keyLabel="…" android:keyWidth="10%p" />
<Key android:codes="10" android:keyIcon="@drawable/sym_bkeyboard_return" <Key android:codes="10" android:keyIcon="@drawable/sym_bkeyboard_return"
android:keyWidth="20%p" android:keyEdgeFlags="right" android:keyWidth="25%p" android:keyEdgeFlags="right"
android:iconPreview="@drawable/sym_keyboard_feedback_return" android:iconPreview="@drawable/sym_keyboard_feedback_return"
/> />
</Row> </Row>

View File

@ -38,10 +38,6 @@ public class KeyboardSwitcher implements SharedPreferences.OnSharedPreferenceCha
public static final int MODE_IM = 6; public static final int MODE_IM = 6;
public static final int MODE_WEB = 7; public static final int MODE_WEB = 7;
public static final int MODE_TEXT_QWERTY = 0;
public static final int MODE_TEXT_ALPHA = 1;
public static final int MODE_TEXT_COUNT = 2;
public static final int KEYBOARDMODE_NORMAL = R.id.mode_normal; public static final int KEYBOARDMODE_NORMAL = R.id.mode_normal;
public static final int KEYBOARDMODE_URL = R.id.mode_url; public static final int KEYBOARDMODE_URL = R.id.mode_url;
public static final int KEYBOARDMODE_EMAIL = R.id.mode_email; public static final int KEYBOARDMODE_EMAIL = R.id.mode_email;
@ -59,7 +55,6 @@ public class KeyboardSwitcher implements SharedPreferences.OnSharedPreferenceCha
private static final int CHAR_THEME_COLOR_BLACK = 1; private static final int CHAR_THEME_COLOR_BLACK = 1;
// Tables which contains resource ids for each character theme color // Tables which contains resource ids for each character theme color
private static final int[] KBD_ALPHA = new int[] {R.xml.kbd_alpha, R.xml.kbd_alpha_black};
private static final int[] KBD_PHONE = new int[] {R.xml.kbd_phone, R.xml.kbd_phone_black}; private static final int[] KBD_PHONE = new int[] {R.xml.kbd_phone, R.xml.kbd_phone_black};
private static final int[] KBD_PHONE_SYMBOLS = new int[] { private static final int[] KBD_PHONE_SYMBOLS = new int[] {
R.xml.kbd_phone_symbols, R.xml.kbd_phone_symbols_black}; R.xml.kbd_phone_symbols, R.xml.kbd_phone_symbols_black};
@ -92,7 +87,6 @@ public class KeyboardSwitcher implements SharedPreferences.OnSharedPreferenceCha
private int mMode = MODE_NONE; /** One of the MODE_XXX values */ private int mMode = MODE_NONE; /** One of the MODE_XXX values */
private int mImeOptions; private int mImeOptions;
private int mTextMode = MODE_TEXT_QWERTY;
private boolean mIsSymbols; private boolean mIsSymbols;
private boolean mHasVoice; private boolean mHasVoice;
private boolean mVoiceOnPrimary; private boolean mVoiceOnPrimary;
@ -291,11 +285,6 @@ public class KeyboardSwitcher implements SharedPreferences.OnSharedPreferenceCha
"getKeyboardId:" + mode + "," + imeOptions + "," + isSymbols); "getKeyboardId:" + mode + "," + imeOptions + "," + isSymbols);
/* fall through */ /* fall through */
case MODE_TEXT: case MODE_TEXT:
if (mTextMode == MODE_TEXT_ALPHA) {
return new KeyboardId(
KBD_ALPHA[charColorId], KEYBOARDMODE_NORMAL, true, hasVoice);
}
// Normally mTextMode should be MODE_TEXT_QWERTY.
return new KeyboardId(keyboardRowsResId, KEYBOARDMODE_NORMAL, true, hasVoice); return new KeyboardId(keyboardRowsResId, KEYBOARDMODE_NORMAL, true, hasVoice);
case MODE_SYMBOLS: case MODE_SYMBOLS:
return new KeyboardId(KBD_SYMBOLS[charColorId], hasVoice); return new KeyboardId(KBD_SYMBOLS[charColorId], hasVoice);
@ -321,10 +310,6 @@ public class KeyboardSwitcher implements SharedPreferences.OnSharedPreferenceCha
return mMode == MODE_TEXT; return mMode == MODE_TEXT;
} }
int getTextModeCount() {
return MODE_TEXT_COUNT;
}
boolean isAlphabetMode() { boolean isAlphabetMode() {
if (mCurrentId == null) { if (mCurrentId == null) {
return false; return false;