AI 146596: Re-factor KeyboardSwitcher to keep a map of KeyboardId->Keyboard rather than a separate variable for each configuration. This makes it more maintainable to add more states in the future.
Automated import of CL 146596main
Brandon Ballinger
The Android Open Source Project
parent
864fcbd87e
commit
353da6d207
|
|
@ -16,9 +16,8 @@
|
||||||
|
|
||||||
package com.android.inputmethod.latin;
|
package com.android.inputmethod.latin;
|
||||||
|
|
||||||
import android.inputmethodservice.Keyboard;
|
import java.util.HashMap;
|
||||||
|
import java.util.Map;
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
public class KeyboardSwitcher {
|
public class KeyboardSwitcher {
|
||||||
|
|
||||||
|
|
@ -38,30 +37,27 @@ public class KeyboardSwitcher {
|
||||||
public static final int KEYBOARDMODE_EMAIL = R.id.mode_email;
|
public static final int KEYBOARDMODE_EMAIL = R.id.mode_email;
|
||||||
public static final int KEYBOARDMODE_IM = R.id.mode_im;
|
public static final int KEYBOARDMODE_IM = R.id.mode_im;
|
||||||
|
|
||||||
|
|
||||||
LatinKeyboardView mInputView;
|
LatinKeyboardView mInputView;
|
||||||
LatinIME mContext;
|
LatinIME mContext;
|
||||||
|
|
||||||
private LatinKeyboard mPhoneKeyboard;
|
private KeyboardId mSymbolsId;
|
||||||
private LatinKeyboard mPhoneSymbolsKeyboard;
|
private KeyboardId mSymbolsShiftedId;
|
||||||
private LatinKeyboard mSymbolsKeyboard;
|
|
||||||
private LatinKeyboard mSymbolsShiftedKeyboard;
|
|
||||||
private LatinKeyboard mQwertyKeyboard;
|
|
||||||
private LatinKeyboard mAlphaKeyboard;
|
|
||||||
private LatinKeyboard mUrlKeyboard;
|
|
||||||
private LatinKeyboard mEmailKeyboard;
|
|
||||||
private LatinKeyboard mIMKeyboard;
|
|
||||||
|
|
||||||
List<Keyboard> mKeyboards;
|
private KeyboardId mCurrentId;
|
||||||
|
private Map<KeyboardId, LatinKeyboard> mKeyboards;
|
||||||
|
|
||||||
private int mMode;
|
private int mMode;
|
||||||
private int mImeOptions;
|
private int mImeOptions;
|
||||||
private int mTextMode = MODE_TEXT_QWERTY;
|
private int mTextMode = MODE_TEXT_QWERTY;
|
||||||
|
private boolean mIsSymbols;
|
||||||
|
|
||||||
private int mLastDisplayWidth;
|
private int mLastDisplayWidth;
|
||||||
|
|
||||||
KeyboardSwitcher(LatinIME context) {
|
KeyboardSwitcher(LatinIME context) {
|
||||||
mContext = context;
|
mContext = context;
|
||||||
|
mKeyboards = new HashMap<KeyboardId, LatinKeyboard>();
|
||||||
|
mSymbolsId = new KeyboardId(R.xml.kbd_symbols);
|
||||||
|
mSymbolsShiftedId = new KeyboardId(R.xml.kbd_symbols_shift);
|
||||||
}
|
}
|
||||||
|
|
||||||
void setInputView(LatinKeyboardView inputView) {
|
void setInputView(LatinKeyboardView inputView) {
|
||||||
|
|
@ -72,92 +68,106 @@ public class KeyboardSwitcher {
|
||||||
// Configuration change is coming after the keyboard gets recreated. So don't rely on that.
|
// Configuration change is coming after the keyboard gets recreated. So don't rely on that.
|
||||||
// If keyboards have already been made, check if we have a screen width change and
|
// If keyboards have already been made, check if we have a screen width change and
|
||||||
// create the keyboard layouts again at the correct orientation
|
// create the keyboard layouts again at the correct orientation
|
||||||
if (mKeyboards != null) {
|
int displayWidth = mContext.getMaxWidth();
|
||||||
int displayWidth = mContext.getMaxWidth();
|
if (displayWidth == mLastDisplayWidth) return;
|
||||||
if (displayWidth == mLastDisplayWidth) return;
|
mLastDisplayWidth = displayWidth;
|
||||||
mLastDisplayWidth = displayWidth;
|
mKeyboards.clear();
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Represents the parameters necessary to construct a new LatinKeyboard,
|
||||||
|
* which also serve as a unique identifier for each keyboard type.
|
||||||
|
*/
|
||||||
|
private static class KeyboardId {
|
||||||
|
public int mXml;
|
||||||
|
public int mMode;
|
||||||
|
public boolean mEnableShiftLock;
|
||||||
|
|
||||||
|
public KeyboardId(int xml, int mode, boolean enableShiftLock) {
|
||||||
|
this.mXml = xml;
|
||||||
|
this.mMode = mode;
|
||||||
|
this.mEnableShiftLock = enableShiftLock;
|
||||||
|
}
|
||||||
|
|
||||||
|
public KeyboardId(int xml) {
|
||||||
|
this(xml, 0, false);
|
||||||
|
}
|
||||||
|
|
||||||
|
public boolean equals(Object other) {
|
||||||
|
return other instanceof KeyboardId && equals((KeyboardId) other);
|
||||||
|
}
|
||||||
|
|
||||||
|
public boolean equals(KeyboardId other) {
|
||||||
|
return other.mXml == this.mXml && other.mMode == this.mMode;
|
||||||
|
}
|
||||||
|
|
||||||
|
public int hashCode() {
|
||||||
|
return (mXml + 1) * (mMode + 1) * (mEnableShiftLock ? 2 : 1);
|
||||||
}
|
}
|
||||||
// Delayed creation when keyboard mode is set.
|
|
||||||
mQwertyKeyboard = null;
|
|
||||||
mAlphaKeyboard = null;
|
|
||||||
mUrlKeyboard = null;
|
|
||||||
mEmailKeyboard = null;
|
|
||||||
mIMKeyboard = null;
|
|
||||||
mPhoneKeyboard = null;
|
|
||||||
mPhoneSymbolsKeyboard = null;
|
|
||||||
mSymbolsKeyboard = null;
|
|
||||||
mSymbolsShiftedKeyboard = null;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void setKeyboardMode(int mode, int imeOptions) {
|
void setKeyboardMode(int mode, int imeOptions) {
|
||||||
|
setKeyboardMode(mode, imeOptions, false);
|
||||||
|
}
|
||||||
|
|
||||||
|
void setKeyboardMode(int mode, int imeOptions, boolean isSymbols) {
|
||||||
mMode = mode;
|
mMode = mode;
|
||||||
mImeOptions = imeOptions;
|
mImeOptions = imeOptions;
|
||||||
LatinKeyboard keyboard = (LatinKeyboard) mInputView.getKeyboard();
|
|
||||||
mInputView.setPreviewEnabled(true);
|
mInputView.setPreviewEnabled(true);
|
||||||
switch (mode) {
|
KeyboardId id = getKeyboardId(mode, imeOptions, isSymbols);
|
||||||
case MODE_TEXT:
|
LatinKeyboard keyboard = getKeyboard(id);
|
||||||
if (mTextMode == MODE_TEXT_QWERTY) {
|
|
||||||
if (mQwertyKeyboard == null) {
|
if (mode == MODE_PHONE) {
|
||||||
mQwertyKeyboard = new LatinKeyboard(mContext, R.xml.kbd_qwerty,
|
mInputView.setPhoneKeyboard(keyboard);
|
||||||
KEYBOARDMODE_NORMAL);
|
mInputView.setPreviewEnabled(false);
|
||||||
mQwertyKeyboard.enableShiftLock();
|
|
||||||
}
|
|
||||||
keyboard = mQwertyKeyboard;
|
|
||||||
} else if (mTextMode == MODE_TEXT_ALPHA) {
|
|
||||||
if (mAlphaKeyboard == null) {
|
|
||||||
mAlphaKeyboard = new LatinKeyboard(mContext, R.xml.kbd_alpha,
|
|
||||||
KEYBOARDMODE_NORMAL);
|
|
||||||
mAlphaKeyboard.enableShiftLock();
|
|
||||||
}
|
|
||||||
keyboard = mAlphaKeyboard;
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
case MODE_SYMBOLS:
|
|
||||||
if (mSymbolsKeyboard == null) {
|
|
||||||
mSymbolsKeyboard = new LatinKeyboard(mContext, R.xml.kbd_symbols);
|
|
||||||
}
|
|
||||||
if (mSymbolsShiftedKeyboard == null) {
|
|
||||||
mSymbolsShiftedKeyboard = new LatinKeyboard(mContext, R.xml.kbd_symbols_shift);
|
|
||||||
}
|
|
||||||
keyboard = mSymbolsKeyboard;
|
|
||||||
break;
|
|
||||||
case MODE_PHONE:
|
|
||||||
if (mPhoneKeyboard == null) {
|
|
||||||
mPhoneKeyboard = new LatinKeyboard(mContext, R.xml.kbd_phone);
|
|
||||||
}
|
|
||||||
mInputView.setPhoneKeyboard(mPhoneKeyboard);
|
|
||||||
if (mPhoneSymbolsKeyboard == null) {
|
|
||||||
mPhoneSymbolsKeyboard = new LatinKeyboard(mContext, R.xml.kbd_phone_symbols);
|
|
||||||
}
|
|
||||||
keyboard = mPhoneKeyboard;
|
|
||||||
mInputView.setPreviewEnabled(false);
|
|
||||||
break;
|
|
||||||
case MODE_URL:
|
|
||||||
if (mUrlKeyboard == null) {
|
|
||||||
mUrlKeyboard = new LatinKeyboard(mContext, R.xml.kbd_qwerty, KEYBOARDMODE_URL);
|
|
||||||
mUrlKeyboard.enableShiftLock();
|
|
||||||
}
|
|
||||||
keyboard = mUrlKeyboard;
|
|
||||||
break;
|
|
||||||
case MODE_EMAIL:
|
|
||||||
if (mEmailKeyboard == null) {
|
|
||||||
mEmailKeyboard = new LatinKeyboard(mContext, R.xml.kbd_qwerty, KEYBOARDMODE_EMAIL);
|
|
||||||
mEmailKeyboard.enableShiftLock();
|
|
||||||
}
|
|
||||||
keyboard = mEmailKeyboard;
|
|
||||||
break;
|
|
||||||
case MODE_IM:
|
|
||||||
if (mIMKeyboard == null) {
|
|
||||||
mIMKeyboard = new LatinKeyboard(mContext, R.xml.kbd_qwerty, KEYBOARDMODE_IM);
|
|
||||||
mIMKeyboard.enableShiftLock();
|
|
||||||
}
|
|
||||||
keyboard = mIMKeyboard;
|
|
||||||
break;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
mCurrentId = id;
|
||||||
mInputView.setKeyboard(keyboard);
|
mInputView.setKeyboard(keyboard);
|
||||||
keyboard.setShifted(false);
|
keyboard.setShifted(false);
|
||||||
keyboard.setShiftLocked(keyboard.isShiftLocked());
|
keyboard.setShiftLocked(keyboard.isShiftLocked());
|
||||||
keyboard.setImeOptions(mContext.getResources(), mMode, imeOptions);
|
keyboard.setImeOptions(mContext.getResources(), mMode, imeOptions);
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
private LatinKeyboard getKeyboard(KeyboardId id) {
|
||||||
|
if (!mKeyboards.containsKey(id)) {
|
||||||
|
LatinKeyboard keyboard = new LatinKeyboard(
|
||||||
|
mContext, id.mXml, id.mMode);
|
||||||
|
if (id.mEnableShiftLock) {
|
||||||
|
keyboard.enableShiftLock();
|
||||||
|
}
|
||||||
|
mKeyboards.put(id, keyboard);
|
||||||
|
}
|
||||||
|
return mKeyboards.get(id);
|
||||||
|
}
|
||||||
|
|
||||||
|
private KeyboardId getKeyboardId(int mode, int imeOptions, boolean isSymbols) {
|
||||||
|
if (isSymbols) {
|
||||||
|
return (mode == MODE_PHONE)
|
||||||
|
? new KeyboardId(R.xml.kbd_phone_symbols) : new KeyboardId(R.xml.kbd_symbols);
|
||||||
|
}
|
||||||
|
|
||||||
|
switch (mode) {
|
||||||
|
case MODE_TEXT:
|
||||||
|
if (mTextMode == MODE_TEXT_QWERTY) {
|
||||||
|
return new KeyboardId(R.xml.kbd_qwerty, KEYBOARDMODE_NORMAL, true);
|
||||||
|
} else if (mTextMode == MODE_TEXT_ALPHA) {
|
||||||
|
return new KeyboardId(R.xml.kbd_alpha, KEYBOARDMODE_NORMAL, true);
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
case MODE_SYMBOLS:
|
||||||
|
return new KeyboardId(R.xml.kbd_symbols);
|
||||||
|
case MODE_PHONE:
|
||||||
|
return new KeyboardId(R.xml.kbd_phone);
|
||||||
|
case MODE_URL:
|
||||||
|
return new KeyboardId(R.xml.kbd_qwerty, KEYBOARDMODE_URL, true);
|
||||||
|
case MODE_EMAIL:
|
||||||
|
return new KeyboardId(R.xml.kbd_qwerty, KEYBOARDMODE_EMAIL, true);
|
||||||
|
case MODE_IM:
|
||||||
|
return new KeyboardId(R.xml.kbd_qwerty, KEYBOARDMODE_IM, true);
|
||||||
|
}
|
||||||
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
int getKeyboardMode() {
|
int getKeyboardMode() {
|
||||||
|
|
@ -186,56 +196,35 @@ public class KeyboardSwitcher {
|
||||||
}
|
}
|
||||||
|
|
||||||
boolean isAlphabetMode() {
|
boolean isAlphabetMode() {
|
||||||
Keyboard current = mInputView.getKeyboard();
|
KeyboardId current = mCurrentId;
|
||||||
if (current == mQwertyKeyboard
|
return current.mMode == KEYBOARDMODE_NORMAL
|
||||||
|| current == mAlphaKeyboard
|
|| current.mMode == KEYBOARDMODE_URL
|
||||||
|| current == mUrlKeyboard
|
|| current.mMode == KEYBOARDMODE_EMAIL
|
||||||
|| current == mIMKeyboard
|
|| current.mMode == KEYBOARDMODE_IM;
|
||||||
|| current == mEmailKeyboard) {
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
return false;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void toggleShift() {
|
void toggleShift() {
|
||||||
Keyboard currentKeyboard = mInputView.getKeyboard();
|
if (mCurrentId.equals(mSymbolsId)) {
|
||||||
if (currentKeyboard == mSymbolsKeyboard) {
|
LatinKeyboard symbolsKeyboard = getKeyboard(mSymbolsId);
|
||||||
mSymbolsKeyboard.setShifted(true);
|
LatinKeyboard symbolsShiftedKeyboard = getKeyboard(mSymbolsShiftedId);
|
||||||
mInputView.setKeyboard(mSymbolsShiftedKeyboard);
|
symbolsKeyboard.setShifted(true);
|
||||||
mSymbolsShiftedKeyboard.setShifted(true);
|
mCurrentId = mSymbolsShiftedId;
|
||||||
mSymbolsShiftedKeyboard.setImeOptions(mContext.getResources(), mMode, mImeOptions);
|
mInputView.setKeyboard(symbolsShiftedKeyboard);
|
||||||
} else if (currentKeyboard == mSymbolsShiftedKeyboard) {
|
symbolsShiftedKeyboard.setShifted(true);
|
||||||
mSymbolsShiftedKeyboard.setShifted(false);
|
symbolsShiftedKeyboard.setImeOptions(mContext.getResources(), mMode, mImeOptions);
|
||||||
mInputView.setKeyboard(mSymbolsKeyboard);
|
} else if (mCurrentId.equals(mSymbolsShiftedId)) {
|
||||||
mSymbolsKeyboard.setShifted(false);
|
LatinKeyboard symbolsKeyboard = getKeyboard(mSymbolsId);
|
||||||
mSymbolsKeyboard.setImeOptions(mContext.getResources(), mMode, mImeOptions);
|
LatinKeyboard symbolsShiftedKeyboard = getKeyboard(mSymbolsShiftedId);
|
||||||
|
symbolsShiftedKeyboard.setShifted(false);
|
||||||
|
mCurrentId = mSymbolsId;
|
||||||
|
mInputView.setKeyboard(getKeyboard(mSymbolsId));
|
||||||
|
symbolsKeyboard.setShifted(false);
|
||||||
|
symbolsKeyboard.setImeOptions(mContext.getResources(), mMode, mImeOptions);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void toggleSymbols() {
|
void toggleSymbols() {
|
||||||
Keyboard current = mInputView.getKeyboard();
|
mIsSymbols = !mIsSymbols;
|
||||||
if (mSymbolsKeyboard == null) {
|
setKeyboardMode(mMode, mImeOptions, mIsSymbols);
|
||||||
mSymbolsKeyboard = new LatinKeyboard(mContext, R.xml.kbd_symbols);
|
|
||||||
}
|
|
||||||
if (mSymbolsShiftedKeyboard == null) {
|
|
||||||
mSymbolsShiftedKeyboard = new LatinKeyboard(mContext, R.xml.kbd_symbols_shift);
|
|
||||||
}
|
|
||||||
if (current == mSymbolsKeyboard || current == mSymbolsShiftedKeyboard) {
|
|
||||||
setKeyboardMode(mMode, mImeOptions); // Could be qwerty, alpha, url, email or im
|
|
||||||
return;
|
|
||||||
} else if (current == mPhoneKeyboard) {
|
|
||||||
current = mPhoneSymbolsKeyboard;
|
|
||||||
mPhoneSymbolsKeyboard.setImeOptions(mContext.getResources(), mMode, mImeOptions);
|
|
||||||
} else if (current == mPhoneSymbolsKeyboard) {
|
|
||||||
current = mPhoneKeyboard;
|
|
||||||
mPhoneKeyboard.setImeOptions(mContext.getResources(), mMode, mImeOptions);
|
|
||||||
} else {
|
|
||||||
current = mSymbolsKeyboard;
|
|
||||||
mSymbolsKeyboard.setImeOptions(mContext.getResources(), mMode, mImeOptions);
|
|
||||||
}
|
|
||||||
mInputView.setKeyboard(current);
|
|
||||||
if (current == mSymbolsKeyboard) {
|
|
||||||
current.setShifted(false);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue