From f49688fa17b70313c0734f00df73bc3308a749e9 Mon Sep 17 00:00:00 2001 From: "Tadashi G. Takaoka" Date: Thu, 20 Jan 2011 17:56:13 +0900 Subject: [PATCH] Rename action to ACTION_INPUT_METHOD_SUBTYPE_SETTINGS Change-Id: I27c318777355991ae4ad72d0b2480e93c8c5044e --- api/11.xml | 8 ++++---- api/current.xml | 8 ++++---- core/java/android/provider/Settings.java | 6 +++--- .../com/android/server/InputMethodManagerService.java | 2 +- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/api/11.xml b/api/11.xml index 7db0328247bfb..4653ab504f035 100644 --- a/api/11.xml +++ b/api/11.xml @@ -163324,22 +163324,22 @@ visibility="public" > - - - - * In some cases, a matching Activity may not exist, so ensure you * safeguard against this. @@ -290,8 +290,8 @@ public final class Settings { * Output: Nothing. */ @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION) - public static final String ACTION_INPUT_METHOD_AND_SUBTYPE_ENABLER = - "android.settings.INPUT_METHOD_AND_SUBTYPE_ENABLER"; + public static final String ACTION_INPUT_METHOD_SUBTYPE_SETTINGS = + "android.settings.INPUT_METHOD_SUBTYPE_SETTINGS"; /** * Activity Action: Show settings to manage the user input dictionary. diff --git a/services/java/com/android/server/InputMethodManagerService.java b/services/java/com/android/server/InputMethodManagerService.java index 4d406209e74b0..18a6fe03f6372 100644 --- a/services/java/com/android/server/InputMethodManagerService.java +++ b/services/java/com/android/server/InputMethodManagerService.java @@ -1640,7 +1640,7 @@ public class InputMethodManagerService extends IInputMethodManager.Stub } private void showInputMethodAndSubtypeEnabler(String inputMethodId) { - Intent intent = new Intent(Settings.ACTION_INPUT_METHOD_AND_SUBTYPE_ENABLER); + Intent intent = new Intent(Settings.ACTION_INPUT_METHOD_SUBTYPE_SETTINGS); intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_RESET_TASK_IF_NEEDED | Intent.FLAG_ACTIVITY_CLEAR_TOP);