diff options
author | Tadashi G. Takaoka <takaoka@google.com> | 2011-01-20 05:17:51 -0800 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-01-20 05:17:51 -0800 |
commit | 90fcb2ad9378ee89f6795942c2b065a32bc83895 (patch) | |
tree | c5dfa3b8e46604a8a66e9011d1ab695b49f28eae /api | |
parent | 7ccaba693bd328968baf3f117b286659ce4a2a75 (diff) | |
parent | f49688fa17b70313c0734f00df73bc3308a749e9 (diff) | |
download | frameworks_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')
-rw-r--r-- | api/11.xml | 8 | ||||
-rw-r--r-- | api/current.xml | 8 |
2 files changed, 8 insertions, 8 deletions
@@ -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 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=""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" |