From 9f7320132b7a5e7def378ae754c8c708759a8670 Mon Sep 17 00:00:00 2001
From: "Tadashi G. Takaoka" <takaoka@google.com>
Date: Thu, 20 Jan 2011 23:54:21 +0900
Subject: [PATCH] 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
---
 AndroidManifest.xml                                         | 2 +-
 .../settings/inputmethod/InputMethodAndSubtypeEnabler.java  | 6 ++----
 src/com/android/settings/inputmethod/InputMethodConfig.java | 2 +-
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 9caececbfa4..b80b7b49976 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -359,7 +359,7 @@
                 android:clearTaskOnLaunch="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
-                <action android:name="android.settings.INPUT_METHOD_AND_SUBTYPE_ENABLER" />
+                <action android:name="android.settings.INPUT_METHOD_SUBTYPE_SETTINGS" />
                 <category android:name="android.intent.category.VOICE_LAUNCH" />
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="com.android.settings.SHORTCUT" />
diff --git a/src/com/android/settings/inputmethod/InputMethodAndSubtypeEnabler.java b/src/com/android/settings/inputmethod/InputMethodAndSubtypeEnabler.java
index ab4180ada71..3ba06252ca5 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 c7988099eb3..908fa05a2c6 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);