commit 90fcb2ad9378ee89f6795942c2b065a32bc83895
author Tadashi G. Takaoka <takaoka@google.com> Thu Jan 20 05:17:51 2011 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jan 20 05:17:51 2011 -0800
tree c5dfa3b8e46604a8a66e9011d1ab695b49f28eae
parent 7ccaba693bd328968baf3f117b286659ce4a2a75
parent f49688fa17b70313c0734f00df73bc3308a749e9

Merge "Rename action to ACTION_INPUT_METHOD_SUBTYPE_SETTINGS" into honeycomb

api/11.xml

diff --git a/api/11.xml b/api/11.xml
index 70d37b4..d668883 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="&quot;android.settings.INPUT_METHOD_AND_SUBTYPE_ENABLER&quot;"
+ value="&quot;android.settings.INPUT_METHOD_SETTINGS&quot;"
  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="&quot;android.settings.INPUT_METHOD_SETTINGS&quot;"
+ value="&quot;android.settings.INPUT_METHOD_SUBTYPE_SETTINGS&quot;"
  static="true"
  final="true"
  deprecated="not deprecated"

api/current.xml

diff --git a/api/current.xml b/api/current.xml
index 0427a2e..a63a867 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="&quot;android.settings.INPUT_METHOD_AND_SUBTYPE_ENABLER&quot;"
+ value="&quot;android.settings.INPUT_METHOD_SETTINGS&quot;"
  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="&quot;android.settings.INPUT_METHOD_SETTINGS&quot;"
+ value="&quot;android.settings.INPUT_METHOD_SUBTYPE_SETTINGS&quot;"
  static="true"
  final="true"
  deprecated="not deprecated"

core/java/android/provider/Settings.java

diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java
index cec99e9..1d817ea 100644
--- a/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java
@@ -280,7 +280,7 @@
             "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 @@
      * 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.

services/java/com/android/server/InputMethodManagerService.java

diff --git a/services/java/com/android/server/InputMethodManagerService.java b/services/java/com/android/server/InputMethodManagerService.java
index 4d40620..18a6fe0 100644
--- a/services/java/com/android/server/InputMethodManagerService.java
+++ b/services/java/com/android/server/InputMethodManagerService.java
@@ -1640,7 +1640,7 @@
     }
 
     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);