auto import from //branches/cupcake/...@126645

2 files changed, 182 insertions, 38 deletions

diff --git a/api/3.xml b/api/3.xml
index e13cfde..9d9ce98 100644
--- a/api/3.xml
+++ b/api/3.xml
@@ -88575,7 +88575,7 @@
  deprecated="not deprecated"
  visibility="public"
 >
-<parameter name="predicates" type="com.android.internal.util.Predicate...">
+<parameter name="predicates" type="com.android.internal.util.Predicate&lt;android.test.suitebuilder.TestMethod&gt;...">
 </parameter>
 </method>
 <method name="build"
@@ -169353,7 +169353,7 @@
 >
 <parameter name="loader" type="java.lang.ClassLoader">
 </parameter>
-<parameter name="interfaces" type="java.lang.Class...">
+<parameter name="interfaces" type="java.lang.Class&lt;?&gt;...">
 </parameter>
 <exception name="IllegalArgumentException" type="java.lang.IllegalArgumentException">
 </exception>
diff --git a/api/current.xml b/api/current.xml
index 13ca370..f6fa67d 100644
--- a/api/current.xml
+++ b/api/current.xml
@@ -3100,6 +3100,17 @@
  visibility="public"
 >
 </field>
+<field name="fillEnabled"
+ type="int"
+ transient="false"
+ volatile="false"
+ value="16843349"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
 <field name="fillViewport"
  type="int"
  transient="false"
@@ -3859,6 +3870,17 @@
  visibility="public"
 >
 </field>
+<field name="isScrollContainer"
+ type="int"
+ transient="false"
+ volatile="false"
+ value="16843348"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
 <field name="isSticky"
  type="int"
  transient="false"
@@ -56395,6 +56417,8 @@
  deprecated="not deprecated"
  visibility="public"
 >
+<parameter name="flags" type="int">
+</parameter>
 </method>
 <method name="getCurrentInputBinding"
  return="android.view.inputmethod.InputBinding"
@@ -56693,6 +56717,19 @@
 <parameter name="event" type="android.view.KeyEvent">
 </parameter>
 </method>
+<method name="onShowRequested"
+ return="void"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="flags" type="int">
+</parameter>
+</method>
 <method name="onStartInput"
  return="void"
  abstract="false"
@@ -56964,6 +57001,8 @@
  deprecated="not deprecated"
  visibility="public"
 >
+<parameter name="flags" type="int">
+</parameter>
 </method>
 <method name="startInput"
  return="void"
@@ -72058,7 +72097,7 @@
  synchronized="false"
  static="true"
  final="false"
- deprecated="not deprecated"
+ deprecated="deprecated"
  visibility="public"
 >
 <parameter name="port" type="int">
@@ -96698,7 +96737,7 @@
  deprecated="not deprecated"
  visibility="public"
 >
-<parameter name="predicates" type="com.android.internal.util.Predicate...">
+<parameter name="predicates" type="com.android.internal.util.Predicate&lt;android.test.suitebuilder.TestMethod&gt;...">
 </parameter>
 </method>
 <method name="build"
@@ -119356,6 +119395,17 @@
  visibility="protected"
 >
 </method>
+<method name="onCheckIsTextEditor"
+ return="boolean"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
 <method name="onCreateContextMenu"
  return="void"
  abstract="false"
@@ -125692,6 +125742,19 @@
  visibility="public"
 >
 </method>
+<method name="mayUseInputMethod"
+ return="boolean"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="true"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="flags" type="int">
+</parameter>
+</method>
 <method name="setTitle"
  return="void"
  abstract="false"
@@ -125961,17 +126024,6 @@
  visibility="public"
 >
 </field>
-<field name="FLAG_RESTORED_STATE"
- type="int"
- transient="false"
- volatile="false"
- value="524288"
- static="true"
- final="true"
- deprecated="not deprecated"
- visibility="public"
->
-</field>
 <field name="FLAG_SCALED"
  type="int"
  transient="false"
@@ -126159,6 +126211,17 @@
  visibility="public"
 >
 </field>
+<field name="SOFT_INPUT_IS_FORWARD_NAVIGATION"
+ type="int"
+ transient="false"
+ volatile="false"
+ value="256"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
 <field name="SOFT_INPUT_MASK_ADJUST"
  type="int"
  transient="false"
@@ -126192,11 +126255,11 @@
  visibility="public"
 >
 </field>
-<field name="SOFT_INPUT_STATE_FIRST_VISIBLE"
+<field name="SOFT_INPUT_STATE_ALWAYS_VISIBLE"
  type="int"
  transient="false"
  volatile="false"
- value="3"
+ value="4"
  static="true"
  final="true"
  deprecated="not deprecated"
@@ -126240,7 +126303,7 @@
  type="int"
  transient="false"
  volatile="false"
- value="4"
+ value="3"
  static="true"
  final="true"
  deprecated="not deprecated"
@@ -127025,6 +127088,17 @@
 <parameter name="parentHeight" type="int">
 </parameter>
 </method>
+<method name="isFillEnabled"
+ return="boolean"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
 <method name="isInitialized"
  return="boolean"
  abstract="false"
@@ -127144,6 +127218,19 @@
 <parameter name="fillBefore" type="boolean">
 </parameter>
 </method>
+<method name="setFillEnabled"
+ return="void"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="fillEnabled" type="boolean">
+</parameter>
+</method>
 <method name="setInterpolator"
  return="void"
  abstract="false"
@@ -130030,6 +130117,8 @@
  deprecated="not deprecated"
  visibility="public"
 >
+<parameter name="flags" type="int">
+</parameter>
 </method>
 <method name="startInput"
  return="void"
@@ -130077,6 +130166,17 @@
  visibility="public"
 >
 </field>
+<field name="SHOW_EXPLICIT"
+ type="int"
+ transient="false"
+ volatile="false"
+ value="1"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
 </interface>
 <interface name="InputMethod.SessionCallback"
  abstract="true"
@@ -130353,6 +130453,8 @@
 >
 <parameter name="token" type="android.os.IBinder">
 </parameter>
+<parameter name="flags" type="int">
+</parameter>
 </method>
 <method name="hideSoftInputFromWindow"
  return="void"
@@ -130366,6 +130468,8 @@
 >
 <parameter name="windowToken" type="android.os.IBinder">
 </parameter>
+<parameter name="flags" type="int">
+</parameter>
 </method>
 <method name="isAcceptingText"
  return="boolean"
@@ -130415,25 +130519,6 @@
 <parameter name="view" type="android.view.View">
 </parameter>
 </method>
-<method name="onWindowFocus"
- return="void"
- abstract="false"
- native="false"
- synchronized="false"
- static="false"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
-<parameter name="focusedView" type="android.view.View">
-</parameter>
-<parameter name="softInputMode" type="int">
-</parameter>
-<parameter name="first" type="boolean">
-</parameter>
-<parameter name="windowFlags" type="int">
-</parameter>
-</method>
 <method name="restartInput"
  return="void"
  abstract="false"
@@ -130485,6 +130570,8 @@
 >
 <parameter name="view" type="android.view.View">
 </parameter>
+<parameter name="flags" type="int">
+</parameter>
 </method>
 <method name="updateCursor"
  return="void"
@@ -130560,6 +130647,28 @@
 <parameter name="iconPackage" type="java.lang.String">
 </parameter>
 </method>
+<field name="HIDE_IMPLICIT_ONLY"
+ type="int"
+ transient="false"
+ volatile="false"
+ value="1"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
+<field name="SHOW_IMPLICIT"
+ type="int"
+ transient="false"
+ volatile="false"
+ value="1"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
 </class>
 <interface name="InputMethodSession"
  abstract="true"
@@ -137741,6 +137850,17 @@
 <parameter name="defStyle" type="int">
 </parameter>
 </constructor>
+<method name="clearListSelection"
+ return="void"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
 <method name="convertSelectionToString"
  return="java.lang.CharSequence"
  abstract="false"
@@ -137820,6 +137940,17 @@
  visibility="public"
 >
 </method>
+<method name="getListSelection"
+ return="int"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
 <method name="getOnItemClickListener"
  return="android.widget.AdapterView.OnItemClickListener"
  abstract="false"
@@ -137964,6 +138095,19 @@
 <parameter name="hint" type="java.lang.CharSequence">
 </parameter>
 </method>
+<method name="setListSelection"
+ return="void"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="position" type="int">
+</parameter>
+</method>
 <method name="setOnItemClickListener"
  return="void"
  abstract="false"
@@ -183719,7 +183863,7 @@
 >
 <parameter name="loader" type="java.lang.ClassLoader">
 </parameter>
-<parameter name="interfaces" type="java.lang.Class...">
+<parameter name="interfaces" type="java.lang.Class&lt;?&gt;...">
 </parameter>
 <exception name="IllegalArgumentException" type="java.lang.IllegalArgumentException">
 </exception>