diff options
| author | Tadashi G. Takaoka <takaoka@google.com> | 2011-01-20 23:13:02 +0900 |
|---|---|---|
| committer | Tadashi G. Takaoka <takaoka@google.com> | 2011-01-21 00:15:29 +0900 |
| commit | 2548020c364c4119d134c84cc7a00ffca2dcbe7b (patch) | |
| tree | a15dd66692ae53745a043e36e9f15685659cb358 | |
| parent | 90fcb2ad9378ee89f6795942c2b065a32bc83895 (diff) | |
| download | frameworks_base-2548020c364c4119d134c84cc7a00ffca2dcbe7b.zip frameworks_base-2548020c364c4119d134c84cc7a00ffca2dcbe7b.tar.gz frameworks_base-2548020c364c4119d134c84cc7a00ffca2dcbe7b.tar.bz2 | |
Add android.provider.Settings.EXTRA_INPUT_METHOD_ID
Change-Id: Iecb7a9c265cafe96e7eec099341133da8e966f6f
| -rw-r--r-- | api/11.xml | 11 | ||||
| -rw-r--r-- | api/current.xml | 13 | ||||
| -rw-r--r-- | core/java/android/provider/Settings.java | 9 | ||||
| -rw-r--r-- | services/java/com/android/server/InputMethodManagerService.java | 3 |
4 files changed, 33 insertions, 3 deletions
@@ -163566,6 +163566,17 @@ visibility="public" > </field> +<field name="EXTRA_INPUT_METHOD_ID" + type="java.lang.String" + transient="false" + volatile="false" + value=""input_method_id"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> </class> <class name="Settings.NameValueTable" extends="java.lang.Object" diff --git a/api/current.xml b/api/current.xml index a63a867..696ba43 100644 --- a/api/current.xml +++ b/api/current.xml @@ -163587,6 +163587,17 @@ visibility="public" > </field> +<field name="EXTRA_INPUT_METHOD_ID" + type="java.lang.String" + transient="false" + volatile="false" + value=""input_method_id"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> </class> <class name="Settings.NameValueTable" extends="java.lang.Object" @@ -260347,7 +260358,7 @@ deprecated="not deprecated" visibility="public" > -<parameter name="t" type="T"> +<parameter name="arg0" type="T"> </parameter> </method> </interface> diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index 1d817ea..6f23215 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -285,6 +285,13 @@ public final class Settings { * In some cases, a matching Activity may not exist, so ensure you * safeguard against this. * <p> + * To tell which input method's subtypes are displayed in the settings, add + * {@link #EXTRA_INPUT_METHOD_ID} extra to this Intent with the input method id. + * If there is no extra in this Intent, subtypes from all installed input methods + * will be displayed in the settings. + * + * @see android.view.inputmethod.InputMethodInfo#getId + * <p> * Input: Nothing. * <p> * Output: Nothing. @@ -555,6 +562,8 @@ public final class Settings { public static final String EXTRA_AUTHORITIES = "authorities"; + public static final String EXTRA_INPUT_METHOD_ID = "input_method_id"; + private static final String JID_RESOURCE_PREFIX = "android"; public static final String AUTHORITY = "settings"; diff --git a/services/java/com/android/server/InputMethodManagerService.java b/services/java/com/android/server/InputMethodManagerService.java index 18a6fe0..5ae8394 100644 --- a/services/java/com/android/server/InputMethodManagerService.java +++ b/services/java/com/android/server/InputMethodManagerService.java @@ -118,7 +118,6 @@ public class InputMethodManagerService extends IInputMethodManager.Stub private static final int NOT_A_SUBTYPE_ID = -1; private static final String NOT_A_SUBTYPE_ID_STR = String.valueOf(NOT_A_SUBTYPE_ID); - private static final String EXTRA_INPUT_METHOD_ID = "input_method_id"; private static final String SUBTYPE_MODE_KEYBOARD = "keyboard"; private static final String SUBTYPE_MODE_VOICE = "voice"; @@ -1645,7 +1644,7 @@ public class InputMethodManagerService extends IInputMethodManager.Stub | Intent.FLAG_ACTIVITY_RESET_TASK_IF_NEEDED | Intent.FLAG_ACTIVITY_CLEAR_TOP); if (!TextUtils.isEmpty(inputMethodId)) { - intent.putExtra(EXTRA_INPUT_METHOD_ID, inputMethodId); + intent.putExtra(Settings.EXTRA_INPUT_METHOD_ID, inputMethodId); } mContext.startActivity(intent); } |