summaryrefslogtreecommitdiffstats
path: root/src/com/android/settings/inputmethod
diff options
context:
space:
mode:
authorsatok <satok@google.com>2011-01-17 16:30:21 +0900
committersatok <satok@google.com>2011-01-17 16:45:03 +0900
commit062c3c3c3d5890e85bff61ca067860641aa8f8f8 (patch)
tree7df2bff4815e6cc2e18384a0d6be0c69a8d29bc4 /src/com/android/settings/inputmethod
parent67c0d5899278230ce5c1ec3734c843e8710bbefd (diff)
downloadpackages_apps_Settings-062c3c3c3d5890e85bff61ca067860641aa8f8f8.tar.gz
packages_apps_Settings-062c3c3c3d5890e85bff61ca067860641aa8f8f8.tar.bz2
packages_apps_Settings-062c3c3c3d5890e85bff61ca067860641aa8f8f8.zip
Clear current input method when a current ime was disabled.
Change-Id: Iade2c025e686bce47a94daa96bc0787431fafa01
Diffstat (limited to 'src/com/android/settings/inputmethod')
-rw-r--r--src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java14
-rw-r--r--src/com/android/settings/inputmethod/InputMethodAndSubtypeUtil.java1
2 files changed, 1 insertions, 14 deletions
diff --git a/src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java b/src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java
index 117bec5d2..a4808b078 100644
--- a/src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java
+++ b/src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java
@@ -21,29 +21,15 @@ import com.android.settings.SettingsPreferenceFragment;
import com.android.settings.Utils;
import com.android.settings.VoiceInputOutputSettings;
-import android.app.AlertDialog;
import android.content.Context;
-import android.content.DialogInterface;
-import android.content.Intent;
-import android.content.pm.ApplicationInfo;
-import android.content.pm.PackageManager;
import android.content.res.Configuration;
import android.os.Bundle;
-import android.preference.CheckBoxPreference;
import android.preference.ListPreference;
import android.preference.Preference;
-import android.preference.PreferenceGroup;
import android.preference.PreferenceScreen;
import android.provider.Settings;
-import android.text.TextUtils;
-import android.util.Log;
-import android.view.inputmethod.InputMethodInfo;
import android.view.inputmethod.InputMethodManager;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-
public class InputMethodAndLanguageSettings extends SettingsPreferenceFragment
implements Preference.OnPreferenceChangeListener{
diff --git a/src/com/android/settings/inputmethod/InputMethodAndSubtypeUtil.java b/src/com/android/settings/inputmethod/InputMethodAndSubtypeUtil.java
index 69819273e..03c5ea1d0 100644
--- a/src/com/android/settings/inputmethod/InputMethodAndSubtypeUtil.java
+++ b/src/com/android/settings/inputmethod/InputMethodAndSubtypeUtil.java
@@ -204,6 +204,7 @@ public class InputMethodAndSubtypeUtil {
if (DEBUG) {
Log.d(TAG, "Current IME was uninstalled or disabled.");
}
+ currentInputMethodId = null;
}
}
// If it's a disabled system ime, add it to the disabled list so that it