summaryrefslogtreecommitdiffstats
path: root/api/11.xml
diff options
context:
space:
mode:
authorTadashi G. Takaoka <takaoka@google.com>2011-01-20 05:17:51 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-01-20 05:17:51 -0800
commit90fcb2ad9378ee89f6795942c2b065a32bc83895 (patch)
treec5dfa3b8e46604a8a66e9011d1ab695b49f28eae /api/11.xml
parent7ccaba693bd328968baf3f117b286659ce4a2a75 (diff)
parentf49688fa17b70313c0734f00df73bc3308a749e9 (diff)
downloadframeworks_base-90fcb2ad9378ee89f6795942c2b065a32bc83895.zip
frameworks_base-90fcb2ad9378ee89f6795942c2b065a32bc83895.tar.gz
frameworks_base-90fcb2ad9378ee89f6795942c2b065a32bc83895.tar.bz2
Merge "Rename action to ACTION_INPUT_METHOD_SUBTYPE_SETTINGS" into honeycomb
Diffstat (limited to 'api/11.xml')
-rw-r--r--api/11.xml8
1 files changed, 4 insertions, 4 deletions
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"