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

Cleanup KeyboardSwitcher internal a bit

Browse source 
Bug: 4311428
Change-Id: Ibe933d0351f750a3a41a08f09befd833d677961b
This commit is contained in:
Tadashi G. Takaoka 2011-07-29 16:57:07 -07:00
parent f12aa77c4b
commit 0a054dd107
1 changed files with 34 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

76
java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java
View file

@ -62,6 +62,8 @@ public class KeyboardSwitcher implements SharedPreferences.OnSharedPreferenceCha
private View mCurrentInputView; private View mCurrentInputView;
private LatinKeyboardView mKeyboardView; private LatinKeyboardView mKeyboardView;
private LatinIME mInputMethodService; private LatinIME mInputMethodService;
private String mPackageName;
private Resources mResources;
// TODO: Combine these key state objects with auto mode switch state. // TODO: Combine these key state objects with auto mode switch state.
private ShiftKeyState mShiftKeyState = new ShiftKeyState("Shift"); private ShiftKeyState mShiftKeyState = new ShiftKeyState("Shift");
@ -115,6 +117,8 @@ public class KeyboardSwitcher implements SharedPreferences.OnSharedPreferenceCha
public static void init(LatinIME ims, SharedPreferences prefs) { public static void init(LatinIME ims, SharedPreferences prefs) {
sInstance.mInputMethodService = ims; sInstance.mInputMethodService = ims;
sInstance.mPackageName = ims.getPackageName();
sInstance.mResources = ims.getResources();
sInstance.mPrefs = prefs; sInstance.mPrefs = prefs;
sInstance.mSubtypeSwitcher = SubtypeSwitcher.getInstance(); sInstance.mSubtypeSwitcher = SubtypeSwitcher.getInstance();
sInstance.setContextThemeWrapper(ims, getKeyboardThemeIndex(ims, prefs)); sInstance.setContextThemeWrapper(ims, getKeyboardThemeIndex(ims, prefs));
@ -146,14 +150,18 @@ public class KeyboardSwitcher implements SharedPreferences.OnSharedPreferenceCha
public void loadKeyboard(EditorInfo attribute, Settings.Values settings) { public void loadKeyboard(EditorInfo attribute, Settings.Values settings) {
mSwitchState = SWITCH_STATE_ALPHA; mSwitchState = SWITCH_STATE_ALPHA;
try { try {
final Locale locale = mSubtypeSwitcher.getInputLocale();
final int orientation = mResources.getConfiguration().orientation;
final int width = (mWindowWidth != 0) ? mWindowWidth
: mResources.getDisplayMetrics().widthPixels;
final boolean voiceKeyEnabled = settings.isVoiceKeyEnabled(attribute); final boolean voiceKeyEnabled = settings.isVoiceKeyEnabled(attribute);
final boolean voiceKeyOnMain = settings.isVoiceKeyOnMain(); final boolean voiceKeyOnMain = settings.isVoiceKeyOnMain();
mMainKeyboardId = getKeyboardId( mMainKeyboardId = getKeyboardId(attribute, locale, orientation, width,
attribute, false, false, voiceKeyEnabled, voiceKeyOnMain); false, false, voiceKeyEnabled, voiceKeyOnMain);
mSymbolsKeyboardId = getKeyboardId( mSymbolsKeyboardId = getKeyboardId(attribute, locale, orientation, width,
attribute, true, false, voiceKeyEnabled, voiceKeyOnMain); true, false, voiceKeyEnabled, voiceKeyOnMain);
mSymbolsShiftedKeyboardId = getKeyboardId( mSymbolsShiftedKeyboardId = getKeyboardId(attribute, locale, orientation, width,
attribute, true, true, voiceKeyEnabled, voiceKeyOnMain); true, true, voiceKeyEnabled, voiceKeyOnMain);
setKeyboard(getKeyboard(mMainKeyboardId)); setKeyboard(getKeyboard(mMainKeyboardId));
} catch (RuntimeException e) { } catch (RuntimeException e) {
Log.w(TAG, "loading keyboard failed: " + mMainKeyboardId, e); Log.w(TAG, "loading keyboard failed: " + mMainKeyboardId, e);
@ -187,10 +195,9 @@ public class KeyboardSwitcher implements SharedPreferences.OnSharedPreferenceCha
final Keyboard oldKeyboard = mKeyboardView.getKeyboard(); final Keyboard oldKeyboard = mKeyboardView.getKeyboard();
mKeyboardView.setKeyboard(newKeyboard); mKeyboardView.setKeyboard(newKeyboard);
mCurrentId = newKeyboard.mId; mCurrentId = newKeyboard.mId;
final Resources res = mInputMethodService.getResources();
mKeyboardView.setKeyPreviewPopupEnabled( mKeyboardView.setKeyPreviewPopupEnabled(
Settings.Values.isKeyPreviewPopupEnabled(mPrefs, res), Settings.Values.isKeyPreviewPopupEnabled(mPrefs, mResources),
Settings.Values.getKeyPreviewPopupDismissDelay(mPrefs, res)); Settings.Values.getKeyPreviewPopupDismissDelay(mPrefs, mResources));
final boolean localeChanged = (oldKeyboard == null) final boolean localeChanged = (oldKeyboard == null)
|| !newKeyboard.mId.mLocale.equals(oldKeyboard.mId.mLocale); || !newKeyboard.mId.mLocale.equals(oldKeyboard.mId.mLocale);
mInputMethodService.mHandler.startDisplayLanguageOnSpacebar(localeChanged); mInputMethodService.mHandler.startDisplayLanguageOnSpacebar(localeChanged);
@ -200,9 +207,8 @@ public class KeyboardSwitcher implements SharedPreferences.OnSharedPreferenceCha
final SoftReference<LatinKeyboard> ref = mKeyboardCache.get(id); final SoftReference<LatinKeyboard> ref = mKeyboardCache.get(id);
LatinKeyboard keyboard = (ref == null) ? null : ref.get(); LatinKeyboard keyboard = (ref == null) ? null : ref.get();
if (keyboard == null) { if (keyboard == null) {
final Resources res = mInputMethodService.getResources(); final Locale savedLocale = Utils.setSystemLocale(
final Locale savedLocale = Utils.setSystemLocale(res, mResources, mSubtypeSwitcher.getInputLocale());
mSubtypeSwitcher.getInputLocale());
keyboard = new LatinKeyboard(mThemeContext, id, id.mWidth); keyboard = new LatinKeyboard(mThemeContext, id, id.mWidth);
mKeyboardCache.put(id, new SoftReference<LatinKeyboard>(keyboard)); mKeyboardCache.put(id, new SoftReference<LatinKeyboard>(keyboard));
@ -210,7 +216,7 @@ public class KeyboardSwitcher implements SharedPreferences.OnSharedPreferenceCha
Log.d(TAG, "keyboard cache size=" + mKeyboardCache.size() + ": " Log.d(TAG, "keyboard cache size=" + mKeyboardCache.size() + ": "
+ ((ref == null) ? "LOAD" : "GCed") + " id=" + id); + ((ref == null) ? "LOAD" : "GCed") + " id=" + id);
Utils.setSystemLocale(res, savedLocale); Utils.setSystemLocale(mResources, savedLocale);
} else if (DEBUG_CACHE) { } else if (DEBUG_CACHE) {
Log.d(TAG, "keyboard cache size=" + mKeyboardCache.size() + ": HIT id=" + id); Log.d(TAG, "keyboard cache size=" + mKeyboardCache.size() + ": HIT id=" + id);
} }
@ -225,19 +231,11 @@ public class KeyboardSwitcher implements SharedPreferences.OnSharedPreferenceCha
return keyboard; return keyboard;
} }
private static boolean hasSettingsKey(SharedPreferences prefs, Context context, private KeyboardId getKeyboardId(EditorInfo attribute, Locale locale, final int orientation,
EditorInfo attribute) { final int width, final boolean isSymbols, final boolean isShift,
return getSettingsKeyMode(prefs, context) final boolean voiceKeyEnabled, final boolean voiceKeyOnMain) {
&& !Utils.inPrivateImeOptions(context.getPackageName(),
LatinIME.IME_OPTION_NO_SETTINGS_KEY, attribute);
}
private KeyboardId getKeyboardId(EditorInfo attribute, final boolean isSymbols,
final boolean isShift, final boolean voiceKeyEnabled, final boolean voiceKeyOnMain) {
final int mode = Utils.getKeyboardMode(attribute); final int mode = Utils.getKeyboardMode(attribute);
final boolean hasVoiceKey = voiceKeyEnabled && (isSymbols != voiceKeyOnMain);
final int xmlId; final int xmlId;
switch (mode) { switch (mode) {
case KeyboardId.MODE_PHONE: case KeyboardId.MODE_PHONE:
xmlId = (isSymbols && isShift) ? R.xml.kbd_phone_shift : R.xml.kbd_phone; xmlId = (isSymbols && isShift) ? R.xml.kbd_phone_shift : R.xml.kbd_phone;
@ -254,20 +252,16 @@ public class KeyboardSwitcher implements SharedPreferences.OnSharedPreferenceCha
break; break;
} }
final boolean hasSettingsKey = hasSettingsKey(mPrefs, mInputMethodService, attribute); final boolean noSettingsKey = Utils.inPrivateImeOptions(
final int f2KeyMode = getF2KeyMode(mPrefs, mInputMethodService, attribute); mPackageName, LatinIME.IME_OPTION_NO_SETTINGS_KEY, attribute);
final boolean clobberSettingsKey = Utils.inPrivateImeOptions( final boolean hasSettingsKey = getSettingsKeyMode(mPrefs, mResources) && !noSettingsKey;
mInputMethodService.getPackageName(), LatinIME.IME_OPTION_NO_SETTINGS_KEY, final int f2KeyMode = getF2KeyMode(mPrefs, mResources, mPackageName, attribute);
attribute); final boolean hasVoiceKey = voiceKeyEnabled && (isSymbols != voiceKeyOnMain);
final Resources res = mInputMethodService.getResources();
final int orientation = res.getConfiguration().orientation;
if (mWindowWidth == 0)
mWindowWidth = res.getDisplayMetrics().widthPixels;
final Locale locale = mSubtypeSwitcher.getInputLocale();
return new KeyboardId( return new KeyboardId(
res.getResourceEntryName(xmlId), xmlId, locale, orientation, mWindowWidth, mResources.getResourceEntryName(xmlId), xmlId, locale,
mode, attribute, hasSettingsKey, f2KeyMode, clobberSettingsKey, voiceKeyEnabled, orientation, width, mode, attribute, hasSettingsKey, f2KeyMode, noSettingsKey,
hasVoiceKey); voiceKeyEnabled, hasVoiceKey);
} }
public int getKeyboardMode() { public int getKeyboardMode() {
@ -775,8 +769,7 @@ public class KeyboardSwitcher implements SharedPreferences.OnSharedPreferenceCha
} }
} }
private static boolean getSettingsKeyMode(SharedPreferences prefs, Context context) { private static boolean getSettingsKeyMode(SharedPreferences prefs, Resources res) {
final Resources res = context.getResources();
final boolean showSettingsKeyOption = res.getBoolean( final boolean showSettingsKeyOption = res.getBoolean(
R.bool.config_enable_show_settings_key_option); R.bool.config_enable_show_settings_key_option);
if (showSettingsKeyOption) { if (showSettingsKeyOption) {
@ -796,11 +789,10 @@ public class KeyboardSwitcher implements SharedPreferences.OnSharedPreferenceCha
return true; return true;
} }
private static int getF2KeyMode(SharedPreferences prefs, Context context, private static int getF2KeyMode(SharedPreferences prefs, Resources res, String packageName,
EditorInfo attribute) { EditorInfo attribute) {
final boolean clobberSettingsKey = Utils.inPrivateImeOptions( final boolean clobberSettingsKey = Utils.inPrivateImeOptions(
context.getPackageName(), LatinIME.IME_OPTION_NO_SETTINGS_KEY, attribute); packageName, LatinIME.IME_OPTION_NO_SETTINGS_KEY, attribute);
final Resources res = context.getResources();
final String settingsKeyMode = prefs.getString(Settings.PREF_SETTINGS_KEY, final String settingsKeyMode = prefs.getString(Settings.PREF_SETTINGS_KEY,
res.getString(DEFAULT_SETTINGS_KEY_MODE)); res.getString(DEFAULT_SETTINGS_KEY_MODE));
if (settingsKeyMode.equals(res.getString(SETTINGS_KEY_MODE_AUTO))) { if (settingsKeyMode.equals(res.getString(SETTINGS_KEY_MODE_AUTO))) {