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

Fix NPE and addded logOnWarning 

Change-Id: I4cca905ce044c014490ada6d00a76d79a20ed885
main
satok 2010-06-03 20:00:45 +09:00
parent 8edbaf0433
commit 0eaca7aa99
3 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -28,6 +28,7 @@ import android.preference.PreferenceManager;
public class KeyboardSwitcher implements SharedPreferences.OnSharedPreferenceChangeListener { public class KeyboardSwitcher implements SharedPreferences.OnSharedPreferenceChangeListener {
public static final int MODE_NONE = 0;
public static final int MODE_TEXT = 1; public static final int MODE_TEXT = 1;
public static final int MODE_SYMBOLS = 2; public static final int MODE_SYMBOLS = 2;
public static final int MODE_PHONE = 3; public static final int MODE_PHONE = 3;
@ -74,7 +75,7 @@ public class KeyboardSwitcher implements SharedPreferences.OnSharedPreferenceCha
private KeyboardId mCurrentId; private KeyboardId mCurrentId;
private Map<KeyboardId, LatinKeyboard> mKeyboards; private Map<KeyboardId, LatinKeyboard> mKeyboards;
private int mMode = MODE_TEXT; /** 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 int mTextMode = MODE_TEXT_QWERTY;
private boolean mIsSymbols; private boolean mIsSymbols;
@ -276,6 +277,10 @@ public class KeyboardSwitcher implements SharedPreferences.OnSharedPreferenceCha
? new KeyboardId(R.xml.kbd_phone_symbols, hasVoice) : makeSymbolsId(hasVoice); ? new KeyboardId(R.xml.kbd_phone_symbols, hasVoice) : makeSymbolsId(hasVoice);
} }
switch (mode) { switch (mode) {
case MODE_NONE:
LatinImeLogger.logOnWarning(
"getKeyboardId:" + mode + "," + imeOptions + "," + isSymbols);
/* fall through */
case MODE_TEXT: case MODE_TEXT:
if (mTextMode == MODE_TEXT_ALPHA) { if (mTextMode == MODE_TEXT_ALPHA) {
return new KeyboardId(R.xml.kbd_alpha, KEYBOARDMODE_NORMAL, true, hasVoice); return new KeyboardId(R.xml.kbd_alpha, KEYBOARDMODE_NORMAL, true, hasVoice);

3
java/src/com/android/inputmethod/latin/LatinIME.java
View File

@ -812,7 +812,8 @@ public class LatinIME extends InputMethodService
mKeyboardSwitcher = new KeyboardSwitcher(this, this); mKeyboardSwitcher = new KeyboardSwitcher(this, this);
} }
mKeyboardSwitcher.setLanguageSwitcher(mLanguageSwitcher); mKeyboardSwitcher.setLanguageSwitcher(mLanguageSwitcher);
if (mKeyboardSwitcher.getInputView() != null) { if (mKeyboardSwitcher.getInputView() != null
&& mKeyboardSwitcher.getKeyboardMode() != KeyboardSwitcher.MODE_NONE) {
mKeyboardSwitcher.setVoiceMode(mEnableVoice && mEnableVoiceButton, mVoiceOnPrimary); mKeyboardSwitcher.setVoiceMode(mEnableVoice && mEnableVoiceButton, mVoiceOnPrimary);
} }
mKeyboardSwitcher.makeKeyboards(true); mKeyboardSwitcher.makeKeyboards(true);

7
java/src/com/android/inputmethod/latin/LatinImeLogger.java
View File

@ -570,6 +570,13 @@ public class LatinImeLogger implements SharedPreferences.OnSharedPreferenceChang
} }
} }
public static void logOnWarning(String warning) {
if (sLogEnabled) {
sLatinImeLogger.sendLogToDropBox(
ID_EXCEPTION, new String[] {warning, ""});
}
}
public static void onStartSuggestion() { public static void onStartSuggestion() {
if (sLogEnabled) { if (sLogEnabled) {
sSuggestDicMap.clear(); sSuggestDicMap.clear();