diff options
| -rw-r--r-- | api/11.xml | 8 | ||||
| -rw-r--r-- | api/current.xml | 8 | ||||
| -rw-r--r-- | core/java/android/provider/Settings.java | 6 | ||||
| -rw-r--r-- | services/java/com/android/server/InputMethodManagerService.java | 2 |
4 files changed, 12 insertions, 12 deletions
diff --git a/api/11.xml b/api/11.xml index 70d37b4aa320..d66888306bc1 100644 --- a/api/11.xml +++ b/api/11.xml @@ -163324,22 +163324,22 @@ visibility="public" > </field> -<field name="ACTION_INPUT_METHOD_AND_SUBTYPE_ENABLER" +<field name="ACTION_INPUT_METHOD_SETTINGS" type="java.lang.String" transient="false" volatile="false" - value=""android.settings.INPUT_METHOD_AND_SUBTYPE_ENABLER"" + value=""android.settings.INPUT_METHOD_SETTINGS"" static="true" final="true" deprecated="not deprecated" visibility="public" > </field> -<field name="ACTION_INPUT_METHOD_SETTINGS" +<field name="ACTION_INPUT_METHOD_SUBTYPE_SETTINGS" type="java.lang.String" transient="false" volatile="false" - value=""android.settings.INPUT_METHOD_SETTINGS"" + value=""android.settings.INPUT_METHOD_SUBTYPE_SETTINGS"" static="true" final="true" deprecated="not deprecated" diff --git a/api/current.xml b/api/current.xml index 0427a2e56d6a..a63a86728dee 100644 --- a/api/current.xml +++ b/api/current.xml @@ -163345,22 +163345,22 @@ visibility="public" > </field> -<field name="ACTION_INPUT_METHOD_AND_SUBTYPE_ENABLER" +<field name="ACTION_INPUT_METHOD_SETTINGS" type="java.lang.String" transient="false" volatile="false" - value=""android.settings.INPUT_METHOD_AND_SUBTYPE_ENABLER"" + value=""android.settings.INPUT_METHOD_SETTINGS"" static="true" final="true" deprecated="not deprecated" visibility="public" > </field> -<field name="ACTION_INPUT_METHOD_SETTINGS" +<field name="ACTION_INPUT_METHOD_SUBTYPE_SETTINGS" type="java.lang.String" transient="false" volatile="false" - value=""android.settings.INPUT_METHOD_SETTINGS"" + value=""android.settings.INPUT_METHOD_SUBTYPE_SETTINGS"" static="true" final="true" deprecated="not deprecated" diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index cec99e96b7be..1d817eacca19 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -280,7 +280,7 @@ public final class Settings { "android.settings.INPUT_METHOD_SETTINGS"; /** - * Activity Action: Show enabler activity to enable/disable input methods and subtypes. + * Activity Action: Show settings to enable/disable input method subtypes. * <p> * 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 4d406209e74b..18a6fe03f637 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); |