nyancrimew
/
LatinIME
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove redandant key from popup mini keyboard which has settings key 

Bug: 4196879
Change-Id: If0ed5cace2d4d0c1f0e225e1003d54c055690387
main
Tadashi G. Takaoka 2011-04-08 16:33:20 +09:00
parent b5d17e52fc
commit 1844ee7cf8
4 changed files with 56 additions and 87 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
java/res/values/donottranslate-altchars.xml
View File

@ -47,11 +47,7 @@
<string name="alternates_for_currency_dollar">¢,£,€,¥,₱</string> <string name="alternates_for_currency_dollar">¢,£,€,¥,₱</string>
<string name="alternates_for_currency_euro">¢,£,$,¥,₱</string> <string name="alternates_for_currency_euro">¢,£,$,¥,₱</string>
<string name="alternates_for_currency_pound">¢,$,€,¥,₱</string> <string name="alternates_for_currency_pound">¢,$,€,¥,₱</string>
<string name="alternates_for_mic">"\@drawable/sym_keyboard_settings|\@integer/key_settings,\@drawable/sym_keyboard_mic|\@integer/key_voice"</string>
<string name="alternates_for_smiley">":-)|:-) ,:-(|:-( ,;-)|;-) ,:-P|:-P ,=-O|=-O ,:-*|:-* ,:O|:O ,B-)|B-) ,:-$|:-$ ,:-!|:-! ,:-[|:-[ ,O:-)|O:-) ,:-\\\\\\\\|:-\\\\\\\\ ,:\'(|:\'( ,:-D|:-D "</string> <string name="alternates_for_smiley">":-)|:-) ,:-(|:-( ,;-)|;-) ,:-P|:-P ,=-O|=-O ,:-*|:-* ,:O|:O ,B-)|B-) ,:-$|:-$ ,:-!|:-! ,:-[|:-[ ,O:-)|O:-) ,:-\\\\\\\\|:-\\\\\\\\ ,:\'(|:\'( ,:-D|:-D "</string>
<string name="alternates_for_settings_slash">"\@drawable/sym_keyboard_settings|\@integer/key_settings,/"</string>
<string name="alternates_for_settings_at">"\@drawable/sym_keyboard_settings|\@integer/key_settings,\@"</string>
<string name="alternates_for_settings_comma">"\@drawable/sym_keyboard_settings|\@integer/key_settings,\\,"</string>
<string name="alternates_for_punctuation">":,/,&amp;,(,),-,+,;,\@,\',\",\?,!,\\,"</string> <string name="alternates_for_punctuation">":,/,&amp;,(,),-,+,;,\@,\',\",\?,!,\\,"</string>
<string name="keylabel_for_popular_domain">".com"</string> <string name="keylabel_for_popular_domain">".com"</string>
<!-- popular web domains for the locale - most popular, displayed on the keyboard --> <!-- popular web domains for the locale - most popular, displayed on the keyboard -->

45
java/res/xml/kbd_key_styles.xml
View File

@ -21,14 +21,45 @@
<merge <merge
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
> >
<!-- Functional key styles --> <!-- Base key style for the functional key -->
<switch> <switch>
<case <case
latin:colorScheme="white" latin:colorScheme="white"
> >
<key-style <key-style
latin:styleName="functionalKeyStyle" latin:styleName="functionalKeyStyle"
latin:isFunctional="true" /> latin:isFunctional="true" />
</case>
<case
latin:colorScheme="black"
>
<key-style
latin:styleName="functionalKeyStyle" />
</case>
</switch>
<!-- Base key style for the key which may have settings key as popup key -->
<switch>
<case
latin:hasSettingsKey="true"
>
<key-style
latin:styleName="settingsPopupStyle"
latin:parentStyle="functionalKeyStyle" />
</case>
<!-- latin:hasSettingsKey="false" -->
<default>
<key-style
latin:styleName="settingsPopupStyle"
latin:keyHintIcon="@drawable/hint_popup"
latin:popupCharacters="\@drawable/sym_keyboard_settings|\@integer/key_settings"
latin:parentStyle="functionalKeyStyle" />
</default>
</switch>
<!-- Functional key styles -->
<switch>
<case
latin:colorScheme="white"
>
<key-style <key-style
latin:styleName="shiftKeyStyle" latin:styleName="shiftKeyStyle"
latin:code="@integer/key_shift" latin:code="@integer/key_shift"
@ -90,9 +121,7 @@
latin:code="@integer/key_voice" latin:code="@integer/key_voice"
latin:keyIcon="@drawable/sym_keyboard_mic" latin:keyIcon="@drawable/sym_keyboard_mic"
latin:iconPreview="@drawable/sym_keyboard_feedback_mic" latin:iconPreview="@drawable/sym_keyboard_feedback_mic"
latin:keyHintIcon="@drawable/hint_popup" latin:parentStyle="settingsPopupStyle" />
latin:popupCharacters="@string/alternates_for_mic"
latin:parentStyle="functionalKeyStyle" />
<!-- Note: This key style is not for functional tab key. This is used for the tab key <!-- Note: This key style is not for functional tab key. This is used for the tab key
which is laid out as normal letter key. --> which is laid out as normal letter key. -->
<key-style <key-style
@ -104,8 +133,6 @@
<case <case
latin:colorScheme="black" latin:colorScheme="black"
> >
<key-style
latin:styleName="functionalKeyStyle" />
<key-style <key-style
latin:styleName="shiftKeyStyle" latin:styleName="shiftKeyStyle"
latin:code="@integer/key_shift" latin:code="@integer/key_shift"
@ -167,9 +194,7 @@
latin:code="@integer/key_voice" latin:code="@integer/key_voice"
latin:keyIcon="@drawable/sym_bkeyboard_mic" latin:keyIcon="@drawable/sym_bkeyboard_mic"
latin:iconPreview="@drawable/sym_keyboard_feedback_mic" latin:iconPreview="@drawable/sym_keyboard_feedback_mic"
latin:keyHintIcon="@drawable/hint_popup" latin:parentStyle="settingsPopupStyle" />
latin:popupCharacters="@string/alternates_for_mic"
latin:parentStyle="functionalKeyStyle" />
<!-- Note: This key style is not for functional tab key. This is used for the tab key <!-- Note: This key style is not for functional tab key. This is used for the tab key
which is laid out as normal letter key. --> which is laid out as normal letter key. -->
<key-style <key-style

83
java/res/xml/kbd_qwerty_f1.xml
View File

@ -23,81 +23,32 @@
> >
<switch> <switch>
<case <case
latin:hasSettingsKey="true" latin:mode="url"
> >
<switch> <Key
<case latin:keyLabel="/"
latin:mode="url" latin:keyStyle="settingsPopupStyle" />
> </case>
<Key <case
latin:keyLabel="/" latin:mode="email"
latin:isFunctional="true" /> >
</case> <Key
<case latin:keyLabel="\@"
latin:mode="email" latin:keyStyle="settingsPopupStyle" />
>
<Key
latin:keyLabel="\@"
latin:isFunctional="true" />
</case>
<default>
<switch>
<case
latin:hasVoiceKey="true"
>
<Key
latin:keyStyle="micKeyStyle" />
</case>
<case
latin:hasVoiceKey="false"
>
<Key
latin:keyLabel=","
latin:isFunctional="true" />
</case>
</switch>
</default>
</switch>
</case> </case>
<!-- latin:hasSettingsKey="false" -->
<default> <default>
<switch> <switch>
<case <case
latin:mode="url" latin:hasVoiceKey="true"
> >
<Key <Key
latin:keyLabel="/" latin:keyStyle="micKeyStyle" />
latin:keyHintIcon="@drawable/hint_popup"
latin:popupCharacters="@string/alternates_for_settings_slash"
latin:isFunctional="true" />
</case>
<case
latin:mode="email"
>
<Key
latin:keyLabel="\@"
latin:keyHintIcon="@drawable/hint_popup"
latin:popupCharacters="@string/alternates_for_settings_at"
latin:isFunctional="true" />
</case> </case>
<!-- latin:hasVoiceKey="false" -->
<default> <default>
<switch> <Key
<case latin:keyLabel=","
latin:hasVoiceKey="true" latin:keyStyle="settingsPopupStyle" />
>
<Key
latin:keyStyle="micKeyStyle" />
</case>
<case
latin:hasVoiceKey="false"
>
<Key
latin:keyLabel=","
latin:keyHintIcon="@drawable/hint_popup"
latin:popupCharacters="@string/alternates_for_settings_comma"
latin:isFunctional="true" />
</case>
</switch>
</default> </default>
</switch> </switch>
</default> </default>

11
java/res/xml/kbd_symbols_f1.xml
View File

@ -28,14 +28,11 @@
<Key <Key
latin:keyStyle="micKeyStyle" /> latin:keyStyle="micKeyStyle" />
</case> </case>
<case <!-- latin:hasVoiceKey="false" -->
latin:hasVoiceKey="false" <default>
>
<Key <Key
latin:keyLabel="," latin:keyLabel=","
latin:keyHintIcon="@drawable/hint_popup" latin:keyStyle="settingsPopupStyle" />
latin:popupCharacters="@string/alternates_for_settings_comma" </default>
latin:keyStyle="functionalKeyStyle" />
</case>
</switch> </switch>
</merge> </merge>