diff options
| author | Tadashi G. Takaoka <takaoka@google.com> | 2011-01-20 23:54:21 +0900 |
|---|---|---|
| committer | Tadashi G. Takaoka <takaoka@google.com> | 2011-01-21 00:13:33 +0900 |
| commit | 9f7320132b7a5e7def378ae754c8c708759a8670 (patch) | |
| tree | d2a9d6a42b8f5089fe3eafc1388c7473ea518e48 /src/com/android | |
| parent | 4c0100f48f3e83bc960137e3248d7523fa3d5190 (diff) | |
| download | packages_apps_Settings-9f7320132b7a5e7def378ae754c8c708759a8670.tar.gz packages_apps_Settings-9f7320132b7a5e7def378ae754c8c708759a8670.tar.bz2 packages_apps_Settings-9f7320132b7a5e7def378ae754c8c708759a8670.zip | |
Use android.provider.Settings.EXTRA_INPUT_METHOD_ID
This change also fixes the action name of
android.settings.INPUT_METHOD_SUBTYPE_SETTINGS.
Change-Id: Ie08e7f9144f8ff8faa8e7d8edf63fbd59421b18c
Diffstat (limited to 'src/com/android')
| -rw-r--r-- | src/com/android/settings/inputmethod/InputMethodAndSubtypeEnabler.java | 6 | ||||
| -rw-r--r-- | src/com/android/settings/inputmethod/InputMethodConfig.java | 2 |
2 files changed, 3 insertions, 5 deletions
diff --git a/src/com/android/settings/inputmethod/InputMethodAndSubtypeEnabler.java b/src/com/android/settings/inputmethod/InputMethodAndSubtypeEnabler.java index ab4180ada..3ba06252c 100644 --- a/src/com/android/settings/inputmethod/InputMethodAndSubtypeEnabler.java +++ b/src/com/android/settings/inputmethod/InputMethodAndSubtypeEnabler.java @@ -39,9 +39,6 @@ import java.util.HashMap; import java.util.List; public class InputMethodAndSubtypeEnabler extends SettingsPreferenceFragment { - - public static final String EXTRA_INPUT_METHOD_ID = "input_method_id"; - private AlertDialog mDialog = null; private boolean mHaveHardKeyboard; final private HashMap<String, List<Preference>> mInputMethodAndSubtypePrefsMap = @@ -58,7 +55,8 @@ public class InputMethodAndSubtypeEnabler extends SettingsPreferenceFragment { mImm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE); Configuration config = getResources().getConfiguration(); mHaveHardKeyboard = (config.keyboard == Configuration.KEYBOARD_QWERTY); - mInputMethodId = getActivity().getIntent().getStringExtra(EXTRA_INPUT_METHOD_ID); + mInputMethodId = getActivity().getIntent().getStringExtra( + android.provider.Settings.EXTRA_INPUT_METHOD_ID); onCreateIMM(); setPreferenceScreen(createPreferenceHierarchy()); } diff --git a/src/com/android/settings/inputmethod/InputMethodConfig.java b/src/com/android/settings/inputmethod/InputMethodConfig.java index c7988099e..908fa05a2 100644 --- a/src/com/android/settings/inputmethod/InputMethodConfig.java +++ b/src/com/android/settings/inputmethod/InputMethodConfig.java @@ -223,7 +223,7 @@ public class InputMethodConfig extends SettingsPreferenceFragment { intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_RESET_TASK_IF_NEEDED | Intent.FLAG_ACTIVITY_CLEAR_TOP); - intent.putExtra(InputMethodAndSubtypeEnabler.EXTRA_INPUT_METHOD_ID, imiId); + intent.putExtra(Settings.EXTRA_INPUT_METHOD_ID, imiId); prefScreen.setIntent(intent); keyboardSettingsCategory.addPreference(prefScreen); mActiveInputMethodsPrefMap.put(imi, prefScreen); |