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

Merge "Fix odd "more" key behavior on tablet phone number keyboard"

main
Tadashi G. Takaoka 2010-11-23 15:59:10 -08:00 committed by Android (Google) Code Review
parent da64719c6d 4b8bbbadac
commit a963d0b2e4
4 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
java/res/xml-xlarge/kbd_phone.xml
View File

@ -69,7 +69,7 @@
</Row> </Row>
<Row> <Row>
<Key <Key
latin:codes="@integer/key_switch_alpha_symbol" latin:codes="@integer/key_shift"
latin:keyLabel="@string/label_more_key" latin:keyLabel="@string/label_more_key"
latin:keyLabelOption="fontNormal|alignLeft|alignBottom" latin:keyLabelOption="fontNormal|alignLeft|alignBottom"
latin:isModifier="true" latin:isModifier="true"

2
java/res/xml-xlarge/kbd_phone_symbols.xml
View File

@ -73,7 +73,7 @@
</Row> </Row>
<Row> <Row>
<Key <Key
latin:codes="@integer/key_switch_alpha_symbol" latin:codes="@integer/key_shift"
latin:keyLabel="@string/label_more_key" latin:keyLabel="@string/label_more_key"
latin:keyLabelOption="fontNormal|alignLeft|alignBottom" latin:keyLabelOption="fontNormal|alignLeft|alignBottom"
latin:isModifier="true" latin:isModifier="true"

4
java/res/xml/kbd_qwerty_black_symbol.xml
View File

@ -44,7 +44,7 @@
<default> <default>
<Key <Key
latin:codes="@integer/key_switch_alpha_symbol" latin:codes="@integer/key_switch_alpha_symbol"
latin:keyLabel="@string/label_symbol_key" latin:keyLabel="@string/label_to_symbol_key"
latin:keyWidth="20%p" latin:keyWidth="20%p"
latin:isModifier="true" latin:isModifier="true"
latin:keyEdgeFlags="left" /> latin:keyEdgeFlags="left" />
@ -73,7 +73,7 @@
<default> <default>
<Key <Key
latin:codes="@integer/key_switch_alpha_symbol" latin:codes="@integer/key_switch_alpha_symbol"
latin:keyLabel="@string/label_symbol_key" latin:keyLabel="@string/label_to_symbol_key"
latin:keyWidth="15%p" latin:keyWidth="15%p"
latin:isModifier="true" latin:isModifier="true"
latin:keyEdgeFlags="left" /> latin:keyEdgeFlags="left" />

13
java/src/com/android/inputmethod/latin/KeyboardSwitcher.java
View File

@ -142,9 +142,18 @@ public class KeyboardSwitcher implements SharedPreferences.OnSharedPreferenceCha
final boolean voiceKeyEnabled = mVoiceKeyEnabled; final boolean voiceKeyEnabled = mVoiceKeyEnabled;
final boolean hasVoiceKey = voiceKeyEnabled && !mVoiceButtonOnPrimary; final boolean hasVoiceKey = voiceKeyEnabled && !mVoiceButtonOnPrimary;
final int imeOptions = mImeOptions; final int imeOptions = mImeOptions;
mSymbolsId = new KeyboardId(locale, orientation, mode, KBD_SYMBOLS, // Note: This comment is only applied for phone number keyboard layout.
// On non-xlarge device, "@integer/key_switch_alpha_symbol" key code is used to switch
// between "phone keyboard" and "phone symbols keyboard". But on xlarge device,
// "@integer/key_shift" key code is used for that purpose in order to properly display
// "more" and "locked more" key labels. To achieve these behavior, we should initialize
// mSymbolsId and mSymbolsShiftedId to "phone keyboard" and "phone symbols keyboard"
// respectively here for xlarge device's layout switching.
mSymbolsId = new KeyboardId(locale, orientation, mode,
mode == MODE_PHONE ? KBD_PHONE : KBD_SYMBOLS,
colorScheme, hasSettingsKey, voiceKeyEnabled, hasVoiceKey, imeOptions, true); colorScheme, hasSettingsKey, voiceKeyEnabled, hasVoiceKey, imeOptions, true);
mSymbolsShiftedId = new KeyboardId(locale, orientation, mode, KBD_SYMBOLS_SHIFT, mSymbolsShiftedId = new KeyboardId(locale, orientation, mode,
mode == MODE_PHONE ? KBD_PHONE_SYMBOLS : KBD_SYMBOLS_SHIFT,
colorScheme, hasSettingsKey, voiceKeyEnabled, hasVoiceKey, imeOptions, true); colorScheme, hasSettingsKey, voiceKeyEnabled, hasVoiceKey, imeOptions, true);
} }