summaryrefslogtreecommitdiff
path: root/api/current.xml
diff options
context:
space:
mode:
author satok <satok@google.com> 2010-11-23 13:34:04 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 2010-11-23 13:34:04 -0800
commit4f4180737ca5cfd50e4ec9d3d85a12e6c811f4bf (patch)
tree1d2db50204010ed73012a25565676bfb4e490d56 /api/current.xml
parent533ada42609bd9f3fde51784e7558eb01e6fb19c (diff)
parentf3db1af8d55ab247b6db67baf4fe772c18f33cab (diff)
Merge "Change return type of getShortcutInputMethodsAndSubtypes to Map<InputMethodInfo, List<InputMethodSubtype>>"
Diffstat (limited to 'api/current.xml')
-rw-r--r--api/current.xml4
1 files changed, 2 insertions, 2 deletions
diff --git a/api/current.xml b/api/current.xml
index e6ac50733f8e..86e8f8bf245f 100644
--- a/api/current.xml
+++ b/api/current.xml
@@ -221206,7 +221206,7 @@
>
</method>
<method name="getShortcutInputMethodsAndSubtypes"
- return="java.util.List&lt;android.util.Pair&lt;android.view.inputmethod.InputMethodInfo, android.view.inputmethod.InputMethodSubtype&gt;&gt;"
+ return="java.util.Map&lt;android.view.inputmethod.InputMethodInfo, java.util.List&lt;android.view.inputmethod.InputMethodSubtype&gt;&gt;"
abstract="false"
native="false"
synchronized="false"
@@ -249195,7 +249195,7 @@
deprecated="not deprecated"
visibility="public"
>
-<parameter name="t" type="T">
+<parameter name="arg0" type="T">
</parameter>
</method>
</interface>