Pick the default IME in case of a fresh install.

Bug: 2661261

Change-Id: Id8077ffddd8ddc5c3d3fd371afaad63698ef8d9e
This commit is contained in:
Yuncheol Heo
2010-05-12 13:35:55 +09:00
parent d4a2fffefd
commit 8b70c9c1db

View File

@@ -472,8 +472,10 @@ public class InputMethodManagerService extends IInputMethodManager.Stub
mContext.getContentResolver(),
Settings.Secure.ENABLED_INPUT_METHODS);
Slog.i(TAG, "Enabled input methods: " + enabledStr);
if (enabledStr == null) {
Slog.i(TAG, "Enabled input methods has not been set, enabling all");
final String defaultIme = Settings.Secure.getString(mContext
.getContentResolver(), Settings.Secure.DEFAULT_INPUT_METHOD);
if (enabledStr == null || TextUtils.isEmpty(defaultIme)) {
Slog.i(TAG, "Enabled input methods or default IME has not been set, enabling all");
InputMethodInfo defIm = null;
StringBuilder sb = new StringBuilder(256);
final int N = mMethodList.size();
@@ -1483,7 +1485,7 @@ public class InputMethodManagerService extends IInputMethodManager.Stub
String defaultIme = Settings.Secure.getString(mContext
.getContentResolver(), Settings.Secure.DEFAULT_INPUT_METHOD);
if (!map.containsKey(defaultIme)) {
if (!TextUtils.isEmpty(defaultIme) && !map.containsKey(defaultIme)) {
if (chooseNewDefaultIMELocked()) {
updateFromSettingsLocked();
}