commit 8ea25cc1a104bfc95d5742a8c0ab582c7812ee74
author Jacek Surazski <jaceks@google.com> Thu Jan 28 00:09:56 2010 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jan 28 00:09:56 2010 -0800
tree 9392c573937d085fedf326955df4e1ab98a875f7
parent c58ffe8253ca76160908d153242d8150f668ea32
parent 41a9fd55ac0f50afb3d70b1ba0786dbb316eebce

Merge "timestamp field in ApplicationErrorReport was not getting intitialized on ANRs"

api/8.xml

diff --git a/api/8.xml b/api/8.xml
index f6ccc93..d5e5fc9 100644
--- a/api/8.xml
+++ b/api/8.xml
@@ -325998,18 +325998,10 @@
  extends="java.lang.Object"
  abstract="false"
  static="false"
- final="false"
+ final="true"
  deprecated="not deprecated"
  visibility="public"
 >
-<constructor name="XMLConstants"
- type="javax.xml.XMLConstants"
- static="false"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
-</constructor>
 <field name="DEFAULT_NS_PREFIX"
  type="java.lang.String"
  transient="false"

api/current.xml

diff --git a/api/current.xml b/api/current.xml
index 1250461..8302385 100644
--- a/api/current.xml
+++ b/api/current.xml
@@ -20399,6 +20399,17 @@
  deprecated="not deprecated"
  visibility="public"
 >
+<method name="getActiveAdmins"
+ return="java.util.List&lt;android.content.ComponentName&gt;"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
 <method name="getCurrentFailedPasswordAttempts"
  return="int"
  abstract="false"
@@ -65834,6 +65845,102 @@
 >
 </constructor>
 </class>
+<class name="YuvImage"
+ extends="java.lang.Object"
+ abstract="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<constructor name="YuvImage"
+ type="android.graphics.YuvImage"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="yuv" type="byte[]">
+</parameter>
+<parameter name="format" type="int">
+</parameter>
+<parameter name="strides" type="int[]">
+</parameter>
+</constructor>
+<method name="compressToJpeg"
+ return="boolean"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="width" type="int">
+</parameter>
+<parameter name="height" type="int">
+</parameter>
+<parameter name="offsets" type="int[]">
+</parameter>
+<parameter name="quality" type="int">
+</parameter>
+<parameter name="stream" type="java.io.OutputStream">
+</parameter>
+</method>
+<method name="getStrides"
+ return="int[]"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
+<method name="getYuvData"
+ return="byte[]"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
+<method name="getYuvFormat"
+ return="int"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
+<method name="validate"
+ return="boolean"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="protected"
+>
+<parameter name="format" type="int">
+</parameter>
+<parameter name="width" type="int">
+</parameter>
+<parameter name="height" type="int">
+</parameter>
+<parameter name="offsets" type="int[]">
+</parameter>
+</method>
+</class>
 </package>
 <package name="android.graphics.drawable"
 >
@@ -69645,6 +69752,19 @@
  visibility="public"
 >
 </method>
+<method name="setDisplayOrientation"
+ return="void"
+ abstract="false"
+ native="true"
+ synchronized="false"
+ static="false"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="degrees" type="int">
+</parameter>
+</method>
 <method name="setErrorCallback"
  return="void"
  abstract="false"
@@ -72006,7 +72126,7 @@
  type="float"
  transient="false"
  volatile="false"
- value="0.0010f"
+ value="0.001f"
  static="true"
  final="true"
  deprecated="not deprecated"
@@ -169579,6 +169699,19 @@
  visibility="public"
 >
 </method>
+<method name="dispatchDisplayHint"
+ return="void"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="hint" type="int">
+</parameter>
+</method>
 <method name="dispatchDraw"
  return="void"
  abstract="false"
@@ -171307,6 +171440,19 @@
  visibility="protected"
 >
 </method>
+<method name="onDisplayHint"
+ return="void"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="protected"
+>
+<parameter name="hint" type="int">
+</parameter>
+</method>
 <method name="onDraw"
  return="void"
  abstract="false"
@@ -209513,7 +209659,7 @@
  deprecated="not deprecated"
  visibility="public"
 >
-<parameter name="arg0" type="T">
+<parameter name="t" type="T">
 </parameter>
 </method>
 </interface>
@@ -338309,18 +338455,10 @@
  extends="java.lang.Object"
  abstract="false"
  static="false"
- final="false"
+ final="true"
  deprecated="not deprecated"
  visibility="public"
 >
-<constructor name="XMLConstants"
- type="javax.xml.XMLConstants"
- static="false"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
-</constructor>
 <field name="DEFAULT_NS_PREFIX"
  type="java.lang.String"
  transient="false"
@@ -338455,6 +338593,1837 @@
 </field>
 </class>
 </package>
+<package name="javax.xml.datatype"
+>
+<class name="DatatypeConfigurationException"
+ extends="java.lang.Exception"
+ abstract="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<constructor name="DatatypeConfigurationException"
+ type="javax.xml.datatype.DatatypeConfigurationException"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</constructor>
+<constructor name="DatatypeConfigurationException"
+ type="javax.xml.datatype.DatatypeConfigurationException"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="message" type="java.lang.String">
+</parameter>
+</constructor>
+<constructor name="DatatypeConfigurationException"
+ type="javax.xml.datatype.DatatypeConfigurationException"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="message" type="java.lang.String">
+</parameter>
+<parameter name="cause" type="java.lang.Throwable">
+</parameter>
+</constructor>
+<constructor name="DatatypeConfigurationException"
+ type="javax.xml.datatype.DatatypeConfigurationException"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="cause" type="java.lang.Throwable">
+</parameter>
+</constructor>
+</class>
+<class name="DatatypeConstants"
+ extends="java.lang.Object"
+ abstract="false"
+ static="false"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<field name="APRIL"
+ type="int"
+ transient="false"
+ volatile="false"
+ value="4"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
+<field name="AUGUST"
+ type="int"
+ transient="false"
+ volatile="false"
+ value="8"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
+<field name="DATE"
+ type="javax.xml.namespace.QName"
+ transient="false"
+ volatile="false"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
+<field name="DATETIME"
+ type="javax.xml.namespace.QName"
+ transient="false"
+ volatile="false"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
+<field name="DAYS"
+ type="javax.xml.datatype.DatatypeConstants.Field"
+ transient="false"
+ volatile="false"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
+<field name="DECEMBER"
+ type="int"
+ transient="false"
+ volatile="false"
+ value="12"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
+<field name="DURATION"
+ type="javax.xml.namespace.QName"
+ transient="false"
+ volatile="false"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
+<field name="DURATION_DAYTIME"
+ type="javax.xml.namespace.QName"
+ transient="false"
+ volatile="false"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
+<field name="DURATION_YEARMONTH"
+ type="javax.xml.namespace.QName"
+ transient="false"
+ volatile="false"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
+<field name="EQUAL"
+ type="int"
+ transient="false"
+ volatile="false"
+ value="0"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
+<field name="FEBRUARY"
+ type="int"
+ transient="false"
+ volatile="false"
+ value="2"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
+<field name="FIELD_UNDEFINED"
+ type="int"
+ transient="false"
+ volatile="false"
+ value="-2147483648"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
+<field name="GDAY"
+ type="javax.xml.namespace.QName"
+ transient="false"
+ volatile="false"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
+<field name="GMONTH"
+ type="javax.xml.namespace.QName"
+ transient="false"
+ volatile="false"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
+<field name="GMONTHDAY"
+ type="javax.xml.namespace.QName"
+ transient="false"
+ volatile="false"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
+<field name="GREATER"
+ type="int"
+ transient="false"
+ volatile="false"
+ value="1"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
+<field name="GYEAR"
+ type="javax.xml.namespace.QName"
+ transient="false"
+ volatile="false"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
+<field name="GYEARMONTH"
+ type="javax.xml.namespace.QName"
+ transient="false"
+ volatile="false"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
+<field name="HOURS"
+ type="javax.xml.datatype.DatatypeConstants.Field"
+ transient="false"
+ volatile="false"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
+<field name="INDETERMINATE"
+ type="int"
+ transient="false"
+ volatile="false"
+ value="2"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
+<field name="JANUARY"
+ type="int"
+ transient="false"
+ volatile="false"
+ value="1"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
+<field name="JULY"
+ type="int"
+ transient="false"
+ volatile="false"
+ value="7"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
+<field name="JUNE"
+ type="int"
+ transient="false"
+ volatile="false"
+ value="6"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
+<field name="LESSER"
+ type="int"
+ transient="false"
+ volatile="false"
+ value="-1"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
+<field name="MARCH"
+ type="int"
+ transient="false"
+ volatile="false"
+ value="3"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
+<field name="MAX_TIMEZONE_OFFSET"
+ type="int"
+ transient="false"
+ volatile="false"
+ value="-840"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
+<field name="MAY"
+ type="int"
+ transient="false"
+ volatile="false"
+ value="5"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
+<field name="MINUTES"
+ type="javax.xml.datatype.DatatypeConstants.Field"
+ transient="false"
+ volatile="false"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
+<field name="MIN_TIMEZONE_OFFSET"
+ type="int"
+ transient="false"
+ volatile="false"
+ value="840"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
+<field name="MONTHS"
+ type="javax.xml.datatype.DatatypeConstants.Field"
+ transient="false"
+ volatile="false"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
+<field name="NOVEMBER"
+ type="int"
+ transient="false"
+ volatile="false"
+ value="11"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
+<field name="OCTOBER"
+ type="int"
+ transient="false"
+ volatile="false"
+ value="10"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
+<field name="SECONDS"
+ type="javax.xml.datatype.DatatypeConstants.Field"
+ transient="false"
+ volatile="false"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
+<field name="SEPTEMBER"
+ type="int"
+ transient="false"
+ volatile="false"
+ value="9"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
+<field name="TIME"
+ type="javax.xml.namespace.QName"
+ transient="false"
+ volatile="false"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
+<field name="YEARS"
+ type="javax.xml.datatype.DatatypeConstants.Field"
+ transient="false"
+ volatile="false"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
+</class>
+<class name="DatatypeConstants.Field"
+ extends="java.lang.Object"
+ abstract="false"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<method name="getId"
+ return="int"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
+</class>
+<class name="DatatypeFactory"
+ extends="java.lang.Object"
+ abstract="true"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<constructor name="DatatypeFactory"
+ type="javax.xml.datatype.DatatypeFactory"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="protected"
+>
+</constructor>
+<method name="newDuration"
+ return="javax.xml.datatype.Duration"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="lexicalRepresentation" type="java.lang.String">
+</parameter>
+</method>
+<method name="newDuration"
+ return="javax.xml.datatype.Duration"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="durationInMilliSeconds" type="long">
+</parameter>
+</method>
+<method name="newDuration"
+ return="javax.xml.datatype.Duration"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="isPositive" type="boolean">
+</parameter>
+<parameter name="years" type="java.math.BigInteger">
+</parameter>
+<parameter name="months" type="java.math.BigInteger">
+</parameter>
+<parameter name="days" type="java.math.BigInteger">
+</parameter>
+<parameter name="hours" type="java.math.BigInteger">
+</parameter>
+<parameter name="minutes" type="java.math.BigInteger">
+</parameter>
+<parameter name="seconds" type="java.math.BigDecimal">
+</parameter>
+</method>
+<method name="newDuration"
+ return="javax.xml.datatype.Duration"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="isPositive" type="boolean">
+</parameter>
+<parameter name="years" type="int">
+</parameter>
+<parameter name="months" type="int">
+</parameter>
+<parameter name="days" type="int">
+</parameter>
+<parameter name="hours" type="int">
+</parameter>
+<parameter name="minutes" type="int">
+</parameter>
+<parameter name="seconds" type="int">
+</parameter>
+</method>
+<method name="newDurationDayTime"
+ return="javax.xml.datatype.Duration"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="lexicalRepresentation" type="java.lang.String">
+</parameter>
+</method>
+<method name="newDurationDayTime"
+ return="javax.xml.datatype.Duration"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="durationInMilliseconds" type="long">
+</parameter>
+</method>
+<method name="newDurationDayTime"
+ return="javax.xml.datatype.Duration"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="isPositive" type="boolean">
+</parameter>
+<parameter name="day" type="java.math.BigInteger">
+</parameter>
+<parameter name="hour" type="java.math.BigInteger">
+</parameter>
+<parameter name="minute" type="java.math.BigInteger">
+</parameter>
+<parameter name="second" type="java.math.BigInteger">
+</parameter>
+</method>
+<method name="newDurationDayTime"
+ return="javax.xml.datatype.Duration"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="isPositive" type="boolean">
+</parameter>
+<parameter name="day" type="int">
+</parameter>
+<parameter name="hour" type="int">
+</parameter>
+<parameter name="minute" type="int">
+</parameter>
+<parameter name="second" type="int">
+</parameter>
+</method>
+<method name="newDurationYearMonth"
+ return="javax.xml.datatype.Duration"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="lexicalRepresentation" type="java.lang.String">
+</parameter>
+</method>
+<method name="newDurationYearMonth"
+ return="javax.xml.datatype.Duration"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="durationInMilliseconds" type="long">
+</parameter>
+</method>
+<method name="newDurationYearMonth"
+ return="javax.xml.datatype.Duration"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="isPositive" type="boolean">
+</parameter>
+<parameter name="year" type="java.math.BigInteger">
+</parameter>
+<parameter name="month" type="java.math.BigInteger">
+</parameter>
+</method>
+<method name="newDurationYearMonth"
+ return="javax.xml.datatype.Duration"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="isPositive" type="boolean">
+</parameter>
+<parameter name="year" type="int">
+</parameter>
+<parameter name="month" type="int">
+</parameter>
+</method>
+<method name="newInstance"
+ return="javax.xml.datatype.DatatypeFactory"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="true"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<exception name="DatatypeConfigurationException" type="javax.xml.datatype.DatatypeConfigurationException">
+</exception>
+</method>
+<method name="newXMLGregorianCalendar"
+ return="javax.xml.datatype.XMLGregorianCalendar"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
+<method name="newXMLGregorianCalendar"
+ return="javax.xml.datatype.XMLGregorianCalendar"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="lexicalRepresentation" type="java.lang.String">
+</parameter>
+</method>
+<method name="newXMLGregorianCalendar"
+ return="javax.xml.datatype.XMLGregorianCalendar"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="cal" type="java.util.GregorianCalendar">
+</parameter>
+</method>
+<method name="newXMLGregorianCalendar"
+ return="javax.xml.datatype.XMLGregorianCalendar"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="year" type="java.math.BigInteger">
+</parameter>
+<parameter name="month" type="int">
+</parameter>
+<parameter name="day" type="int">
+</parameter>
+<parameter name="hour" type="int">
+</parameter>
+<parameter name="minute" type="int">
+</parameter>
+<parameter name="second" type="int">
+</parameter>
+<parameter name="fractionalSecond" type="java.math.BigDecimal">
+</parameter>
+<parameter name="timezone" type="int">
+</parameter>
+</method>
+<method name="newXMLGregorianCalendar"
+ return="javax.xml.datatype.XMLGregorianCalendar"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="year" type="int">
+</parameter>
+<parameter name="month" type="int">
+</parameter>
+<parameter name="day" type="int">
+</parameter>
+<parameter name="hour" type="int">
+</parameter>
+<parameter name="minute" type="int">
+</parameter>
+<parameter name="second" type="int">
+</parameter>
+<parameter name="millisecond" type="int">
+</parameter>
+<parameter name="timezone" type="int">
+</parameter>
+</method>
+<method name="newXMLGregorianCalendarDate"
+ return="javax.xml.datatype.XMLGregorianCalendar"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="year" type="int">
+</parameter>
+<parameter name="month" type="int">
+</parameter>
+<parameter name="day" type="int">
+</parameter>
+<parameter name="timezone" type="int">
+</parameter>
+</method>
+<method name="newXMLGregorianCalendarTime"
+ return="javax.xml.datatype.XMLGregorianCalendar"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="hours" type="int">
+</parameter>
+<parameter name="minutes" type="int">
+</parameter>
+<parameter name="seconds" type="int">
+</parameter>
+<parameter name="timezone" type="int">
+</parameter>
+</method>
+<method name="newXMLGregorianCalendarTime"
+ return="javax.xml.datatype.XMLGregorianCalendar"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="hours" type="int">
+</parameter>
+<parameter name="minutes" type="int">
+</parameter>
+<parameter name="seconds" type="int">
+</parameter>
+<parameter name="fractionalSecond" type="java.math.BigDecimal">
+</parameter>
+<parameter name="timezone" type="int">
+</parameter>
+</method>
+<method name="newXMLGregorianCalendarTime"
+ return="javax.xml.datatype.XMLGregorianCalendar"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="hours" type="int">
+</parameter>
+<parameter name="minutes" type="int">
+</parameter>
+<parameter name="seconds" type="int">
+</parameter>
+<parameter name="milliseconds" type="int">
+</parameter>
+<parameter name="timezone" type="int">
+</parameter>
+</method>
+<field name="DATATYPEFACTORY_IMPLEMENTATION_CLASS"
+ type="java.lang.String"
+ transient="false"
+ volatile="false"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
+<field name="DATATYPEFACTORY_PROPERTY"
+ type="java.lang.String"
+ transient="false"
+ volatile="false"
+ value="&quot;javax.xml.datatype.DatatypeFactory&quot;"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
+</class>
+<class name="Duration"
+ extends="java.lang.Object"
+ abstract="true"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<constructor name="Duration"
+ type="javax.xml.datatype.Duration"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</constructor>
+<method name="add"
+ return="javax.xml.datatype.Duration"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="rhs" type="javax.xml.datatype.Duration">
+</parameter>
+</method>
+<method name="addTo"
+ return="void"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="calendar" type="java.util.Calendar">
+</parameter>
+</method>
+<method name="addTo"
+ return="void"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="date" type="java.util.Date">
+</parameter>
+</method>
+<method name="compare"
+ return="int"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="duration" type="javax.xml.datatype.Duration">
+</parameter>
+</method>
+<method name="getDays"
+ return="int"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
+<method name="getField"
+ return="java.lang.Number"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="field" type="javax.xml.datatype.DatatypeConstants.Field">
+</parameter>
+</method>
+<method name="getHours"
+ return="int"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
+<method name="getMinutes"
+ return="int"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
+<method name="getMonths"
+ return="int"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
+<method name="getSeconds"
+ return="int"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
+<method name="getSign"
+ return="int"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
+<method name="getTimeInMillis"
+ return="long"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="startInstant" type="java.util.Calendar">
+</parameter>
+</method>
+<method name="getTimeInMillis"
+ return="long"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="startInstant" type="java.util.Date">
+</parameter>
+</method>
+<method name="getXMLSchemaType"
+ return="javax.xml.namespace.QName"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
+<method name="getYears"
+ return="int"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
+<method name="hashCode"
+ return="int"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
+<method name="isLongerThan"
+ return="boolean"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="duration" type="javax.xml.datatype.Duration">
+</parameter>
+</method>
+<method name="isSet"
+ return="boolean"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="field" type="javax.xml.datatype.DatatypeConstants.Field">
+</parameter>
+</method>
+<method name="isShorterThan"
+ return="boolean"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="duration" type="javax.xml.datatype.Duration">
+</parameter>
+</method>
+<method name="multiply"
+ return="javax.xml.datatype.Duration"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="factor" type="int">
+</parameter>
+</method>
+<method name="multiply"
+ return="javax.xml.datatype.Duration"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="factor" type="java.math.BigDecimal">
+</parameter>
+</method>
+<method name="negate"
+ return="javax.xml.datatype.Duration"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
+<method name="normalizeWith"
+ return="javax.xml.datatype.Duration"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="startTimeInstant" type="java.util.Calendar">
+</parameter>
+</method>
+<method name="subtract"
+ return="javax.xml.datatype.Duration"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="rhs" type="javax.xml.datatype.Duration">
+</parameter>
+</method>
+</class>
+<class name="XMLGregorianCalendar"
+ extends="java.lang.Object"
+ abstract="true"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<implements name="java.lang.Cloneable">
+</implements>
+<constructor name="XMLGregorianCalendar"
+ type="javax.xml.datatype.XMLGregorianCalendar"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</constructor>
+<method name="add"
+ return="void"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="duration" type="javax.xml.datatype.Duration">
+</parameter>
+</method>
+<method name="clear"
+ return="void"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
+<method name="clone"
+ return="java.lang.Object"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
+<method name="compare"
+ return="int"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="xmlGregorianCalendar" type="javax.xml.datatype.XMLGregorianCalendar">
+</parameter>
+</method>
+<method name="getDay"
+ return="int"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
+<method name="getEon"
+ return="java.math.BigInteger"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
+<method name="getEonAndYear"
+ return="java.math.BigInteger"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
+<method name="getFractionalSecond"
+ return="java.math.BigDecimal"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
+<method name="getHour"
+ return="int"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
+<method name="getMillisecond"
+ return="int"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
+<method name="getMinute"
+ return="int"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
+<method name="getMonth"
+ return="int"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
+<method name="getSecond"
+ return="int"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
+<method name="getTimeZone"
+ return="java.util.TimeZone"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="defaultZoneoffset" type="int">
+</parameter>
+</method>
+<method name="getTimezone"
+ return="int"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
+<method name="getXMLSchemaType"
+ return="javax.xml.namespace.QName"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
+<method name="getYear"
+ return="int"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
+<method name="isValid"
+ return="boolean"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
+<method name="normalize"
+ return="javax.xml.datatype.XMLGregorianCalendar"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
+<method name="reset"
+ return="void"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
+<method name="setDay"
+ return="void"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="day" type="int">
+</parameter>
+</method>
+<method name="setFractionalSecond"
+ return="void"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="fractional" type="java.math.BigDecimal">
+</parameter>
+</method>
+<method name="setHour"
+ return="void"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="hour" type="int">
+</parameter>
+</method>
+<method name="setMillisecond"
+ return="void"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="millisecond" type="int">
+</parameter>
+</method>
+<method name="setMinute"
+ return="void"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="minute" type="int">
+</parameter>
+</method>
+<method name="setMonth"
+ return="void"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="month" type="int">
+</parameter>
+</method>
+<method name="setSecond"
+ return="void"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="second" type="int">
+</parameter>
+</method>
+<method name="setTime"
+ return="void"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="hour" type="int">
+</parameter>
+<parameter name="minute" type="int">
+</parameter>
+<parameter name="second" type="int">
+</parameter>
+</method>
+<method name="setTime"
+ return="void"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="hour" type="int">
+</parameter>
+<parameter name="minute" type="int">
+</parameter>
+<parameter name="second" type="int">
+</parameter>
+<parameter name="fractional" type="java.math.BigDecimal">
+</parameter>
+</method>
+<method name="setTime"
+ return="void"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="hour" type="int">
+</parameter>
+<parameter name="minute" type="int">
+</parameter>
+<parameter name="second" type="int">
+</parameter>
+<parameter name="millisecond" type="int">
+</parameter>
+</method>
+<method name="setTimezone"
+ return="void"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="offset" type="int">
+</parameter>
+</method>
+<method name="setYear"
+ return="void"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="year" type="java.math.BigInteger">
+</parameter>
+</method>
+<method name="setYear"
+ return="void"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="year" type="int">
+</parameter>
+</method>
+<method name="toGregorianCalendar"
+ return="java.util.GregorianCalendar"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
+<method name="toGregorianCalendar"
+ return="java.util.GregorianCalendar"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="timezone" type="java.util.TimeZone">
+</parameter>
+<parameter name="aLocale" type="java.util.Locale">
+</parameter>
+<parameter name="defaults" type="javax.xml.datatype.XMLGregorianCalendar">
+</parameter>
+</method>
+<method name="toXMLFormat"
+ return="java.lang.String"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
+</class>
+</package>
+<package name="javax.xml.namespace"
+>
+<interface name="NamespaceContext"
+ abstract="true"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<method name="getNamespaceURI"
+ return="java.lang.String"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="prefix" type="java.lang.String">
+</parameter>
+</method>
+<method name="getPrefix"
+ return="java.lang.String"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="namespaceURI" type="java.lang.String">
+</parameter>
+</method>
+<method name="getPrefixes"
+ return="java.util.Iterator"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="namespaceURI" type="java.lang.String">
+</parameter>
+</method>
+</interface>
+<class name="QName"
+ extends="java.lang.Object"
+ abstract="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<implements name="java.io.Serializable">
+</implements>
+<constructor name="QName"
+ type="javax.xml.namespace.QName"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="namespaceURI" type="java.lang.String">
+</parameter>
+<parameter name="localPart" type="java.lang.String">
+</parameter>
+</constructor>
+<constructor name="QName"
+ type="javax.xml.namespace.QName"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="namespaceURI" type="java.lang.String">
+</parameter>
+<parameter name="localPart" type="java.lang.String">
+</parameter>
+<parameter name="prefix" type="java.lang.String">
+</parameter>
+</constructor>
+<constructor name="QName"
+ type="javax.xml.namespace.QName"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="localPart" type="java.lang.String">
+</parameter>
+</constructor>
+<method name="equals"
+ return="boolean"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="objectToTest" type="java.lang.Object">
+</parameter>
+</method>
+<method name="getLocalPart"
+ return="java.lang.String"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
+<method name="getNamespaceURI"
+ return="java.lang.String"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
+<method name="getPrefix"
+ return="java.lang.String"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
+<method name="hashCode"
+ return="int"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
+<method name="valueOf"
+ return="javax.xml.namespace.QName"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="true"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="qNameAsString" type="java.lang.String">
+</parameter>
+</method>
+</class>
+</package>
 <package name="javax.xml.parsers"
 >
 <class name="DocumentBuilder"
@@ -338484,6 +340453,17 @@
  visibility="public"
 >
 </method>
+<method name="getSchema"
+ return="javax.xml.validation.Schema"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
 <method name="isNamespaceAware"
  return="boolean"
  abstract="true"
@@ -338516,8 +340496,6 @@
  deprecated="not deprecated"
  visibility="public"
 >
-<exception name="UnsupportedOperationException" type="java.lang.UnsupportedOperationException">
-</exception>
 </method>
 <method name="newDocument"
  return="org.w3c.dom.Document"
@@ -338540,7 +340518,7 @@
  deprecated="not deprecated"
  visibility="public"
 >
-<parameter name="file" type="java.io.File">
+<parameter name="is" type="java.io.InputStream">
 </parameter>
 <exception name="IOException" type="java.io.IOException">
 </exception>
@@ -338557,24 +340535,7 @@
  deprecated="not deprecated"
  visibility="public"
 >
-<parameter name="stream" type="java.io.InputStream">
-</parameter>
-<exception name="IOException" type="java.io.IOException">
-</exception>
-<exception name="SAXException" type="org.xml.sax.SAXException">
-</exception>
-</method>
-<method name="parse"
- return="org.w3c.dom.Document"
- abstract="false"
- native="false"
- synchronized="false"
- static="false"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
-<parameter name="stream" type="java.io.InputStream">
+<parameter name="is" type="java.io.InputStream">
 </parameter>
 <parameter name="systemId" type="java.lang.String">
 </parameter>
@@ -338593,6 +340554,23 @@
  deprecated="not deprecated"
  visibility="public"
 >
+<parameter name="f" type="java.io.File">
+</parameter>
+<exception name="IOException" type="java.io.IOException">
+</exception>
+<exception name="SAXException" type="org.xml.sax.SAXException">
+</exception>
+</method>
+<method name="parse"
+ return="org.w3c.dom.Document"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
 <parameter name="uri" type="java.lang.String">
 </parameter>
 <exception name="IOException" type="java.io.IOException">
@@ -338610,7 +340588,7 @@
  deprecated="not deprecated"
  visibility="public"
 >
-<parameter name="source" type="org.xml.sax.InputSource">
+<parameter name="is" type="org.xml.sax.InputSource">
 </parameter>
 <exception name="IOException" type="java.io.IOException">
 </exception>
@@ -338638,7 +340616,7 @@
  deprecated="not deprecated"
  visibility="public"
 >
-<parameter name="resolver" type="org.xml.sax.EntityResolver">
+<parameter name="er" type="org.xml.sax.EntityResolver">
 </parameter>
 </method>
 <method name="setErrorHandler"
@@ -338651,7 +340629,7 @@
  deprecated="not deprecated"
  visibility="public"
 >
-<parameter name="handler" type="org.xml.sax.ErrorHandler">
+<parameter name="eh" type="org.xml.sax.ErrorHandler">
 </parameter>
 </method>
 </class>
@@ -338701,6 +340679,17 @@
 <exception name="ParserConfigurationException" type="javax.xml.parsers.ParserConfigurationException">
 </exception>
 </method>
+<method name="getSchema"
+ return="javax.xml.validation.Schema"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
 <method name="isCoalescing"
  return="boolean"
  abstract="false"
@@ -338801,8 +340790,6 @@
  deprecated="not deprecated"
  visibility="public"
 >
-<exception name="FactoryConfigurationError" type="javax.xml.parsers.FactoryConfigurationError">
-</exception>
 </method>
 <method name="setAttribute"
  return="void"
@@ -338831,7 +340818,7 @@
  deprecated="not deprecated"
  visibility="public"
 >
-<parameter name="value" type="boolean">
+<parameter name="coalescing" type="boolean">
 </parameter>
 </method>
 <method name="setExpandEntityReferences"
@@ -338844,7 +340831,7 @@
  deprecated="not deprecated"
  visibility="public"
 >
-<parameter name="value" type="boolean">
+<parameter name="expandEntityRef" type="boolean">
 </parameter>
 </method>
 <method name="setFeature"
@@ -338874,7 +340861,7 @@
  deprecated="not deprecated"
  visibility="public"
 >
-<parameter name="value" type="boolean">
+<parameter name="ignoreComments" type="boolean">
 </parameter>
 </method>
 <method name="setIgnoringElementContentWhitespace"
@@ -338887,7 +340874,7 @@
  deprecated="not deprecated"
  visibility="public"
 >
-<parameter name="value" type="boolean">
+<parameter name="whitespace" type="boolean">
 </parameter>
 </method>
 <method name="setNamespaceAware"
@@ -338900,7 +340887,20 @@
  deprecated="not deprecated"
  visibility="public"
 >
-<parameter name="value" type="boolean">
+<parameter name="awareness" type="boolean">
+</parameter>
+</method>
+<method name="setSchema"
+ return="void"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="schema" type="javax.xml.validation.Schema">
 </parameter>
 </method>
 <method name="setValidating"
@@ -338913,7 +340913,7 @@
  deprecated="not deprecated"
  visibility="public"
 >
-<parameter name="value" type="boolean">
+<parameter name="validating" type="boolean">
 </parameter>
 </method>
 <method name="setXIncludeAware"
@@ -338926,7 +340926,7 @@
  deprecated="not deprecated"
  visibility="public"
 >
-<parameter name="value" type="boolean">
+<parameter name="state" type="boolean">
 </parameter>
 </method>
 </class>
@@ -338953,7 +340953,7 @@
  deprecated="not deprecated"
  visibility="public"
 >
-<parameter name="cause" type="java.lang.Exception">
+<parameter name="msg" type="java.lang.String">
 </parameter>
 </constructor>
 <constructor name="FactoryConfigurationError"
@@ -338963,9 +340963,7 @@
  deprecated="not deprecated"
  visibility="public"
 >
-<parameter name="cause" type="java.lang.Exception">
-</parameter>
-<parameter name="message" type="java.lang.String">
+<parameter name="e" type="java.lang.Exception">
 </parameter>
 </constructor>
 <constructor name="FactoryConfigurationError"
@@ -338975,7 +340973,9 @@
  deprecated="not deprecated"
  visibility="public"
 >
-<parameter name="message" type="java.lang.String">
+<parameter name="e" type="java.lang.Exception">
+</parameter>
+<parameter name="msg" type="java.lang.String">
 </parameter>
 </constructor>
 <method name="getException"
@@ -339063,6 +341063,17 @@
 <exception name="SAXNotSupportedException" type="org.xml.sax.SAXNotSupportedException">
 </exception>
 </method>
+<method name="getSchema"
+ return="javax.xml.validation.Schema"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
 <method name="getXMLReader"
  return="org.xml.sax.XMLReader"
  abstract="true"
@@ -339108,8 +341119,6 @@
  deprecated="not deprecated"
  visibility="public"
 >
-<exception name="UnsupportedOperationException" type="java.lang.UnsupportedOperationException">
-</exception>
 </method>
 <method name="parse"
  return="void"
@@ -339121,9 +341130,9 @@
  deprecated="not deprecated"
  visibility="public"
 >
-<parameter name="file" type="java.io.File">
+<parameter name="is" type="java.io.InputStream">
 </parameter>
-<parameter name="handler" type="org.xml.sax.HandlerBase">
+<parameter name="hb" type="org.xml.sax.HandlerBase">
 </parameter>
 <exception name="IOException" type="java.io.IOException">
 </exception>
@@ -339140,47 +341149,9 @@
  deprecated="not deprecated"
  visibility="public"
 >
-<parameter name="file" type="java.io.File">
+<parameter name="is" type="java.io.InputStream">
 </parameter>
-<parameter name="handler" type="org.xml.sax.helpers.DefaultHandler">
-</parameter>
-<exception name="IOException" type="java.io.IOException">
-</exception>
-<exception name="SAXException" type="org.xml.sax.SAXException">
-</exception>
-</method>
-<method name="parse"
- return="void"
- abstract="false"
- native="false"
- synchronized="false"
- static="false"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
-<parameter name="stream" type="java.io.InputStream">
-</parameter>
-<parameter name="handler" type="org.xml.sax.HandlerBase">
-</parameter>
-<exception name="IOException" type="java.io.IOException">
-</exception>
-<exception name="SAXException" type="org.xml.sax.SAXException">
-</exception>
-</method>
-<method name="parse"
- return="void"
- abstract="false"
- native="false"
- synchronized="false"
- static="false"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
-<parameter name="stream" type="java.io.InputStream">
-</parameter>
-<parameter name="handler" type="org.xml.sax.HandlerBase">
+<parameter name="hb" type="org.xml.sax.HandlerBase">
 </parameter>
 <parameter name="systemId" type="java.lang.String">
 </parameter>
@@ -339199,9 +341170,9 @@
  deprecated="not deprecated"
  visibility="public"
 >
-<parameter name="stream" type="java.io.InputStream">
+<parameter name="is" type="java.io.InputStream">
 </parameter>
-<parameter name="handler" type="org.xml.sax.helpers.DefaultHandler">
+<parameter name="dh" type="org.xml.sax.helpers.DefaultHandler">
 </parameter>
 <exception name="IOException" type="java.io.IOException">
 </exception>
@@ -339218,9 +341189,9 @@
  deprecated="not deprecated"
  visibility="public"
 >
-<parameter name="stream" type="java.io.InputStream">
+<parameter name="is" type="java.io.InputStream">
 </parameter>
-<parameter name="handler" type="org.xml.sax.helpers.DefaultHandler">
+<parameter name="dh" type="org.xml.sax.helpers.DefaultHandler">
 </parameter>
 <parameter name="systemId" type="java.lang.String">
 </parameter>
@@ -339241,7 +341212,7 @@
 >
 <parameter name="uri" type="java.lang.String">
 </parameter>
-<parameter name="handler" type="org.xml.sax.HandlerBase">
+<parameter name="hb" type="org.xml.sax.HandlerBase">
 </parameter>
 <exception name="IOException" type="java.io.IOException">
 </exception>
@@ -339260,7 +341231,7 @@
 >
 <parameter name="uri" type="java.lang.String">
 </parameter>
-<parameter name="handler" type="org.xml.sax.helpers.DefaultHandler">
+<parameter name="dh" type="org.xml.sax.helpers.DefaultHandler">
 </parameter>
 <exception name="IOException" type="java.io.IOException">
 </exception>
@@ -339277,9 +341248,9 @@
  deprecated="not deprecated"
  visibility="public"
 >
-<parameter name="source" type="org.xml.sax.InputSource">
+<parameter name="f" type="java.io.File">
 </parameter>
-<parameter name="handler" type="org.xml.sax.HandlerBase">
+<parameter name="hb" type="org.xml.sax.HandlerBase">
 </parameter>
 <exception name="IOException" type="java.io.IOException">
 </exception>
@@ -339296,9 +341267,47 @@
  deprecated="not deprecated"
  visibility="public"
 >
-<parameter name="source" type="org.xml.sax.InputSource">
+<parameter name="f" type="java.io.File">
 </parameter>
-<parameter name="handler" type="org.xml.sax.helpers.DefaultHandler">
+<parameter name="dh" type="org.xml.sax.helpers.DefaultHandler">
+</parameter>
+<exception name="IOException" type="java.io.IOException">
+</exception>
+<exception name="SAXException" type="org.xml.sax.SAXException">
+</exception>
+</method>
+<method name="parse"
+ return="void"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="is" type="org.xml.sax.InputSource">
+</parameter>
+<parameter name="hb" type="org.xml.sax.HandlerBase">
+</parameter>
+<exception name="IOException" type="java.io.IOException">
+</exception>
+<exception name="SAXException" type="org.xml.sax.SAXException">
+</exception>
+</method>
+<method name="parse"
+ return="void"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="is" type="org.xml.sax.InputSource">
+</parameter>
+<parameter name="dh" type="org.xml.sax.helpers.DefaultHandler">
 </parameter>
 <exception name="IOException" type="java.io.IOException">
 </exception>
@@ -339371,6 +341380,17 @@
 <exception name="SAXNotSupportedException" type="org.xml.sax.SAXNotSupportedException">
 </exception>
 </method>
+<method name="getSchema"
+ return="javax.xml.validation.Schema"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
 <method name="isNamespaceAware"
  return="boolean"
  abstract="false"
@@ -339414,8 +341434,6 @@
  deprecated="not deprecated"
  visibility="public"
 >
-<exception name="FactoryConfigurationError" type="javax.xml.parsers.FactoryConfigurationError">
-</exception>
 </method>
 <method name="newSAXParser"
  return="javax.xml.parsers.SAXParser"
@@ -339463,7 +341481,20 @@
  deprecated="not deprecated"
  visibility="public"
 >
-<parameter name="value" type="boolean">
+<parameter name="awareness" type="boolean">
+</parameter>
+</method>
+<method name="setSchema"
+ return="void"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="schema" type="javax.xml.validation.Schema">
 </parameter>
 </method>
 <method name="setValidating"
@@ -339476,7 +341507,7 @@
  deprecated="not deprecated"
  visibility="public"
 >
-<parameter name="value" type="boolean">
+<parameter name="validating" type="boolean">
 </parameter>
 </method>
 <method name="setXIncludeAware"
@@ -339489,11 +341520,3556 @@
  deprecated="not deprecated"
  visibility="public"
 >
-<parameter name="value" type="boolean">
+<parameter name="state" type="boolean">
 </parameter>
 </method>
 </class>
 </package>
+<package name="javax.xml.transform"
+>
+<interface name="ErrorListener"
+ abstract="true"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<method name="error"
+ return="void"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="exception" type="javax.xml.transform.TransformerException">
+</parameter>
+<exception name="TransformerException" type="javax.xml.transform.TransformerException">
+</exception>
+</method>
+<method name="fatalError"
+ return="void"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="exception" type="javax.xml.transform.TransformerException">
+</parameter>
+<exception name="TransformerException" type="javax.xml.transform.TransformerException">
+</exception>
+</method>
+<method name="warning"
+ return="void"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="exception" type="javax.xml.transform.TransformerException">
+</parameter>
+<exception name="TransformerException" type="javax.xml.transform.TransformerException">
+</exception>
+</method>
+</interface>
+<class name="OutputKeys"
+ extends="java.lang.Object"
+ abstract="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<field name="CDATA_SECTION_ELEMENTS"
+ type="java.lang.String"
+ transient="false"
+ volatile="false"
+ value="&quot;cdata-section-elements&quot;"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
+<field name="DOCTYPE_PUBLIC"
+ type="java.lang.String"
+ transient="false"
+ volatile="false"
+ value="&quot;doctype-public&quot;"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
+<field name="DOCTYPE_SYSTEM"
+ type="java.lang.String"
+ transient="false"
+ volatile="false"
+ value="&quot;doctype-system&quot;"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
+<field name="ENCODING"
+ type="java.lang.String"
+ transient="false"
+ volatile="false"
+ value="&quot;encoding&quot;"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
+<field name="INDENT"
+ type="java.lang.String"
+ transient="false"
+ volatile="false"
+ value="&quot;indent&quot;"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
+<field name="MEDIA_TYPE"
+ type="java.lang.String"
+ transient="false"
+ volatile="false"
+ value="&quot;media-type&quot;"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
+<field name="METHOD"
+ type="java.lang.String"
+ transient="false"
+ volatile="false"
+ value="&quot;method&quot;"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
+<field name="OMIT_XML_DECLARATION"
+ type="java.lang.String"
+ transient="false"
+ volatile="false"
+ value="&quot;omit-xml-declaration&quot;"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
+<field name="STANDALONE"
+ type="java.lang.String"
+ transient="false"
+ volatile="false"
+ value="&quot;standalone&quot;"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
+<field name="VERSION"
+ type="java.lang.String"
+ transient="false"
+ volatile="false"
+ value="&quot;version&quot;"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
+</class>
+<interface name="Result"
+ abstract="true"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<method name="getSystemId"
+ return="java.lang.String"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
+<method name="setSystemId"
+ return="void"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="systemId" type="java.lang.String">
+</parameter>
+</method>
+<field name="PI_DISABLE_OUTPUT_ESCAPING"
+ type="java.lang.String"
+ transient="false"
+ volatile="false"
+ value="&quot;javax.xml.transform.disable-output-escaping&quot;"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
+<field name="PI_ENABLE_OUTPUT_ESCAPING"
+ type="java.lang.String"
+ transient="false"
+ volatile="false"
+ value="&quot;javax.xml.transform.enable-output-escaping&quot;"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
+</interface>
+<interface name="Source"
+ abstract="true"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<method name="getSystemId"
+ return="java.lang.String"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
+<method name="setSystemId"
+ return="void"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="systemId" type="java.lang.String">
+</parameter>
+</method>
+</interface>
+<interface name="SourceLocator"
+ abstract="true"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<method name="getColumnNumber"
+ return="int"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
+<method name="getLineNumber"
+ return="int"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
+<method name="getPublicId"
+ return="java.lang.String"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
+<method name="getSystemId"
+ return="java.lang.String"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
+</interface>
+<interface name="Templates"
+ abstract="true"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<method name="getOutputProperties"
+ return="java.util.Properties"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
+<method name="newTransformer"
+ return="javax.xml.transform.Transformer"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<exception name="TransformerConfigurationException" type="javax.xml.transform.TransformerConfigurationException">
+</exception>
+</method>
+</interface>
+<class name="Transformer"
+ extends="java.lang.Object"
+ abstract="true"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<constructor name="Transformer"
+ type="javax.xml.transform.Transformer"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="protected"
+>
+</constructor>
+<method name="clearParameters"
+ return="void"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
+<method name="getErrorListener"
+ return="javax.xml.transform.ErrorListener"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
+<method name="getOutputProperties"
+ return="java.util.Properties"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
+<method name="getOutputProperty"
+ return="java.lang.String"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="name" type="java.lang.String">
+</parameter>
+<exception name="IllegalArgumentException" type="java.lang.IllegalArgumentException">
+</exception>
+</method>
+<method name="getParameter"
+ return="java.lang.Object"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="name" type="java.lang.String">
+</parameter>
+</method>
+<method name="getURIResolver"
+ return="javax.xml.transform.URIResolver"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
+<method name="reset"
+ return="void"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
+<method name="setErrorListener"
+ return="void"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="listener" type="javax.xml.transform.ErrorListener">
+</parameter>
+<exception name="IllegalArgumentException" type="java.lang.IllegalArgumentException">
+</exception>
+</method>
+<method name="setOutputProperties"
+ return="void"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="oformat" type="java.util.Properties">
+</parameter>
+</method>
+<method name="setOutputProperty"
+ return="void"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="name" type="java.lang.String">
+</parameter>
+<parameter name="value" type="java.lang.String">
+</parameter>
+<exception name="IllegalArgumentException" type="java.lang.IllegalArgumentException">
+</exception>
+</method>
+<method name="setParameter"
+ return="void"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="name" type="java.lang.String">
+</parameter>
+<parameter name="value" type="java.lang.Object">
+</parameter>
+</method>
+<method name="setURIResolver"
+ return="void"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="resolver" type="javax.xml.transform.URIResolver">
+</parameter>
+</method>
+<method name="transform"
+ return="void"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="xmlSource" type="javax.xml.transform.Source">
+</parameter>
+<parameter name="outputTarget" type="javax.xml.transform.Result">
+</parameter>
+<exception name="TransformerException" type="javax.xml.transform.TransformerException">
+</exception>
+</method>
+</class>
+<class name="TransformerConfigurationException"
+ extends="javax.xml.transform.TransformerException"
+ abstract="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<constructor name="TransformerConfigurationException"
+ type="javax.xml.transform.TransformerConfigurationException"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</constructor>
+<constructor name="TransformerConfigurationException"
+ type="javax.xml.transform.TransformerConfigurationException"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="msg" type="java.lang.String">
+</parameter>
+</constructor>
+<constructor name="TransformerConfigurationException"
+ type="javax.xml.transform.TransformerConfigurationException"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="e" type="java.lang.Throwable">
+</parameter>
+</constructor>
+<constructor name="TransformerConfigurationException"
+ type="javax.xml.transform.TransformerConfigurationException"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="msg" type="java.lang.String">
+</parameter>
+<parameter name="e" type="java.lang.Throwable">
+</parameter>
+</constructor>
+<constructor name="TransformerConfigurationException"
+ type="javax.xml.transform.TransformerConfigurationException"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="message" type="java.lang.String">
+</parameter>
+<parameter name="locator" type="javax.xml.transform.SourceLocator">
+</parameter>
+</constructor>
+<constructor name="TransformerConfigurationException"
+ type="javax.xml.transform.TransformerConfigurationException"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="message" type="java.lang.String">
+</parameter>
+<parameter name="locator" type="javax.xml.transform.SourceLocator">
+</parameter>
+<parameter name="e" type="java.lang.Throwable">
+</parameter>
+</constructor>
+</class>
+<class name="TransformerException"
+ extends="java.lang.Exception"
+ abstract="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<constructor name="TransformerException"
+ type="javax.xml.transform.TransformerException"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="message" type="java.lang.String">
+</parameter>
+</constructor>
+<constructor name="TransformerException"
+ type="javax.xml.transform.TransformerException"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="e" type="java.lang.Throwable">
+</parameter>
+</constructor>
+<constructor name="TransformerException"
+ type="javax.xml.transform.TransformerException"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="message" type="java.lang.String">
+</parameter>
+<parameter name="e" type="java.lang.Throwable">
+</parameter>
+</constructor>
+<constructor name="TransformerException"
+ type="javax.xml.transform.TransformerException"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="message" type="java.lang.String">
+</parameter>
+<parameter name="locator" type="javax.xml.transform.SourceLocator">
+</parameter>
+</constructor>
+<constructor name="TransformerException"
+ type="javax.xml.transform.TransformerException"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="message" type="java.lang.String">
+</parameter>
+<parameter name="locator" type="javax.xml.transform.SourceLocator">
+</parameter>
+<parameter name="e" type="java.lang.Throwable">
+</parameter>
+</constructor>
+<method name="getException"
+ return="java.lang.Throwable"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
+<method name="getLocationAsString"
+ return="java.lang.String"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
+<method name="getLocator"
+ return="javax.xml.transform.SourceLocator"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
+<method name="getMessageAndLocation"
+ return="java.lang.String"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
+<method name="setLocator"
+ return="void"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="location" type="javax.xml.transform.SourceLocator">
+</parameter>
+</method>
+</class>
+<class name="TransformerFactory"
+ extends="java.lang.Object"
+ abstract="true"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<constructor name="TransformerFactory"
+ type="javax.xml.transform.TransformerFactory"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="protected"
+>
+</constructor>
+<method name="getAssociatedStylesheet"
+ return="javax.xml.transform.Source"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="source" type="javax.xml.transform.Source">
+</parameter>
+<parameter name="media" type="java.lang.String">
+</parameter>
+<parameter name="title" type="java.lang.String">
+</parameter>
+<parameter name="charset" type="java.lang.String">
+</parameter>
+<exception name="TransformerConfigurationException" type="javax.xml.transform.TransformerConfigurationException">
+</exception>
+</method>
+<method name="getAttribute"
+ return="java.lang.Object"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="name" type="java.lang.String">
+</parameter>
+</method>
+<method name="getErrorListener"
+ return="javax.xml.transform.ErrorListener"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
+<method name="getFeature"
+ return="boolean"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="name" type="java.lang.String">
+</parameter>
+</method>
+<method name="getURIResolver"
+ return="javax.xml.transform.URIResolver"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
+<method name="newInstance"
+ return="javax.xml.transform.TransformerFactory"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="true"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<exception name="TransformerFactoryConfigurationError" type="javax.xml.transform.TransformerFactoryConfigurationError">
+</exception>
+</method>
+<method name="newTemplates"
+ return="javax.xml.transform.Templates"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="source" type="javax.xml.transform.Source">
+</parameter>
+<exception name="TransformerConfigurationException" type="javax.xml.transform.TransformerConfigurationException">
+</exception>
+</method>
+<method name="newTransformer"
+ return="javax.xml.transform.Transformer"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="source" type="javax.xml.transform.Source">
+</parameter>
+<exception name="TransformerConfigurationException" type="javax.xml.transform.TransformerConfigurationException">
+</exception>
+</method>
+<method name="newTransformer"
+ return="javax.xml.transform.Transformer"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<exception name="TransformerConfigurationException" type="javax.xml.transform.TransformerConfigurationException">
+</exception>
+</method>
+<method name="setAttribute"
+ return="void"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="name" type="java.lang.String">
+</parameter>
+<parameter name="value" type="java.lang.Object">
+</parameter>
+</method>
+<method name="setErrorListener"
+ return="void"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="listener" type="javax.xml.transform.ErrorListener">
+</parameter>
+</method>
+<method name="setFeature"
+ return="void"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="name" type="java.lang.String">
+</parameter>
+<parameter name="value" type="boolean">
+</parameter>
+<exception name="TransformerConfigurationException" type="javax.xml.transform.TransformerConfigurationException">
+</exception>
+</method>
+<method name="setURIResolver"
+ return="void"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="resolver" type="javax.xml.transform.URIResolver">
+</parameter>
+</method>
+</class>
+<class name="TransformerFactoryConfigurationError"
+ extends="java.lang.Error"
+ abstract="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<constructor name="TransformerFactoryConfigurationError"
+ type="javax.xml.transform.TransformerFactoryConfigurationError"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</constructor>
+<constructor name="TransformerFactoryConfigurationError"
+ type="javax.xml.transform.TransformerFactoryConfigurationError"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="msg" type="java.lang.String">
+</parameter>
+</constructor>
+<constructor name="TransformerFactoryConfigurationError"
+ type="javax.xml.transform.TransformerFactoryConfigurationError"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="e" type="java.lang.Exception">
+</parameter>
+</constructor>
+<constructor name="TransformerFactoryConfigurationError"
+ type="javax.xml.transform.TransformerFactoryConfigurationError"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="e" type="java.lang.Exception">
+</parameter>
+<parameter name="msg" type="java.lang.String">
+</parameter>
+</constructor>
+<method name="getException"
+ return="java.lang.Exception"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
+</class>
+<interface name="URIResolver"
+ abstract="true"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<method name="resolve"
+ return="javax.xml.transform.Source"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="href" type="java.lang.String">
+</parameter>
+<parameter name="base" type="java.lang.String">
+</parameter>
+<exception name="TransformerException" type="javax.xml.transform.TransformerException">
+</exception>
+</method>
+</interface>
+</package>
+<package name="javax.xml.transform.dom"
+>
+<interface name="DOMLocator"
+ abstract="true"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<implements name="javax.xml.transform.SourceLocator">
+</implements>
+<method name="getOriginatingNode"
+ return="org.w3c.dom.Node"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
+</interface>
+<class name="DOMResult"
+ extends="java.lang.Object"
+ abstract="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<implements name="javax.xml.transform.Result">
+</implements>
+<constructor name="DOMResult"
+ type="javax.xml.transform.dom.DOMResult"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</constructor>
+<constructor name="DOMResult"
+ type="javax.xml.transform.dom.DOMResult"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="node" type="org.w3c.dom.Node">
+</parameter>
+</constructor>
+<constructor name="DOMResult"
+ type="javax.xml.transform.dom.DOMResult"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="node" type="org.w3c.dom.Node">
+</parameter>
+<parameter name="systemId" type="java.lang.String">
+</parameter>
+</constructor>
+<constructor name="DOMResult"
+ type="javax.xml.transform.dom.DOMResult"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="node" type="org.w3c.dom.Node">
+</parameter>
+<parameter name="nextSibling" type="org.w3c.dom.Node">
+</parameter>
+</constructor>
+<constructor name="DOMResult"
+ type="javax.xml.transform.dom.DOMResult"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="node" type="org.w3c.dom.Node">
+</parameter>
+<parameter name="nextSibling" type="org.w3c.dom.Node">
+</parameter>
+<parameter name="systemId" type="java.lang.String">
+</parameter>
+</constructor>
+<method name="getNextSibling"
+ return="org.w3c.dom.Node"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
+<method name="getNode"
+ return="org.w3c.dom.Node"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
+<method name="getSystemId"
+ return="java.lang.String"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
+<method name="setNextSibling"
+ return="void"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="nextSibling" type="org.w3c.dom.Node">
+</parameter>
+</method>
+<method name="setNode"
+ return="void"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="node" type="org.w3c.dom.Node">
+</parameter>
+</method>
+<method name="setSystemId"
+ return="void"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="systemId" type="java.lang.String">
+</parameter>
+</method>
+<field name="FEATURE"
+ type="java.lang.String"
+ transient="false"
+ volatile="false"
+ value="&quot;http://javax.xml.transform.dom.DOMResult/feature&quot;"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
+</class>
+<class name="DOMSource"
+ extends="java.lang.Object"
+ abstract="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<implements name="javax.xml.transform.Source">
+</implements>
+<constructor name="DOMSource"
+ type="javax.xml.transform.dom.DOMSource"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</constructor>
+<constructor name="DOMSource"
+ type="javax.xml.transform.dom.DOMSource"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="n" type="org.w3c.dom.Node">
+</parameter>
+</constructor>
+<constructor name="DOMSource"
+ type="javax.xml.transform.dom.DOMSource"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="node" type="org.w3c.dom.Node">
+</parameter>
+<parameter name="systemID" type="java.lang.String">
+</parameter>
+</constructor>
+<method name="getNode"
+ return="org.w3c.dom.Node"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
+<method name="getSystemId"
+ return="java.lang.String"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
+<method name="setNode"
+ return="void"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="node" type="org.w3c.dom.Node">
+</parameter>
+</method>
+<method name="setSystemId"
+ return="void"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="systemID" type="java.lang.String">
+</parameter>
+</method>
+<field name="FEATURE"
+ type="java.lang.String"
+ transient="false"
+ volatile="false"
+ value="&quot;http://javax.xml.transform.dom.DOMSource/feature&quot;"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
+</class>
+</package>
+<package name="javax.xml.transform.sax"
+>
+<class name="SAXResult"
+ extends="java.lang.Object"
+ abstract="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<implements name="javax.xml.transform.Result">
+</implements>
+<constructor name="SAXResult"
+ type="javax.xml.transform.sax.SAXResult"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</constructor>
+<constructor name="SAXResult"
+ type="javax.xml.transform.sax.SAXResult"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="handler" type="org.xml.sax.ContentHandler">
+</parameter>
+</constructor>
+<method name="getHandler"
+ return="org.xml.sax.ContentHandler"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
+<method name="getLexicalHandler"
+ return="org.xml.sax.ext.LexicalHandler"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
+<method name="getSystemId"
+ return="java.lang.String"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
+<method name="setHandler"
+ return="void"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="handler" type="org.xml.sax.ContentHandler">
+</parameter>
+</method>
+<method name="setLexicalHandler"
+ return="void"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="handler" type="org.xml.sax.ext.LexicalHandler">
+</parameter>
+</method>
+<method name="setSystemId"
+ return="void"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="systemId" type="java.lang.String">
+</parameter>
+</method>
+<field name="FEATURE"
+ type="java.lang.String"
+ transient="false"
+ volatile="false"
+ value="&quot;http://javax.xml.transform.sax.SAXResult/feature&quot;"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
+</class>
+<class name="SAXSource"
+ extends="java.lang.Object"
+ abstract="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<implements name="javax.xml.transform.Source">
+</implements>
+<constructor name="SAXSource"
+ type="javax.xml.transform.sax.SAXSource"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</constructor>
+<constructor name="SAXSource"
+ type="javax.xml.transform.sax.SAXSource"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="reader" type="org.xml.sax.XMLReader">
+</parameter>
+<parameter name="inputSource" type="org.xml.sax.InputSource">
+</parameter>
+</constructor>
+<constructor name="SAXSource"
+ type="javax.xml.transform.sax.SAXSource"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="inputSource" type="org.xml.sax.InputSource">
+</parameter>
+</constructor>
+<method name="getInputSource"
+ return="org.xml.sax.InputSource"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
+<method name="getSystemId"
+ return="java.lang.String"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
+<method name="getXMLReader"
+ return="org.xml.sax.XMLReader"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
+<method name="setInputSource"
+ return="void"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="inputSource" type="org.xml.sax.InputSource">
+</parameter>
+</method>
+<method name="setSystemId"
+ return="void"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="systemId" type="java.lang.String">
+</parameter>
+</method>
+<method name="setXMLReader"
+ return="void"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="reader" type="org.xml.sax.XMLReader">
+</parameter>
+</method>
+<method name="sourceToInputSource"
+ return="org.xml.sax.InputSource"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="true"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="source" type="javax.xml.transform.Source">
+</parameter>
+</method>
+<field name="FEATURE"
+ type="java.lang.String"
+ transient="false"
+ volatile="false"
+ value="&quot;http://javax.xml.transform.sax.SAXSource/feature&quot;"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
+</class>
+<class name="SAXTransformerFactory"
+ extends="javax.xml.transform.TransformerFactory"
+ abstract="true"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<constructor name="SAXTransformerFactory"
+ type="javax.xml.transform.sax.SAXTransformerFactory"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="protected"
+>
+</constructor>
+<method name="newTemplatesHandler"
+ return="javax.xml.transform.sax.TemplatesHandler"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<exception name="TransformerConfigurationException" type="javax.xml.transform.TransformerConfigurationException">
+</exception>
+</method>
+<method name="newTransformerHandler"
+ return="javax.xml.transform.sax.TransformerHandler"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="src" type="javax.xml.transform.Source">
+</parameter>
+<exception name="TransformerConfigurationException" type="javax.xml.transform.TransformerConfigurationException">
+</exception>
+</method>
+<method name="newTransformerHandler"
+ return="javax.xml.transform.sax.TransformerHandler"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="templates" type="javax.xml.transform.Templates">
+</parameter>
+<exception name="TransformerConfigurationException" type="javax.xml.transform.TransformerConfigurationException">
+</exception>
+</method>
+<method name="newTransformerHandler"
+ return="javax.xml.transform.sax.TransformerHandler"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<exception name="TransformerConfigurationException" type="javax.xml.transform.TransformerConfigurationException">
+</exception>
+</method>
+<method name="newXMLFilter"
+ return="org.xml.sax.XMLFilter"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="src" type="javax.xml.transform.Source">
+</parameter>
+<exception name="TransformerConfigurationException" type="javax.xml.transform.TransformerConfigurationException">
+</exception>
+</method>
+<method name="newXMLFilter"
+ return="org.xml.sax.XMLFilter"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="templates" type="javax.xml.transform.Templates">
+</parameter>
+<exception name="TransformerConfigurationException" type="javax.xml.transform.TransformerConfigurationException">
+</exception>
+</method>
+<field name="FEATURE"
+ type="java.lang.String"
+ transient="false"
+ volatile="false"
+ value="&quot;http://javax.xml.transform.sax.SAXTransformerFactory/feature&quot;"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
+<field name="FEATURE_XMLFILTER"
+ type="java.lang.String"
+ transient="false"
+ volatile="false"
+ value="&quot;http://javax.xml.transform.sax.SAXTransformerFactory/feature/xmlfilter&quot;"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
+</class>
+<interface name="TemplatesHandler"
+ abstract="true"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<implements name="org.xml.sax.ContentHandler">
+</implements>
+<method name="getSystemId"
+ return="java.lang.String"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
+<method name="getTemplates"
+ return="javax.xml.transform.Templates"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
+<method name="setSystemId"
+ return="void"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="systemID" type="java.lang.String">
+</parameter>
+</method>
+</interface>
+<interface name="TransformerHandler"
+ abstract="true"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<implements name="org.xml.sax.ContentHandler">
+</implements>
+<implements name="org.xml.sax.DTDHandler">
+</implements>
+<implements name="org.xml.sax.ext.LexicalHandler">
+</implements>
+<method name="getSystemId"
+ return="java.lang.String"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
+<method name="getTransformer"
+ return="javax.xml.transform.Transformer"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
+<method name="setResult"
+ return="void"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="result" type="javax.xml.transform.Result">
+</parameter>
+<exception name="IllegalArgumentException" type="java.lang.IllegalArgumentException">
+</exception>
+</method>
+<method name="setSystemId"
+ return="void"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="systemID" type="java.lang.String">
+</parameter>
+</method>
+</interface>
+</package>
+<package name="javax.xml.transform.stream"
+>
+<class name="StreamResult"
+ extends="java.lang.Object"
+ abstract="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<implements name="javax.xml.transform.Result">
+</implements>
+<constructor name="StreamResult"
+ type="javax.xml.transform.stream.StreamResult"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</constructor>
+<constructor name="StreamResult"
+ type="javax.xml.transform.stream.StreamResult"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="outputStream" type="java.io.OutputStream">
+</parameter>
+</constructor>
+<constructor name="StreamResult"
+ type="javax.xml.transform.stream.StreamResult"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="writer" type="java.io.Writer">
+</parameter>
+</constructor>
+<constructor name="StreamResult"
+ type="javax.xml.transform.stream.StreamResult"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="systemId" type="java.lang.String">
+</parameter>
+</constructor>
+<constructor name="StreamResult"
+ type="javax.xml.transform.stream.StreamResult"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="f" type="java.io.File">
+</parameter>
+</constructor>
+<method name="getOutputStream"
+ return="java.io.OutputStream"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
+<method name="getSystemId"
+ return="java.lang.String"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
+<method name="getWriter"
+ return="java.io.Writer"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
+<method name="setOutputStream"
+ return="void"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="outputStream" type="java.io.OutputStream">
+</parameter>
+</method>
+<method name="setSystemId"
+ return="void"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="systemId" type="java.lang.String">
+</parameter>
+</method>
+<method name="setSystemId"
+ return="void"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="f" type="java.io.File">
+</parameter>
+</method>
+<method name="setWriter"
+ return="void"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="writer" type="java.io.Writer">
+</parameter>
+</method>
+<field name="FEATURE"
+ type="java.lang.String"
+ transient="false"
+ volatile="false"
+ value="&quot;http://javax.xml.transform.stream.StreamResult/feature&quot;"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
+</class>
+<class name="StreamSource"
+ extends="java.lang.Object"
+ abstract="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<implements name="javax.xml.transform.Source">
+</implements>
+<constructor name="StreamSource"
+ type="javax.xml.transform.stream.StreamSource"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</constructor>
+<constructor name="StreamSource"
+ type="javax.xml.transform.stream.StreamSource"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="inputStream" type="java.io.InputStream">
+</parameter>
+</constructor>
+<constructor name="StreamSource"
+ type="javax.xml.transform.stream.StreamSource"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="inputStream" type="java.io.InputStream">
+</parameter>
+<parameter name="systemId" type="java.lang.String">
+</parameter>
+</constructor>
+<constructor name="StreamSource"
+ type="javax.xml.transform.stream.StreamSource"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="reader" type="java.io.Reader">
+</parameter>
+</constructor>
+<constructor name="StreamSource"
+ type="javax.xml.transform.stream.StreamSource"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="reader" type="java.io.Reader">
+</parameter>
+<parameter name="systemId" type="java.lang.String">
+</parameter>
+</constructor>
+<constructor name="StreamSource"
+ type="javax.xml.transform.stream.StreamSource"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="systemId" type="java.lang.String">
+</parameter>
+</constructor>
+<constructor name="StreamSource"
+ type="javax.xml.transform.stream.StreamSource"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="f" type="java.io.File">
+</parameter>
+</constructor>
+<method name="getInputStream"
+ return="java.io.InputStream"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
+<method name="getPublicId"
+ return="java.lang.String"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
+<method name="getReader"
+ return="java.io.Reader"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
+<method name="getSystemId"
+ return="java.lang.String"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
+<method name="setInputStream"
+ return="void"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="inputStream" type="java.io.InputStream">
+</parameter>
+</method>
+<method name="setPublicId"
+ return="void"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="publicId" type="java.lang.String">
+</parameter>
+</method>
+<method name="setReader"
+ return="void"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="reader" type="java.io.Reader">
+</parameter>
+</method>
+<method name="setSystemId"
+ return="void"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="systemId" type="java.lang.String">
+</parameter>
+</method>
+<method name="setSystemId"
+ return="void"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="f" type="java.io.File">
+</parameter>
+</method>
+<field name="FEATURE"
+ type="java.lang.String"
+ transient="false"
+ volatile="false"
+ value="&quot;http://javax.xml.transform.stream.StreamSource/feature&quot;"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
+</class>
+</package>
+<package name="javax.xml.validation"
+>
+<class name="Schema"
+ extends="java.lang.Object"
+ abstract="true"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<constructor name="Schema"
+ type="javax.xml.validation.Schema"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="protected"
+>
+</constructor>
+<method name="newValidator"
+ return="javax.xml.validation.Validator"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
+<method name="newValidatorHandler"
+ return="javax.xml.validation.ValidatorHandler"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
+</class>
+<class name="SchemaFactory"
+ extends="java.lang.Object"
+ abstract="true"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<constructor name="SchemaFactory"
+ type="javax.xml.validation.SchemaFactory"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="protected"
+>
+</constructor>
+<method name="getErrorHandler"
+ return="org.xml.sax.ErrorHandler"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
+<method name="getFeature"
+ return="boolean"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="name" type="java.lang.String">
+</parameter>
+<exception name="SAXNotRecognizedException" type="org.xml.sax.SAXNotRecognizedException">
+</exception>
+<exception name="SAXNotSupportedException" type="org.xml.sax.SAXNotSupportedException">
+</exception>
+</method>
+<method name="getProperty"
+ return="java.lang.Object"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="name" type="java.lang.String">
+</parameter>
+<exception name="SAXNotRecognizedException" type="org.xml.sax.SAXNotRecognizedException">
+</exception>
+<exception name="SAXNotSupportedException" type="org.xml.sax.SAXNotSupportedException">
+</exception>
+</method>
+<method name="getResourceResolver"
+ return="org.w3c.dom.ls.LSResourceResolver"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
+<method name="isSchemaLanguageSupported"
+ return="boolean"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="schemaLanguage" type="java.lang.String">
+</parameter>
+</method>
+<method name="newInstance"
+ return="javax.xml.validation.SchemaFactory"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="schemaLanguage" type="java.lang.String">
+</parameter>
+</method>
+<method name="newSchema"
+ return="javax.xml.validation.Schema"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="schema" type="javax.xml.transform.Source">
+</parameter>
+<exception name="SAXException" type="org.xml.sax.SAXException">
+</exception>
+</method>
+<method name="newSchema"
+ return="javax.xml.validation.Schema"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="schema" type="java.io.File">
+</parameter>
+<exception name="SAXException" type="org.xml.sax.SAXException">
+</exception>
+</method>
+<method name="newSchema"
+ return="javax.xml.validation.Schema"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="schema" type="java.net.URL">
+</parameter>
+<exception name="SAXException" type="org.xml.sax.SAXException">
+</exception>
+</method>
+<method name="newSchema"
+ return="javax.xml.validation.Schema"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="schemas" type="javax.xml.transform.Source[]">
+</parameter>
+<exception name="SAXException" type="org.xml.sax.SAXException">
+</exception>
+</method>
+<method name="newSchema"
+ return="javax.xml.validation.Schema"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<exception name="SAXException" type="org.xml.sax.SAXException">
+</exception>
+</method>
+<method name="setErrorHandler"
+ return="void"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="errorHandler" type="org.xml.sax.ErrorHandler">
+</parameter>
+</method>
+<method name="setFeature"
+ return="void"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="name" type="java.lang.String">
+</parameter>
+<parameter name="value" type="boolean">
+</parameter>
+<exception name="SAXNotRecognizedException" type="org.xml.sax.SAXNotRecognizedException">
+</exception>
+<exception name="SAXNotSupportedException" type="org.xml.sax.SAXNotSupportedException">
+</exception>
+</method>
+<method name="setProperty"
+ return="void"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="name" type="java.lang.String">
+</parameter>
+<parameter name="object" type="java.lang.Object">
+</parameter>
+<exception name="SAXNotRecognizedException" type="org.xml.sax.SAXNotRecognizedException">
+</exception>
+<exception name="SAXNotSupportedException" type="org.xml.sax.SAXNotSupportedException">
+</exception>
+</method>
+<method name="setResourceResolver"
+ return="void"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="resourceResolver" type="org.w3c.dom.ls.LSResourceResolver">
+</parameter>
+</method>
+</class>
+<class name="SchemaFactoryLoader"
+ extends="java.lang.Object"
+ abstract="true"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<constructor name="SchemaFactoryLoader"
+ type="javax.xml.validation.SchemaFactoryLoader"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="protected"
+>
+</constructor>
+<method name="newFactory"
+ return="javax.xml.validation.SchemaFactory"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="schemaLanguage" type="java.lang.String">
+</parameter>
+</method>
+</class>
+<class name="TypeInfoProvider"
+ extends="java.lang.Object"
+ abstract="true"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<constructor name="TypeInfoProvider"
+ type="javax.xml.validation.TypeInfoProvider"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="protected"
+>
+</constructor>
+<method name="getAttributeTypeInfo"
+ return="org.w3c.dom.TypeInfo"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="index" type="int">
+</parameter>
+</method>
+<method name="getElementTypeInfo"
+ return="org.w3c.dom.TypeInfo"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
+<method name="isIdAttribute"
+ return="boolean"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="index" type="int">
+</parameter>
+</method>
+<method name="isSpecified"
+ return="boolean"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="index" type="int">
+</parameter>
+</method>
+</class>
+<class name="Validator"
+ extends="java.lang.Object"
+ abstract="true"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<constructor name="Validator"
+ type="javax.xml.validation.Validator"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="protected"
+>
+</constructor>
+<method name="getErrorHandler"
+ return="org.xml.sax.ErrorHandler"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
+<method name="getFeature"
+ return="boolean"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="name" type="java.lang.String">
+</parameter>
+<exception name="SAXNotRecognizedException" type="org.xml.sax.SAXNotRecognizedException">
+</exception>
+<exception name="SAXNotSupportedException" type="org.xml.sax.SAXNotSupportedException">
+</exception>
+</method>
+<method name="getProperty"
+ return="java.lang.Object"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="name" type="java.lang.String">
+</parameter>
+<exception name="SAXNotRecognizedException" type="org.xml.sax.SAXNotRecognizedException">
+</exception>
+<exception name="SAXNotSupportedException" type="org.xml.sax.SAXNotSupportedException">
+</exception>
+</method>
+<method name="getResourceResolver"
+ return="org.w3c.dom.ls.LSResourceResolver"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
+<method name="reset"
+ return="void"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
+<method name="setErrorHandler"
+ return="void"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="errorHandler" type="org.xml.sax.ErrorHandler">
+</parameter>
+</method>
+<method name="setFeature"
+ return="void"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="name" type="java.lang.String">
+</parameter>
+<parameter name="value" type="boolean">
+</parameter>
+<exception name="SAXNotRecognizedException" type="org.xml.sax.SAXNotRecognizedException">
+</exception>
+<exception name="SAXNotSupportedException" type="org.xml.sax.SAXNotSupportedException">
+</exception>
+</method>
+<method name="setProperty"
+ return="void"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="name" type="java.lang.String">
+</parameter>
+<parameter name="object" type="java.lang.Object">
+</parameter>
+<exception name="SAXNotRecognizedException" type="org.xml.sax.SAXNotRecognizedException">
+</exception>
+<exception name="SAXNotSupportedException" type="org.xml.sax.SAXNotSupportedException">
+</exception>
+</method>
+<method name="setResourceResolver"
+ return="void"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="resourceResolver" type="org.w3c.dom.ls.LSResourceResolver">
+</parameter>
+</method>
+<method name="validate"
+ return="void"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="source" type="javax.xml.transform.Source">
+</parameter>
+<exception name="IOException" type="java.io.IOException">
+</exception>
+<exception name="SAXException" type="org.xml.sax.SAXException">
+</exception>
+</method>
+<method name="validate"
+ return="void"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="source" type="javax.xml.transform.Source">
+</parameter>
+<parameter name="result" type="javax.xml.transform.Result">
+</parameter>
+<exception name="IOException" type="java.io.IOException">
+</exception>
+<exception name="SAXException" type="org.xml.sax.SAXException">
+</exception>
+</method>
+</class>
+<class name="ValidatorHandler"
+ extends="java.lang.Object"
+ abstract="true"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<implements name="org.xml.sax.ContentHandler">
+</implements>
+<constructor name="ValidatorHandler"
+ type="javax.xml.validation.ValidatorHandler"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="protected"
+>
+</constructor>
+<method name="getContentHandler"
+ return="org.xml.sax.ContentHandler"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
+<method name="getErrorHandler"
+ return="org.xml.sax.ErrorHandler"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
+<method name="getFeature"
+ return="boolean"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="name" type="java.lang.String">
+</parameter>
+<exception name="SAXNotRecognizedException" type="org.xml.sax.SAXNotRecognizedException">
+</exception>
+<exception name="SAXNotSupportedException" type="org.xml.sax.SAXNotSupportedException">
+</exception>
+</method>
+<method name="getProperty"
+ return="java.lang.Object"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="name" type="java.lang.String">
+</parameter>
+<exception name="SAXNotRecognizedException" type="org.xml.sax.SAXNotRecognizedException">
+</exception>
+<exception name="SAXNotSupportedException" type="org.xml.sax.SAXNotSupportedException">
+</exception>
+</method>
+<method name="getResourceResolver"
+ return="org.w3c.dom.ls.LSResourceResolver"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
+<method name="getTypeInfoProvider"
+ return="javax.xml.validation.TypeInfoProvider"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
+<method name="setContentHandler"
+ return="void"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="receiver" type="org.xml.sax.ContentHandler">
+</parameter>
+</method>
+<method name="setErrorHandler"
+ return="void"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="errorHandler" type="org.xml.sax.ErrorHandler">
+</parameter>
+</method>
+<method name="setFeature"
+ return="void"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="name" type="java.lang.String">
+</parameter>
+<parameter name="value" type="boolean">
+</parameter>
+<exception name="SAXNotRecognizedException" type="org.xml.sax.SAXNotRecognizedException">
+</exception>
+<exception name="SAXNotSupportedException" type="org.xml.sax.SAXNotSupportedException">
+</exception>
+</method>
+<method name="setProperty"
+ return="void"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="name" type="java.lang.String">
+</parameter>
+<parameter name="object" type="java.lang.Object">
+</parameter>
+<exception name="SAXNotRecognizedException" type="org.xml.sax.SAXNotRecognizedException">
+</exception>
+<exception name="SAXNotSupportedException" type="org.xml.sax.SAXNotSupportedException">
+</exception>
+</method>
+<method name="setResourceResolver"
+ return="void"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="resourceResolver" type="org.w3c.dom.ls.LSResourceResolver">
+</parameter>
+</method>
+</class>
+</package>
+<package name="javax.xml.xpath"
+>
+<interface name="XPath"
+ abstract="true"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<method name="compile"
+ return="javax.xml.xpath.XPathExpression"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="expression" type="java.lang.String">
+</parameter>
+<exception name="XPathExpressionException" type="javax.xml.xpath.XPathExpressionException">
+</exception>
+</method>
+<method name="evaluate"
+ return="java.lang.Object"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="expression" type="java.lang.String">
+</parameter>
+<parameter name="item" type="java.lang.Object">
+</parameter>
+<parameter name="returnType" type="javax.xml.namespace.QName">
+</parameter>
+<exception name="XPathExpressionException" type="javax.xml.xpath.XPathExpressionException">
+</exception>
+</method>
+<method name="evaluate"
+ return="java.lang.String"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="expression" type="java.lang.String">
+</parameter>
+<parameter name="item" type="java.lang.Object">
+</parameter>
+<exception name="XPathExpressionException" type="javax.xml.xpath.XPathExpressionException">
+</exception>
+</method>
+<method name="evaluate"
+ return="java.lang.Object"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="expression" type="java.lang.String">
+</parameter>
+<parameter name="source" type="org.xml.sax.InputSource">
+</parameter>
+<parameter name="returnType" type="javax.xml.namespace.QName">
+</parameter>
+<exception name="XPathExpressionException" type="javax.xml.xpath.XPathExpressionException">
+</exception>
+</method>
+<method name="evaluate"
+ return="java.lang.String"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="expression" type="java.lang.String">
+</parameter>
+<parameter name="source" type="org.xml.sax.InputSource">
+</parameter>
+<exception name="XPathExpressionException" type="javax.xml.xpath.XPathExpressionException">
+</exception>
+</method>
+<method name="getNamespaceContext"
+ return="javax.xml.namespace.NamespaceContext"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
+<method name="getXPathFunctionResolver"
+ return="javax.xml.xpath.XPathFunctionResolver"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
+<method name="getXPathVariableResolver"
+ return="javax.xml.xpath.XPathVariableResolver"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
+<method name="reset"
+ return="void"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
+<method name="setNamespaceContext"
+ return="void"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="nsContext" type="javax.xml.namespace.NamespaceContext">
+</parameter>
+</method>
+<method name="setXPathFunctionResolver"
+ return="void"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="resolver" type="javax.xml.xpath.XPathFunctionResolver">
+</parameter>
+</method>
+<method name="setXPathVariableResolver"
+ return="void"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="resolver" type="javax.xml.xpath.XPathVariableResolver">
+</parameter>
+</method>
+</interface>
+<class name="XPathConstants"
+ extends="java.lang.Object"
+ abstract="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<field name="BOOLEAN"
+ type="javax.xml.namespace.QName"
+ transient="false"
+ volatile="false"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
+<field name="DOM_OBJECT_MODEL"
+ type="java.lang.String"
+ transient="false"
+ volatile="false"
+ value="&quot;http://java.sun.com/jaxp/xpath/dom&quot;"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
+<field name="NODE"
+ type="javax.xml.namespace.QName"
+ transient="false"
+ volatile="false"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
+<field name="NODESET"
+ type="javax.xml.namespace.QName"
+ transient="false"
+ volatile="false"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
+<field name="NUMBER"
+ type="javax.xml.namespace.QName"
+ transient="false"
+ volatile="false"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
+<field name="STRING"
+ type="javax.xml.namespace.QName"
+ transient="false"
+ volatile="false"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
+</class>
+<class name="XPathException"
+ extends="java.lang.Exception"
+ abstract="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<constructor name="XPathException"
+ type="javax.xml.xpath.XPathException"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="message" type="java.lang.String">
+</parameter>
+</constructor>
+<constructor name="XPathException"
+ type="javax.xml.xpath.XPathException"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="cause" type="java.lang.Throwable">
+</parameter>
+</constructor>
+</class>
+<interface name="XPathExpression"
+ abstract="true"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<method name="evaluate"
+ return="java.lang.Object"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="item" type="java.lang.Object">
+</parameter>
+<parameter name="returnType" type="javax.xml.namespace.QName">
+</parameter>
+<exception name="XPathExpressionException" type="javax.xml.xpath.XPathExpressionException">
+</exception>
+</method>
+<method name="evaluate"
+ return="java.lang.String"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="item" type="java.lang.Object">
+</parameter>
+<exception name="XPathExpressionException" type="javax.xml.xpath.XPathExpressionException">
+</exception>
+</method>
+<method name="evaluate"
+ return="java.lang.Object"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="source" type="org.xml.sax.InputSource">
+</parameter>
+<parameter name="returnType" type="javax.xml.namespace.QName">
+</parameter>
+<exception name="XPathExpressionException" type="javax.xml.xpath.XPathExpressionException">
+</exception>
+</method>
+<method name="evaluate"
+ return="java.lang.String"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="source" type="org.xml.sax.InputSource">
+</parameter>
+<exception name="XPathExpressionException" type="javax.xml.xpath.XPathExpressionException">
+</exception>
+</method>
+</interface>
+<class name="XPathExpressionException"
+ extends="javax.xml.xpath.XPathException"
+ abstract="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<constructor name="XPathExpressionException"
+ type="javax.xml.xpath.XPathExpressionException"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="message" type="java.lang.String">
+</parameter>
+</constructor>
+<constructor name="XPathExpressionException"
+ type="javax.xml.xpath.XPathExpressionException"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="cause" type="java.lang.Throwable">
+</parameter>
+</constructor>
+</class>
+<class name="XPathFactory"
+ extends="java.lang.Object"
+ abstract="true"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<constructor name="XPathFactory"
+ type="javax.xml.xpath.XPathFactory"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="protected"
+>
+</constructor>
+<method name="getFeature"
+ return="boolean"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="name" type="java.lang.String">
+</parameter>
+<exception name="XPathFactoryConfigurationException" type="javax.xml.xpath.XPathFactoryConfigurationException">
+</exception>
+</method>
+<method name="isObjectModelSupported"
+ return="boolean"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="objectModel" type="java.lang.String">
+</parameter>
+</method>
+<method name="newInstance"
+ return="javax.xml.xpath.XPathFactory"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
+<method name="newInstance"
+ return="javax.xml.xpath.XPathFactory"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="uri" type="java.lang.String">
+</parameter>
+<exception name="XPathFactoryConfigurationException" type="javax.xml.xpath.XPathFactoryConfigurationException">
+</exception>
+</method>
+<method name="newInstance"
+ return="javax.xml.xpath.XPathFactory"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="true"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="uri" type="java.lang.String">
+</parameter>
+<parameter name="factoryClassName" type="java.lang.String">
+</parameter>
+<parameter name="classLoader" type="java.lang.ClassLoader">
+</parameter>
+<exception name="XPathFactoryConfigurationException" type="javax.xml.xpath.XPathFactoryConfigurationException">
+</exception>
+</method>
+<method name="newXPath"
+ return="javax.xml.xpath.XPath"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
+<method name="setFeature"
+ return="void"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="name" type="java.lang.String">
+</parameter>
+<parameter name="value" type="boolean">
+</parameter>
+<exception name="XPathFactoryConfigurationException" type="javax.xml.xpath.XPathFactoryConfigurationException">
+</exception>
+</method>
+<method name="setXPathFunctionResolver"
+ return="void"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="resolver" type="javax.xml.xpath.XPathFunctionResolver">
+</parameter>
+</method>
+<method name="setXPathVariableResolver"
+ return="void"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="resolver" type="javax.xml.xpath.XPathVariableResolver">
+</parameter>
+</method>
+<field name="DEFAULT_OBJECT_MODEL_URI"
+ type="java.lang.String"
+ transient="false"
+ volatile="false"
+ value="&quot;http://java.sun.com/jaxp/xpath/dom&quot;"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
+<field name="DEFAULT_PROPERTY_NAME"
+ type="java.lang.String"
+ transient="false"
+ volatile="false"
+ value="&quot;javax.xml.xpath.XPathFactory&quot;"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
+</class>
+<class name="XPathFactoryConfigurationException"
+ extends="javax.xml.xpath.XPathException"
+ abstract="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<constructor name="XPathFactoryConfigurationException"
+ type="javax.xml.xpath.XPathFactoryConfigurationException"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="message" type="java.lang.String">
+</parameter>
+</constructor>
+<constructor name="XPathFactoryConfigurationException"
+ type="javax.xml.xpath.XPathFactoryConfigurationException"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="cause" type="java.lang.Throwable">
+</parameter>
+</constructor>
+</class>
+<interface name="XPathFunction"
+ abstract="true"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<method name="evaluate"
+ return="java.lang.Object"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="args" type="java.util.List">
+</parameter>
+<exception name="XPathFunctionException" type="javax.xml.xpath.XPathFunctionException">
+</exception>
+</method>
+</interface>
+<class name="XPathFunctionException"
+ extends="javax.xml.xpath.XPathExpressionException"
+ abstract="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<constructor name="XPathFunctionException"
+ type="javax.xml.xpath.XPathFunctionException"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="message" type="java.lang.String">
+</parameter>
+</constructor>
+<constructor name="XPathFunctionException"
+ type="javax.xml.xpath.XPathFunctionException"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="cause" type="java.lang.Throwable">
+</parameter>
+</constructor>
+</class>
+<interface name="XPathFunctionResolver"
+ abstract="true"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<method name="resolveFunction"
+ return="javax.xml.xpath.XPathFunction"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="functionName" type="javax.xml.namespace.QName">
+</parameter>
+<parameter name="arity" type="int">
+</parameter>
+</method>
+</interface>
+<interface name="XPathVariableResolver"
+ abstract="true"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<method name="resolveVariable"
+ return="java.lang.Object"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="variableName" type="javax.xml.namespace.QName">
+</parameter>
+</method>
+</interface>
+</package>
 <package name="junit.framework"
 >
 <class name="Assert"
@@ -374832,6 +380408,17 @@
  visibility="public"
 >
 </method>
+<method name="getSchemaTypeInfo"
+ return="org.w3c.dom.TypeInfo"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
 <method name="getSpecified"
  return="boolean"
  abstract="true"
@@ -374854,6 +380441,17 @@
  visibility="public"
 >
 </method>
+<method name="isId"
+ return="boolean"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
 <method name="setValue"
  return="void"
  abstract="true"
@@ -375024,6 +380622,200 @@
 <implements name="org.w3c.dom.CharacterData">
 </implements>
 </interface>
+<interface name="DOMConfiguration"
+ abstract="true"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<method name="canSetParameter"
+ return="boolean"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="name" type="java.lang.String">
+</parameter>
+<parameter name="value" type="java.lang.Object">
+</parameter>
+</method>
+<method name="getParameter"
+ return="java.lang.Object"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="name" type="java.lang.String">
+</parameter>
+<exception name="DOMException" type="org.w3c.dom.DOMException">
+</exception>
+</method>
+<method name="getParameterNames"
+ return="org.w3c.dom.DOMStringList"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
+<method name="setParameter"
+ return="void"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="name" type="java.lang.String">
+</parameter>
+<parameter name="value" type="java.lang.Object">
+</parameter>
+<exception name="DOMException" type="org.w3c.dom.DOMException">
+</exception>
+</method>
+</interface>
+<interface name="DOMError"
+ abstract="true"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<method name="getLocation"
+ return="org.w3c.dom.DOMLocator"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
+<method name="getMessage"
+ return="java.lang.String"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
+<method name="getRelatedData"
+ return="java.lang.Object"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
+<method name="getRelatedException"
+ return="java.lang.Object"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
+<method name="getSeverity"
+ return="short"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
+<method name="getType"
+ return="java.lang.String"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
+<field name="SEVERITY_ERROR"
+ type="short"
+ transient="false"
+ volatile="false"
+ value="2"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
+<field name="SEVERITY_FATAL_ERROR"
+ type="short"
+ transient="false"
+ volatile="false"
+ value="3"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
+<field name="SEVERITY_WARNING"
+ type="short"
+ transient="false"
+ volatile="false"
+ value="1"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
+</interface>
+<interface name="DOMErrorHandler"
+ abstract="true"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<method name="handleError"
+ return="boolean"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="error" type="org.w3c.dom.DOMError">
+</parameter>
+</method>
+</interface>
 <class name="DOMException"
  extends="java.lang.RuntimeException"
  abstract="false"
@@ -375198,6 +380990,28 @@
  visibility="public"
 >
 </field>
+<field name="TYPE_MISMATCH_ERR"
+ type="short"
+ transient="false"
+ volatile="false"
+ value="17"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
+<field name="VALIDATION_ERR"
+ type="short"
+ transient="false"
+ volatile="false"
+ value="16"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
 <field name="WRONG_DOCUMENT_ERR"
  type="short"
  transient="false"
@@ -375265,6 +381079,21 @@
 <exception name="DOMException" type="org.w3c.dom.DOMException">
 </exception>
 </method>
+<method name="getFeature"
+ return="java.lang.Object"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="feature" type="java.lang.String">
+</parameter>
+<parameter name="version" type="java.lang.String">
+</parameter>
+</method>
 <method name="hasFeature"
  return="boolean"
  abstract="true"
@@ -375281,6 +381110,191 @@
 </parameter>
 </method>
 </interface>
+<interface name="DOMImplementationList"
+ abstract="true"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<method name="getLength"
+ return="int"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
+<method name="item"
+ return="org.w3c.dom.DOMImplementation"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="index" type="int">
+</parameter>
+</method>
+</interface>
+<interface name="DOMImplementationSource"
+ abstract="true"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<method name="getDOMImplementation"
+ return="org.w3c.dom.DOMImplementation"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="features" type="java.lang.String">
+</parameter>
+</method>
+<method name="getDOMImplementationList"
+ return="org.w3c.dom.DOMImplementationList"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="features" type="java.lang.String">
+</parameter>
+</method>
+</interface>
+<interface name="DOMLocator"
+ abstract="true"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<method name="getByteOffset"
+ return="int"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
+<method name="getColumnNumber"
+ return="int"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
+<method name="getLineNumber"
+ return="int"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
+<method name="getRelatedNode"
+ return="org.w3c.dom.Node"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
+<method name="getUri"
+ return="java.lang.String"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
+<method name="getUtf16Offset"
+ return="int"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
+</interface>
+<interface name="DOMStringList"
+ abstract="true"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<method name="contains"
+ return="boolean"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="str" type="java.lang.String">
+</parameter>
+</method>
+<method name="getLength"
+ return="int"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
+<method name="item"
+ return="java.lang.String"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="index" type="int">
+</parameter>
+</method>
+</interface>
 <interface name="Document"
  abstract="true"
  static="false"
@@ -375290,6 +381304,21 @@
 >
 <implements name="org.w3c.dom.Node">
 </implements>
+<method name="adoptNode"
+ return="org.w3c.dom.Node"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="source" type="org.w3c.dom.Node">
+</parameter>
+<exception name="DOMException" type="org.w3c.dom.DOMException">
+</exception>
+</method>
 <method name="createAttribute"
  return="org.w3c.dom.Attr"
  abstract="true"
@@ -375460,6 +381489,28 @@
  visibility="public"
 >
 </method>
+<method name="getDocumentURI"
+ return="java.lang.String"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
+<method name="getDomConfig"
+ return="org.w3c.dom.DOMConfiguration"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
 <method name="getElementById"
  return="org.w3c.dom.Element"
  abstract="true"
@@ -375512,6 +381563,61 @@
  visibility="public"
 >
 </method>
+<method name="getInputEncoding"
+ return="java.lang.String"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
+<method name="getStrictErrorChecking"
+ return="boolean"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
+<method name="getXmlEncoding"
+ return="java.lang.String"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
+<method name="getXmlStandalone"
+ return="boolean"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
+<method name="getXmlVersion"
+ return="java.lang.String"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
 <method name="importNode"
  return="org.w3c.dom.Node"
  abstract="true"
@@ -375529,6 +381635,92 @@
 <exception name="DOMException" type="org.w3c.dom.DOMException">
 </exception>
 </method>
+<method name="normalizeDocument"
+ return="void"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
+<method name="renameNode"
+ return="org.w3c.dom.Node"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="n" type="org.w3c.dom.Node">
+</parameter>
+<parameter name="namespaceURI" type="java.lang.String">
+</parameter>
+<parameter name="qualifiedName" type="java.lang.String">
+</parameter>
+<exception name="DOMException" type="org.w3c.dom.DOMException">
+</exception>
+</method>
+<method name="setDocumentURI"
+ return="void"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="documentURI" type="java.lang.String">
+</parameter>
+</method>
+<method name="setStrictErrorChecking"
+ return="void"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="strictErrorChecking" type="boolean">
+</parameter>
+</method>
+<method name="setXmlStandalone"
+ return="void"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="xmlStandalone" type="boolean">
+</parameter>
+<exception name="DOMException" type="org.w3c.dom.DOMException">
+</exception>
+</method>
+<method name="setXmlVersion"
+ return="void"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="xmlVersion" type="java.lang.String">
+</parameter>
+<exception name="DOMException" type="org.w3c.dom.DOMException">
+</exception>
+</method>
 </interface>
 <interface name="DocumentFragment"
  abstract="true"
@@ -375652,6 +381844,8 @@
 </parameter>
 <parameter name="localName" type="java.lang.String">
 </parameter>
+<exception name="DOMException" type="org.w3c.dom.DOMException">
+</exception>
 </method>
 <method name="getAttributeNode"
  return="org.w3c.dom.Attr"
@@ -375680,6 +381874,8 @@
 </parameter>
 <parameter name="localName" type="java.lang.String">
 </parameter>
+<exception name="DOMException" type="org.w3c.dom.DOMException">
+</exception>
 </method>
 <method name="getElementsByTagName"
  return="org.w3c.dom.NodeList"
@@ -375708,6 +381904,19 @@
 </parameter>
 <parameter name="localName" type="java.lang.String">
 </parameter>
+<exception name="DOMException" type="org.w3c.dom.DOMException">
+</exception>
+</method>
+<method name="getSchemaTypeInfo"
+ return="org.w3c.dom.TypeInfo"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
 </method>
 <method name="getTagName"
  return="java.lang.String"
@@ -375747,6 +381956,8 @@
 </parameter>
 <parameter name="localName" type="java.lang.String">
 </parameter>
+<exception name="DOMException" type="org.w3c.dom.DOMException">
+</exception>
 </method>
 <method name="removeAttribute"
  return="void"
@@ -375861,6 +382072,59 @@
 <exception name="DOMException" type="org.w3c.dom.DOMException">
 </exception>
 </method>
+<method name="setIdAttribute"
+ return="void"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="name" type="java.lang.String">
+</parameter>
+<parameter name="isId" type="boolean">
+</parameter>
+<exception name="DOMException" type="org.w3c.dom.DOMException">
+</exception>
+</method>
+<method name="setIdAttributeNS"
+ return="void"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="namespaceURI" type="java.lang.String">
+</parameter>
+<parameter name="localName" type="java.lang.String">
+</parameter>
+<parameter name="isId" type="boolean">
+</parameter>
+<exception name="DOMException" type="org.w3c.dom.DOMException">
+</exception>
+</method>
+<method name="setIdAttributeNode"
+ return="void"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="idAttr" type="org.w3c.dom.Attr">
+</parameter>
+<parameter name="isId" type="boolean">
+</parameter>
+<exception name="DOMException" type="org.w3c.dom.DOMException">
+</exception>
+</method>
 </interface>
 <interface name="Entity"
  abstract="true"
@@ -375871,6 +382135,17 @@
 >
 <implements name="org.w3c.dom.Node">
 </implements>
+<method name="getInputEncoding"
+ return="java.lang.String"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
 <method name="getNotationName"
  return="java.lang.String"
  abstract="true"
@@ -375904,6 +382179,28 @@
  visibility="public"
 >
 </method>
+<method name="getXmlEncoding"
+ return="java.lang.String"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
+<method name="getXmlVersion"
+ return="java.lang.String"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
 </interface>
 <interface name="EntityReference"
  abstract="true"
@@ -375915,6 +382212,79 @@
 <implements name="org.w3c.dom.Node">
 </implements>
 </interface>
+<interface name="NameList"
+ abstract="true"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<method name="contains"
+ return="boolean"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="str" type="java.lang.String">
+</parameter>
+</method>
+<method name="containsNS"
+ return="boolean"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="namespaceURI" type="java.lang.String">
+</parameter>
+<parameter name="name" type="java.lang.String">
+</parameter>
+</method>
+<method name="getLength"
+ return="int"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
+<method name="getName"
+ return="java.lang.String"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="index" type="int">
+</parameter>
+</method>
+<method name="getNamespaceURI"
+ return="java.lang.String"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="index" type="int">
+</parameter>
+</method>
+</interface>
 <interface name="NamedNodeMap"
  abstract="true"
  static="false"
@@ -375960,6 +382330,8 @@
 </parameter>
 <parameter name="localName" type="java.lang.String">
 </parameter>
+<exception name="DOMException" type="org.w3c.dom.DOMException">
+</exception>
 </method>
 <method name="item"
  return="org.w3c.dom.Node"
@@ -376072,6 +382444,21 @@
 <parameter name="deep" type="boolean">
 </parameter>
 </method>
+<method name="compareDocumentPosition"
+ return="short"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="other" type="org.w3c.dom.Node">
+</parameter>
+<exception name="DOMException" type="org.w3c.dom.DOMException">
+</exception>
+</method>
 <method name="getAttributes"
  return="org.w3c.dom.NamedNodeMap"
  abstract="true"
@@ -376083,6 +382470,17 @@
  visibility="public"
 >
 </method>
+<method name="getBaseURI"
+ return="java.lang.String"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
 <method name="getChildNodes"
  return="org.w3c.dom.NodeList"
  abstract="true"
@@ -376094,6 +382492,21 @@
  visibility="public"
 >
 </method>
+<method name="getFeature"
+ return="java.lang.Object"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="feature" type="java.lang.String">
+</parameter>
+<parameter name="version" type="java.lang.String">
+</parameter>
+</method>
 <method name="getFirstChild"
  return="org.w3c.dom.Node"
  abstract="true"
@@ -376228,6 +382641,32 @@
  visibility="public"
 >
 </method>
+<method name="getTextContent"
+ return="java.lang.String"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<exception name="DOMException" type="org.w3c.dom.DOMException">
+</exception>
+</method>
+<method name="getUserData"
+ return="java.lang.Object"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="key" type="java.lang.String">
+</parameter>
+</method>
 <method name="hasAttributes"
  return="boolean"
  abstract="true"
@@ -376267,6 +382706,45 @@
 <exception name="DOMException" type="org.w3c.dom.DOMException">
 </exception>
 </method>
+<method name="isDefaultNamespace"
+ return="boolean"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="namespaceURI" type="java.lang.String">
+</parameter>
+</method>
+<method name="isEqualNode"
+ return="boolean"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="arg" type="org.w3c.dom.Node">
+</parameter>
+</method>
+<method name="isSameNode"
+ return="boolean"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="other" type="org.w3c.dom.Node">
+</parameter>
+</method>
 <method name="isSupported"
  return="boolean"
  abstract="true"
@@ -376282,6 +382760,32 @@
 <parameter name="version" type="java.lang.String">
 </parameter>
 </method>
+<method name="lookupNamespaceURI"
+ return="java.lang.String"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="prefix" type="java.lang.String">
+</parameter>
+</method>
+<method name="lookupPrefix"
+ return="java.lang.String"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="namespaceURI" type="java.lang.String">
+</parameter>
+</method>
 <method name="normalize"
  return="void"
  abstract="true"
@@ -376355,6 +382859,38 @@
 <exception name="DOMException" type="org.w3c.dom.DOMException">
 </exception>
 </method>
+<method name="setTextContent"
+ return="void"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="textContent" type="java.lang.String">
+</parameter>
+<exception name="DOMException" type="org.w3c.dom.DOMException">
+</exception>
+</method>
+<method name="setUserData"
+ return="java.lang.Object"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="key" type="java.lang.String">
+</parameter>
+<parameter name="data" type="java.lang.Object">
+</parameter>
+<parameter name="handler" type="org.w3c.dom.UserDataHandler">
+</parameter>
+</method>
 <field name="ATTRIBUTE_NODE"
  type="short"
  transient="false"
@@ -376410,6 +382946,72 @@
  visibility="public"
 >
 </field>
+<field name="DOCUMENT_POSITION_CONTAINED_BY"
+ type="short"
+ transient="false"
+ volatile="false"
+ value="16"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
+<field name="DOCUMENT_POSITION_CONTAINS"
+ type="short"
+ transient="false"
+ volatile="false"
+ value="8"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
+<field name="DOCUMENT_POSITION_DISCONNECTED"
+ type="short"
+ transient="false"
+ volatile="false"
+ value="1"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
+<field name="DOCUMENT_POSITION_FOLLOWING"
+ type="short"
+ transient="false"
+ volatile="false"
+ value="4"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
+<field name="DOCUMENT_POSITION_IMPLEMENTATION_SPECIFIC"
+ type="short"
+ transient="false"
+ volatile="false"
+ value="32"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
+<field name="DOCUMENT_POSITION_PRECEDING"
+ type="short"
+ transient="false"
+ volatile="false"
+ value="2"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
 <field name="DOCUMENT_TYPE_NODE"
  type="short"
  transient="false"
@@ -376608,6 +383210,43 @@
 >
 <implements name="org.w3c.dom.CharacterData">
 </implements>
+<method name="getWholeText"
+ return="java.lang.String"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
+<method name="isElementContentWhitespace"
+ return="boolean"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
+<method name="replaceWholeText"
+ return="org.w3c.dom.Text"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="content" type="java.lang.String">
+</parameter>
+<exception name="DOMException" type="org.w3c.dom.DOMException">
+</exception>
+</method>
 <method name="splitText"
  return="org.w3c.dom.Text"
  abstract="true"
@@ -376624,6 +383263,2316 @@
 </exception>
 </method>
 </interface>
+<interface name="TypeInfo"
+ abstract="true"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<method name="getTypeName"
+ return="java.lang.String"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
+<method name="getTypeNamespace"
+ return="java.lang.String"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
+<method name="isDerivedFrom"
+ return="boolean"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="typeNamespaceArg" type="java.lang.String">
+</parameter>
+<parameter name="typeNameArg" type="java.lang.String">
+</parameter>
+<parameter name="derivationMethod" type="int">
+</parameter>
+</method>
+<field name="DERIVATION_EXTENSION"
+ type="int"
+ transient="false"
+ volatile="false"
+ value="2"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
+<field name="DERIVATION_LIST"
+ type="int"
+ transient="false"
+ volatile="false"
+ value="8"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
+<field name="DERIVATION_RESTRICTION"
+ type="int"
+ transient="false"
+ volatile="false"
+ value="1"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
+<field name="DERIVATION_UNION"
+ type="int"
+ transient="false"
+ volatile="false"
+ value="4"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
+</interface>
+<interface name="UserDataHandler"
+ abstract="true"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<method name="handle"
+ return="void"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="operation" type="short">
+</parameter>
+<parameter name="key" type="java.lang.String">
+</parameter>
+<parameter name="data" type="java.lang.Object">
+</parameter>
+<parameter name="src" type="org.w3c.dom.Node">
+</parameter>
+<parameter name="dst" type="org.w3c.dom.Node">
+</parameter>
+</method>
+<field name="NODE_ADOPTED"
+ type="short"
+ transient="false"
+ volatile="false"
+ value="5"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
+<field name="NODE_CLONED"
+ type="short"
+ transient="false"
+ volatile="false"
+ value="1"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
+<field name="NODE_DELETED"
+ type="short"
+ transient="false"
+ volatile="false"
+ value="3"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
+<field name="NODE_IMPORTED"
+ type="short"
+ transient="false"
+ volatile="false"
+ value="2"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
+<field name="NODE_RENAMED"
+ type="short"
+ transient="false"
+ volatile="false"
+ value="4"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
+</interface>
+</package>
+<package name="org.w3c.dom.events"
+>
+<interface name="DocumentEvent"
+ abstract="true"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<method name="createEvent"
+ return="org.w3c.dom.events.Event"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="eventType" type="java.lang.String">
+</parameter>
+<exception name="DOMException" type="org.w3c.dom.DOMException">
+</exception>
+</method>
+</interface>
+<interface name="Event"
+ abstract="true"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<method name="getBubbles"
+ return="boolean"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
+<method name="getCancelable"
+ return="boolean"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
+<method name="getCurrentTarget"
+ return="org.w3c.dom.events.EventTarget"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
+<method name="getEventPhase"
+ return="short"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
+<method name="getTarget"
+ return="org.w3c.dom.events.EventTarget"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
+<method name="getTimeStamp"
+ return="long"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
+<method name="getType"
+ return="java.lang.String"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
+<method name="initEvent"
+ return="void"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="eventTypeArg" type="java.lang.String">
+</parameter>
+<parameter name="canBubbleArg" type="boolean">
+</parameter>
+<parameter name="cancelableArg" type="boolean">
+</parameter>
+</method>
+<method name="preventDefault"
+ return="void"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
+<method name="stopPropagation"
+ return="void"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
+<field name="AT_TARGET"
+ type="short"
+ transient="false"
+ volatile="false"
+ value="2"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
+<field name="BUBBLING_PHASE"
+ type="short"
+ transient="false"
+ volatile="false"
+ value="3"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
+<field name="CAPTURING_PHASE"
+ type="short"
+ transient="false"
+ volatile="false"
+ value="1"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
+</interface>
+<class name="EventException"
+ extends="java.lang.RuntimeException"
+ abstract="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<constructor name="EventException"
+ type="org.w3c.dom.events.EventException"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="code" type="short">
+</parameter>
+<parameter name="message" type="java.lang.String">
+</parameter>
+</constructor>
+<field name="UNSPECIFIED_EVENT_TYPE_ERR"
+ type="short"
+ transient="false"
+ volatile="false"
+ value="0"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
+<field name="code"
+ type="short"
+ transient="false"
+ volatile="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
+</class>
+<interface name="EventListener"
+ abstract="true"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<method name="handleEvent"
+ return="void"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="evt" type="org.w3c.dom.events.Event">
+</parameter>
+</method>
+</interface>
+<interface name="EventTarget"
+ abstract="true"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<method name="addEventListener"
+ return="void"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="type" type="java.lang.String">
+</parameter>
+<parameter name="listener" type="org.w3c.dom.events.EventListener">
+</parameter>
+<parameter name="useCapture" type="boolean">
+</parameter>
+</method>
+<method name="dispatchEvent"
+ return="boolean"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="evt" type="org.w3c.dom.events.Event">
+</parameter>
+<exception name="EventException" type="org.w3c.dom.events.EventException">
+</exception>
+</method>
+<method name="removeEventListener"
+ return="void"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="type" type="java.lang.String">
+</parameter>
+<parameter name="listener" type="org.w3c.dom.events.EventListener">
+</parameter>
+<parameter name="useCapture" type="boolean">
+</parameter>
+</method>
+</interface>
+<interface name="MouseEvent"
+ abstract="true"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<implements name="org.w3c.dom.events.UIEvent">
+</implements>
+<method name="getAltKey"
+ return="boolean"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
+<method name="getButton"
+ return="short"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
+<method name="getClientX"
+ return="int"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
+<method name="getClientY"
+ return="int"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
+<method name="getCtrlKey"
+ return="boolean"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
+<method name="getMetaKey"
+ return="boolean"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
+<method name="getRelatedTarget"
+ return="org.w3c.dom.events.EventTarget"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
+<method name="getScreenX"
+ return="int"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
+<method name="getScreenY"
+ return="int"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
+<method name="getShiftKey"
+ return="boolean"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
+<method name="initMouseEvent"
+ return="void"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="typeArg" type="java.lang.String">
+</parameter>
+<parameter name="canBubbleArg" type="boolean">
+</parameter>
+<parameter name="cancelableArg" type="boolean">
+</parameter>
+<parameter name="viewArg" type="org.w3c.dom.views.AbstractView">
+</parameter>
+<parameter name="detailArg" type="int">
+</parameter>
+<parameter name="screenXArg" type="int">
+</parameter>
+<parameter name="screenYArg" type="int">
+</parameter>
+<parameter name="clientXArg" type="int">
+</parameter>
+<parameter name="clientYArg" type="int">
+</parameter>
+<parameter name="ctrlKeyArg" type="boolean">
+</parameter>
+<parameter name="altKeyArg" type="boolean">
+</parameter>
+<parameter name="shiftKeyArg" type="boolean">
+</parameter>
+<parameter name="metaKeyArg" type="boolean">
+</parameter>
+<parameter name="buttonArg" type="short">
+</parameter>
+<parameter name="relatedTargetArg" type="org.w3c.dom.events.EventTarget">
+</parameter>
+</method>
+</interface>
+<interface name="MutationEvent"
+ abstract="true"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<implements name="org.w3c.dom.events.Event">
+</implements>
+<method name="getAttrChange"
+ return="short"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
+<method name="getAttrName"
+ return="java.lang.String"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
+<method name="getNewValue"
+ return="java.lang.String"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
+<method name="getPrevValue"
+ return="java.lang.String"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
+<method name="getRelatedNode"
+ return="org.w3c.dom.Node"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
+<method name="initMutationEvent"
+ return="void"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="typeArg" type="java.lang.String">
+</parameter>
+<parameter name="canBubbleArg" type="boolean">
+</parameter>
+<parameter name="cancelableArg" type="boolean">
+</parameter>
+<parameter name="relatedNodeArg" type="org.w3c.dom.Node">
+</parameter>
+<parameter name="prevValueArg" type="java.lang.String">
+</parameter>
+<parameter name="newValueArg" type="java.lang.String">
+</parameter>
+<parameter name="attrNameArg" type="java.lang.String">
+</parameter>
+<parameter name="attrChangeArg" type="short">
+</parameter>
+</method>
+<field name="ADDITION"
+ type="short"
+ transient="false"
+ volatile="false"
+ value="2"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
+<field name="MODIFICATION"
+ type="short"
+ transient="false"
+ volatile="false"
+ value="1"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
+<field name="REMOVAL"
+ type="short"
+ transient="false"
+ volatile="false"
+ value="3"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
+</interface>
+<interface name="UIEvent"
+ abstract="true"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<implements name="org.w3c.dom.events.Event">
+</implements>
+<method name="getDetail"
+ return="int"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
+<method name="getView"
+ return="org.w3c.dom.views.AbstractView"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
+<method name="initUIEvent"
+ return="void"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="typeArg" type="java.lang.String">
+</parameter>
+<parameter name="canBubbleArg" type="boolean">
+</parameter>
+<parameter name="cancelableArg" type="boolean">
+</parameter>
+<parameter name="viewArg" type="org.w3c.dom.views.AbstractView">
+</parameter>
+<parameter name="detailArg" type="int">
+</parameter>
+</method>
+</interface>
+</package>
+<package name="org.w3c.dom.ls"
+>
+<interface name="DOMImplementationLS"
+ abstract="true"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<method name="createLSInput"
+ return="org.w3c.dom.ls.LSInput"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
+<method name="createLSOutput"
+ return="org.w3c.dom.ls.LSOutput"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
+<method name="createLSParser"
+ return="org.w3c.dom.ls.LSParser"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="mode" type="short">
+</parameter>
+<parameter name="schemaType" type="java.lang.String">
+</parameter>
+<exception name="DOMException" type="org.w3c.dom.DOMException">
+</exception>
+</method>
+<method name="createLSSerializer"
+ return="org.w3c.dom.ls.LSSerializer"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
+<field name="MODE_ASYNCHRONOUS"
+ type="short"
+ transient="false"
+ volatile="false"
+ value="2"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
+<field name="MODE_SYNCHRONOUS"
+ type="short"
+ transient="false"
+ volatile="false"
+ value="1"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
+</interface>
+<class name="LSException"
+ extends="java.lang.RuntimeException"
+ abstract="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<constructor name="LSException"
+ type="org.w3c.dom.ls.LSException"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="code" type="short">
+</parameter>
+<parameter name="message" type="java.lang.String">
+</parameter>
+</constructor>
+<field name="PARSE_ERR"
+ type="short"
+ transient="false"
+ volatile="false"
+ value="81"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
+<field name="SERIALIZE_ERR"
+ type="short"
+ transient="false"
+ volatile="false"
+ value="82"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
+<field name="code"
+ type="short"
+ transient="false"
+ volatile="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
+</class>
+<interface name="LSInput"
+ abstract="true"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<method name="getBaseURI"
+ return="java.lang.String"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
+<method name="getByteStream"
+ return="java.io.InputStream"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
+<method name="getCertifiedText"
+ return="boolean"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
+<method name="getCharacterStream"
+ return="java.io.Reader"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
+<method name="getEncoding"
+ return="java.lang.String"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
+<method name="getPublicId"
+ return="java.lang.String"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
+<method name="getStringData"
+ return="java.lang.String"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
+<method name="getSystemId"
+ return="java.lang.String"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
+<method name="setBaseURI"
+ return="void"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="baseURI" type="java.lang.String">
+</parameter>
+</method>
+<method name="setByteStream"
+ return="void"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="byteStream" type="java.io.InputStream">
+</parameter>
+</method>
+<method name="setCertifiedText"
+ return="void"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="certifiedText" type="boolean">
+</parameter>
+</method>
+<method name="setCharacterStream"
+ return="void"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="characterStream" type="java.io.Reader">
+</parameter>
+</method>
+<method name="setEncoding"
+ return="void"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="encoding" type="java.lang.String">
+</parameter>
+</method>
+<method name="setPublicId"
+ return="void"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="publicId" type="java.lang.String">
+</parameter>
+</method>
+<method name="setStringData"
+ return="void"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="stringData" type="java.lang.String">
+</parameter>
+</method>
+<method name="setSystemId"
+ return="void"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="systemId" type="java.lang.String">
+</parameter>
+</method>
+</interface>
+<interface name="LSLoadEvent"
+ abstract="true"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<implements name="org.w3c.dom.events.Event">
+</implements>
+<method name="getInput"
+ return="org.w3c.dom.ls.LSInput"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
+<method name="getNewDocument"
+ return="org.w3c.dom.Document"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
+</interface>
+<interface name="LSOutput"
+ abstract="true"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<method name="getByteStream"
+ return="java.io.OutputStream"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
+<method name="getCharacterStream"
+ return="java.io.Writer"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
+<method name="getEncoding"
+ return="java.lang.String"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
+<method name="getSystemId"
+ return="java.lang.String"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
+<method name="setByteStream"
+ return="void"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="byteStream" type="java.io.OutputStream">
+</parameter>
+</method>
+<method name="setCharacterStream"
+ return="void"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="characterStream" type="java.io.Writer">
+</parameter>
+</method>
+<method name="setEncoding"
+ return="void"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="encoding" type="java.lang.String">
+</parameter>
+</method>
+<method name="setSystemId"
+ return="void"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="systemId" type="java.lang.String">
+</parameter>
+</method>
+</interface>
+<interface name="LSParser"
+ abstract="true"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<method name="abort"
+ return="void"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
+<method name="getAsync"
+ return="boolean"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
+<method name="getBusy"
+ return="boolean"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
+<method name="getDomConfig"
+ return="org.w3c.dom.DOMConfiguration"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
+<method name="getFilter"
+ return="org.w3c.dom.ls.LSParserFilter"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
+<method name="parse"
+ return="org.w3c.dom.Document"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="input" type="org.w3c.dom.ls.LSInput">
+</parameter>
+<exception name="DOMException" type="org.w3c.dom.DOMException">
+</exception>
+<exception name="LSException" type="org.w3c.dom.ls.LSException">
+</exception>
+</method>
+<method name="parseURI"
+ return="org.w3c.dom.Document"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="uri" type="java.lang.String">
+</parameter>
+<exception name="DOMException" type="org.w3c.dom.DOMException">
+</exception>
+<exception name="LSException" type="org.w3c.dom.ls.LSException">
+</exception>
+</method>
+<method name="parseWithContext"
+ return="org.w3c.dom.Node"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="input" type="org.w3c.dom.ls.LSInput">
+</parameter>
+<parameter name="contextArg" type="org.w3c.dom.Node">
+</parameter>
+<parameter name="action" type="short">
+</parameter>
+<exception name="DOMException" type="org.w3c.dom.DOMException">
+</exception>
+<exception name="LSException" type="org.w3c.dom.ls.LSException">
+</exception>
+</method>
+<method name="setFilter"
+ return="void"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="filter" type="org.w3c.dom.ls.LSParserFilter">
+</parameter>
+</method>
+<field name="ACTION_APPEND_AS_CHILDREN"
+ type="short"
+ transient="false"
+ volatile="false"
+ value="1"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
+<field name="ACTION_INSERT_AFTER"
+ type="short"
+ transient="false"
+ volatile="false"
+ value="4"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
+<field name="ACTION_INSERT_BEFORE"
+ type="short"
+ transient="false"
+ volatile="false"
+ value="3"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
+<field name="ACTION_REPLACE"
+ type="short"
+ transient="false"
+ volatile="false"
+ value="5"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
+<field name="ACTION_REPLACE_CHILDREN"
+ type="short"
+ transient="false"
+ volatile="false"
+ value="2"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
+</interface>
+<interface name="LSParserFilter"
+ abstract="true"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<method name="acceptNode"
+ return="short"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="nodeArg" type="org.w3c.dom.Node">
+</parameter>
+</method>
+<method name="getWhatToShow"
+ return="int"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
+<method name="startElement"
+ return="short"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="elementArg" type="org.w3c.dom.Element">
+</parameter>
+</method>
+<field name="FILTER_ACCEPT"
+ type="short"
+ transient="false"
+ volatile="false"
+ value="1"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
+<field name="FILTER_INTERRUPT"
+ type="short"
+ transient="false"
+ volatile="false"
+ value="4"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
+<field name="FILTER_REJECT"
+ type="short"
+ transient="false"
+ volatile="false"
+ value="2"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
+<field name="FILTER_SKIP"
+ type="short"
+ transient="false"
+ volatile="false"
+ value="3"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
+</interface>
+<interface name="LSProgressEvent"
+ abstract="true"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<implements name="org.w3c.dom.events.Event">
+</implements>
+<method name="getInput"
+ return="org.w3c.dom.ls.LSInput"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
+<method name="getPosition"
+ return="int"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
+<method name="getTotalSize"
+ return="int"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
+</interface>
+<interface name="LSResourceResolver"
+ abstract="true"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<method name="resolveResource"
+ return="org.w3c.dom.ls.LSInput"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="type" type="java.lang.String">
+</parameter>
+<parameter name="namespaceURI" type="java.lang.String">
+</parameter>
+<parameter name="publicId" type="java.lang.String">
+</parameter>
+<parameter name="systemId" type="java.lang.String">
+</parameter>
+<parameter name="baseURI" type="java.lang.String">
+</parameter>
+</method>
+</interface>
+<interface name="LSSerializer"
+ abstract="true"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<method name="getDomConfig"
+ return="org.w3c.dom.DOMConfiguration"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
+<method name="getFilter"
+ return="org.w3c.dom.ls.LSSerializerFilter"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
+<method name="getNewLine"
+ return="java.lang.String"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
+<method name="setFilter"
+ return="void"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="filter" type="org.w3c.dom.ls.LSSerializerFilter">
+</parameter>
+</method>
+<method name="setNewLine"
+ return="void"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="newLine" type="java.lang.String">
+</parameter>
+</method>
+<method name="write"
+ return="boolean"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="nodeArg" type="org.w3c.dom.Node">
+</parameter>
+<parameter name="destination" type="org.w3c.dom.ls.LSOutput">
+</parameter>
+<exception name="LSException" type="org.w3c.dom.ls.LSException">
+</exception>
+</method>
+<method name="writeToString"
+ return="java.lang.String"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="nodeArg" type="org.w3c.dom.Node">
+</parameter>
+<exception name="DOMException" type="org.w3c.dom.DOMException">
+</exception>
+<exception name="LSException" type="org.w3c.dom.ls.LSException">
+</exception>
+</method>
+<method name="writeToURI"
+ return="boolean"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="nodeArg" type="org.w3c.dom.Node">
+</parameter>
+<parameter name="uri" type="java.lang.String">
+</parameter>
+<exception name="LSException" type="org.w3c.dom.ls.LSException">
+</exception>
+</method>
+</interface>
+<interface name="LSSerializerFilter"
+ abstract="true"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<implements name="org.w3c.dom.traversal.NodeFilter">
+</implements>
+<method name="getWhatToShow"
+ return="int"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
+</interface>
+</package>
+<package name="org.w3c.dom.traversal"
+>
+<interface name="DocumentTraversal"
+ abstract="true"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<method name="createNodeIterator"
+ return="org.w3c.dom.traversal.NodeIterator"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="root" type="org.w3c.dom.Node">
+</parameter>
+<parameter name="whatToShow" type="int">
+</parameter>
+<parameter name="filter" type="org.w3c.dom.traversal.NodeFilter">
+</parameter>
+<parameter name="entityReferenceExpansion" type="boolean">
+</parameter>
+<exception name="DOMException" type="org.w3c.dom.DOMException">
+</exception>
+</method>
+<method name="createTreeWalker"
+ return="org.w3c.dom.traversal.TreeWalker"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="root" type="org.w3c.dom.Node">
+</parameter>
+<parameter name="whatToShow" type="int">
+</parameter>
+<parameter name="filter" type="org.w3c.dom.traversal.NodeFilter">
+</parameter>
+<parameter name="entityReferenceExpansion" type="boolean">
+</parameter>
+<exception name="DOMException" type="org.w3c.dom.DOMException">
+</exception>
+</method>
+</interface>
+<interface name="NodeFilter"
+ abstract="true"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<method name="acceptNode"
+ return="short"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="n" type="org.w3c.dom.Node">
+</parameter>
+</method>
+<field name="FILTER_ACCEPT"
+ type="short"
+ transient="false"
+ volatile="false"
+ value="1"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
+<field name="FILTER_REJECT"
+ type="short"
+ transient="false"
+ volatile="false"
+ value="2"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
+<field name="FILTER_SKIP"
+ type="short"
+ transient="false"
+ volatile="false"
+ value="3"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
+<field name="SHOW_ALL"
+ type="int"
+ transient="false"
+ volatile="false"
+ value="-1"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
+<field name="SHOW_ATTRIBUTE"
+ type="int"
+ transient="false"
+ volatile="false"
+ value="2"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
+<field name="SHOW_CDATA_SECTION"
+ type="int"
+ transient="false"
+ volatile="false"
+ value="8"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
+<field name="SHOW_COMMENT"
+ type="int"
+ transient="false"
+ volatile="false"
+ value="128"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
+<field name="SHOW_DOCUMENT"
+ type="int"
+ transient="false"
+ volatile="false"
+ value="256"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
+<field name="SHOW_DOCUMENT_FRAGMENT"
+ type="int"
+ transient="false"
+ volatile="false"
+ value="1024"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
+<field name="SHOW_DOCUMENT_TYPE"
+ type="int"
+ transient="false"
+ volatile="false"
+ value="512"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
+<field name="SHOW_ELEMENT"
+ type="int"
+ transient="false"
+ volatile="false"
+ value="1"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
+<field name="SHOW_ENTITY"
+ type="int"
+ transient="false"
+ volatile="false"
+ value="32"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
+<field name="SHOW_ENTITY_REFERENCE"
+ type="int"
+ transient="false"
+ volatile="false"
+ value="16"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
+<field name="SHOW_NOTATION"
+ type="int"
+ transient="false"
+ volatile="false"
+ value="2048"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
+<field name="SHOW_PROCESSING_INSTRUCTION"
+ type="int"
+ transient="false"
+ volatile="false"
+ value="64"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
+<field name="SHOW_TEXT"
+ type="int"
+ transient="false"
+ volatile="false"
+ value="4"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
+</interface>
+<interface name="NodeIterator"
+ abstract="true"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<method name="detach"
+ return="void"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
+<method name="getExpandEntityReferences"
+ return="boolean"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
+<method name="getFilter"
+ return="org.w3c.dom.traversal.NodeFilter"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
+<method name="getRoot"
+ return="org.w3c.dom.Node"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
+<method name="getWhatToShow"
+ return="int"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
+<method name="nextNode"
+ return="org.w3c.dom.Node"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<exception name="DOMException" type="org.w3c.dom.DOMException">
+</exception>
+</method>
+<method name="previousNode"
+ return="org.w3c.dom.Node"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<exception name="DOMException" type="org.w3c.dom.DOMException">
+</exception>
+</method>
+</interface>
+<interface name="TreeWalker"
+ abstract="true"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<method name="firstChild"
+ return="org.w3c.dom.Node"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
+<method name="getCurrentNode"
+ return="org.w3c.dom.Node"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
+<method name="getExpandEntityReferences"
+ return="boolean"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
+<method name="getFilter"
+ return="org.w3c.dom.traversal.NodeFilter"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
+<method name="getRoot"
+ return="org.w3c.dom.Node"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
+<method name="getWhatToShow"
+ return="int"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
+<method name="lastChild"
+ return="org.w3c.dom.Node"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
+<method name="nextNode"
+ return="org.w3c.dom.Node"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
+<method name="nextSibling"
+ return="org.w3c.dom.Node"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
+<method name="parentNode"
+ return="org.w3c.dom.Node"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
+<method name="previousNode"
+ return="org.w3c.dom.Node"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
+<method name="previousSibling"
+ return="org.w3c.dom.Node"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
+<method name="setCurrentNode"
+ return="void"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="currentNode" type="org.w3c.dom.Node">
+</parameter>
+<exception name="DOMException" type="org.w3c.dom.DOMException">
+</exception>
+</method>
+</interface>
+</package>
+<package name="org.w3c.dom.views"
+>
+<interface name="AbstractView"
+ abstract="true"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<method name="getDocument"
+ return="org.w3c.dom.views.DocumentView"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
+</interface>
+<interface name="DocumentView"
+ abstract="true"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<method name="getDefaultView"
+ return="org.w3c.dom.views.AbstractView"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
+</interface>
 </package>
 <package name="org.xml.sax"
 >

core/java/android/app/Activity.java

diff --git a/core/java/android/app/Activity.java b/core/java/android/app/Activity.java
index 95142e3..05bbf3b 100644
--- a/core/java/android/app/Activity.java
+++ b/core/java/android/app/Activity.java
@@ -2518,7 +2518,7 @@
      * and restored for you.  Note that if the dialog is already created,
      * {@link #onCreateDialog(int, Bundle)} will not be called with the new
      * arguments but {@link #onPrepareDialog(int, Dialog, Bundle)} will be.
-     * If you need to rebuild the dialog, call {@link #removeDialog(int)}Êfirst.
+     * If you need to rebuild the dialog, call {@link #removeDialog(int)} first.
      * @return Returns true if the Dialog was created; false is returned if
      * it is not created because {@link #onCreateDialog(int, Bundle)} returns false.
      * 

core/java/android/app/DevicePolicyManager.java

diff --git a/core/java/android/app/DevicePolicyManager.java b/core/java/android/app/DevicePolicyManager.java
index 9de7336..135851f 100644
--- a/core/java/android/app/DevicePolicyManager.java
+++ b/core/java/android/app/DevicePolicyManager.java
@@ -32,6 +32,7 @@
 import android.util.Log;
 
 import java.io.IOException;
+import java.util.List;
 
 /**
  * Public interface for managing policies enforced on a device.  Most clients
@@ -65,10 +66,6 @@
      * <p>You can optionally include the {@link #EXTRA_ADD_EXPLANATION}
      * field to provide the user with additional explanation (in addition
      * to your component's description) about what is being added.
-     * 
-     * <p>Note: the current platform can only have one device administrator
-     * active at a time.  If you make this request while there is already
-     * an active administrator, this new request will be canceled automatically.
      */
     @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION)
     public static final String ACTION_ADD_DEVICE_ADMIN
@@ -111,7 +108,7 @@
     public boolean isAdminActive(ComponentName who) {
         if (mService != null) {
             try {
-                return who.equals(mService.getActiveAdmin());
+                return mService.isAdminActive(who);
             } catch (RemoteException e) {
                 Log.w(TAG, "Failed talking with device policy service", e);
             }
@@ -120,6 +117,22 @@
     }
     
     /**
+     * Return a list of all currently active device administrator's component
+     * names.  Note that if there are no administrators than null may be
+     * returned.
+     */
+    public List<ComponentName> getActiveAdmins() {
+        if (mService != null) {
+            try {
+                return mService.getActiveAdmins();
+            } catch (RemoteException e) {
+                Log.w(TAG, "Failed talking with device policy service", e);
+            }
+        }
+        return null;
+    }
+    
+    /**
      * Remove a current administration component.  This can only be called
      * by the application that owns the administration component; if you
      * try to remove someone else's component, a security exception will be
@@ -442,26 +455,7 @@
     /**
      * @hide
      */
-    public ComponentName getActiveAdmin() {
-        if (mService != null) {
-            try {
-                return mService.getActiveAdmin();
-            } catch (RemoteException e) {
-                Log.w(TAG, "Failed talking with device policy service", e);
-            }
-        }
-        return null;
-    }
-    
-    /**
-     * @hide
-     */
-    public DeviceAdminInfo getActiveAdminInfo() {
-        ComponentName cn = getActiveAdmin();
-        if (cn == null) {
-            return null;
-        }
-        
+    public DeviceAdminInfo getAdminInfo(ComponentName cn) {
         ActivityInfo ai;
         try {
             ai = mContext.getPackageManager().getReceiverInfo(cn,

core/java/android/app/IDevicePolicyManager.aidl

diff --git a/core/java/android/app/IDevicePolicyManager.aidl b/core/java/android/app/IDevicePolicyManager.aidl
index edb8603..a5508cd 100644
--- a/core/java/android/app/IDevicePolicyManager.aidl
+++ b/core/java/android/app/IDevicePolicyManager.aidl
@@ -45,7 +45,8 @@
     void wipeData(int flags);
     
     void setActiveAdmin(in ComponentName policyReceiver);
-    ComponentName getActiveAdmin();
+    boolean isAdminActive(in ComponentName policyReceiver);
+    List<ComponentName> getActiveAdmins();
     void getRemoveWarning(in ComponentName policyReceiver, in RemoteCallback result);
     void removeActiveAdmin(in ComponentName policyReceiver);
     

core/java/android/content/SyncManager.java

diff --git a/core/java/android/content/SyncManager.java b/core/java/android/content/SyncManager.java
index c9077bc..699b61d 100644
--- a/core/java/android/content/SyncManager.java
+++ b/core/java/android/content/SyncManager.java
@@ -31,6 +31,7 @@
 import android.content.pm.ResolveInfo;
 import android.content.pm.RegisteredServicesCache;
 import android.content.pm.ProviderInfo;
+import android.content.pm.RegisteredServicesCacheListener;
 import android.net.ConnectivityManager;
 import android.net.NetworkInfo;
 import android.os.Bundle;
@@ -325,6 +326,14 @@
         mSyncHandler = new SyncHandler(syncThread.getLooper());
 
         mSyncAdapters = new SyncAdaptersCache(mContext);
+        mSyncAdapters.setListener(new RegisteredServicesCacheListener<SyncAdapterType>() {
+            public void onServiceChanged(SyncAdapterType type, boolean removed) {
+                if (!removed) {
+                    scheduleSync(null, type.authority, null, 0 /* no delay */,
+                            false /* onlyThoseWithUnkownSyncableState */);
+                }
+            }
+        }, mSyncHandler);
 
         mSyncAlarmIntent = PendingIntent.getBroadcast(
                 mContext, 0 /* ignored */, new Intent(ACTION_SYNC_ALARM), 0);

core/java/android/hardware/Camera.java

diff --git a/core/java/android/hardware/Camera.java b/core/java/android/hardware/Camera.java
index 4c4455a..abb74cd 100644
--- a/core/java/android/hardware/Camera.java
+++ b/core/java/android/hardware/Camera.java
@@ -552,8 +552,8 @@
      * be called during preview.
      *
      * @param degrees the angle that the picture will be rotated clockwise.
-     *                Valid values are 0, 90, 180, and 270.
-     * @hide
+     *                Valid values are 0, 90, 180, and 270. The starting
+     *                position is 0 (landscape).
      */
     public native final void setDisplayOrientation(int degrees);
 

core/java/android/preference/PreferenceManager.java

diff --git a/core/java/android/preference/PreferenceManager.java b/core/java/android/preference/PreferenceManager.java
index fe3471d..2b20946 100644
--- a/core/java/android/preference/PreferenceManager.java
+++ b/core/java/android/preference/PreferenceManager.java
@@ -134,10 +134,7 @@
     
     private OnPreferenceTreeClickListener mOnPreferenceTreeClickListener;
     
-    /**
-     * @hide
-     */
-    public PreferenceManager(Activity activity, int firstRequestCode) {
+    PreferenceManager(Activity activity, int firstRequestCode) {
         mActivity = activity;
         mNextRequestCode = firstRequestCode;
         

core/java/android/view/View.java

diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java
index a3d3521..31c9b08 100644
--- a/core/java/android/view/View.java
+++ b/core/java/android/view/View.java
@@ -3789,7 +3789,8 @@
      * ViewGroups should override to route to their children.
      * @param changedView The view whose visibility changed. Could be 'this' or
      * an ancestor view.
-     * @param visibility The new visibility of changedView.
+     * @param visibility The new visibility of changedView: {@link #VISIBLE},
+     * {@link #INVISIBLE} or {@link #GONE}.
      */
     protected void dispatchVisibilityChanged(View changedView, int visibility) {
         onVisibilityChanged(changedView, visibility);
@@ -3799,12 +3800,38 @@
      * Called when the visibility of the view or an ancestor of the view is changed.
      * @param changedView The view whose visibility changed. Could be 'this' or
      * an ancestor view.
-     * @param visibility The new visibility of changedView.
+     * @param visibility The new visibility of changedView: {@link #VISIBLE},
+     * {@link #INVISIBLE} or {@link #GONE}.
      */
     protected void onVisibilityChanged(View changedView, int visibility) {
     }
 
     /**
+     * Dispatch a hint about whether this view is displayed. For instance, when
+     * a View moves out of the screen, it might receives a display hint indicating
+     * the view is not displayed. Applications should not <em>rely</em> on this hint
+     * as there is no guarantee that they will receive one.
+     * 
+     * @param hint A hint about whether or not this view is displayed:
+     * {@link #VISIBLE} or {@link #INVISIBLE}.
+     */
+    public void dispatchDisplayHint(int hint) {
+        onDisplayHint(hint);
+    }
+
+    /**
+     * Gives this view a hint about whether is displayed or not. For instance, when
+     * a View moves out of the screen, it might receives a display hint indicating
+     * the view is not displayed. Applications should not <em>rely</em> on this hint
+     * as there is no guarantee that they will receive one.
+     * 
+     * @param hint A hint about whether or not this view is displayed:
+     * {@link #VISIBLE} or {@link #INVISIBLE}.
+     */
+    protected void onDisplayHint(int hint) {
+    }
+
+    /**
      * Dispatch a window visibility change down the view hierarchy.
      * ViewGroups should override to route to their children.
      *

core/java/android/view/ViewGroup.java

diff --git a/core/java/android/view/ViewGroup.java b/core/java/android/view/ViewGroup.java
index 49c2d0e..cdf9eb0 100644
--- a/core/java/android/view/ViewGroup.java
+++ b/core/java/android/view/ViewGroup.java
@@ -679,6 +679,19 @@
             }
         }
     }
+    
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void dispatchDisplayHint(int hint) {
+        super.dispatchDisplayHint(hint);
+        final int count = mChildrenCount;
+        final View[] children = mChildren;
+        for (int i = 0; i < count; i++) {
+            children[i].dispatchDisplayHint(hint);
+        }
+    }
 
     /**
      * {@inheritDoc}

core/java/android/widget/AbsListView.java

diff --git a/core/java/android/widget/AbsListView.java b/core/java/android/widget/AbsListView.java
index b795080..3a4b92d 100644
--- a/core/java/android/widget/AbsListView.java
+++ b/core/java/android/widget/AbsListView.java
@@ -2852,6 +2852,23 @@
         checkSelectionChanged();
     }
 
+    @Override
+    protected void onDisplayHint(int hint) {
+        super.onDisplayHint(hint);
+        switch (hint) {
+            case INVISIBLE:
+                if (mPopup != null && mPopup.isShowing()) {
+                    dismissPopup();
+                }
+                break;
+            case VISIBLE:
+                if (mFiltered && mPopup != null && !mPopup.isShowing()) {
+                    showPopup();
+                }
+                break;
+        }
+    }
+
     /**
      * Removes the filter window
      */
@@ -3140,7 +3157,7 @@
             }
         } else {
             // Hide the popup when we are no longer visible
-            if (mPopup.isShowing()) {
+            if (mPopup != null && mPopup.isShowing()) {
                 dismissPopup();
             }
         }

core/java/android/widget/AutoCompleteTextView.java

diff --git a/core/java/android/widget/AutoCompleteTextView.java b/core/java/android/widget/AutoCompleteTextView.java
index d53a442..0f47b96 100644
--- a/core/java/android/widget/AutoCompleteTextView.java
+++ b/core/java/android/widget/AutoCompleteTextView.java
@@ -1033,6 +1033,18 @@
     }
 
     @Override
+    protected void onDisplayHint(int hint) {
+        super.onDisplayHint(hint);
+        switch (hint) {
+            case INVISIBLE:
+                if (!mDropDownAlwaysVisible) {
+                    dismissDropDown();
+                }
+                break;
+        }
+    }
+
+    @Override
     protected void onFocusChanged(boolean focused, int direction, Rect previouslyFocusedRect) {
         super.onFocusChanged(focused, direction, previouslyFocusedRect);
         // Perform validation if the view is losing focus.

core/java/android/widget/HorizontalScrollView.java

diff --git a/core/java/android/widget/HorizontalScrollView.java b/core/java/android/widget/HorizontalScrollView.java
index 52f56a7..4cc3b9e 100644
--- a/core/java/android/widget/HorizontalScrollView.java
+++ b/core/java/android/widget/HorizontalScrollView.java
@@ -63,7 +63,7 @@
     private long mLastScroll;
 
     private final Rect mTempRect = new Rect();
-    private Scroller mScroller;
+    private OverScroller mScroller;
 
     /**
      * Flag to indicate that we are moving focus ourselves. This is so the
@@ -177,7 +177,7 @@
 
 
     private void initScrollView() {
-        mScroller = new Scroller(getContext());
+        mScroller = new OverScroller(getContext());
         setFocusable(true);
         setDescendantFocusability(FOCUS_AFTER_DESCENDANTS);
         setWillNotDraw(false);
@@ -380,11 +380,6 @@
             return true;
         }
 
-        if (!canScroll()) {
-            mIsBeingDragged = false;
-            return false;
-        }
-
         final float x = ev.getX();
 
         switch (action) {
@@ -440,10 +435,6 @@
             return false;
         }
 
-        if (!canScroll()) {
-            return false;
-        }
-
         if (mVelocityTracker == null) {
             mVelocityTracker = VelocityTracker.obtain();
         }
@@ -470,25 +461,23 @@
                 final int deltaX = (int) (mLastMotionX - x);
                 mLastMotionX = x;
 
-                if (deltaX < 0) {
-                    if (mScrollX > 0) {
-                        scrollBy(deltaX, 0);
-                    }
-                } else if (deltaX > 0) {
-                    final int rightEdge = getWidth() - mPaddingRight;
-                    final int availableToScroll = getChildAt(0).getRight() - mScrollX - rightEdge;
-                    if (availableToScroll > 0) {
-                        scrollBy(Math.min(availableToScroll, deltaX), 0);
-                    }
-                }
+                super.scrollTo(mScrollX + deltaX, mScrollY);
                 break;
             case MotionEvent.ACTION_UP:
                 final VelocityTracker velocityTracker = mVelocityTracker;
                 velocityTracker.computeCurrentVelocity(1000, mMaximumVelocity);
                 int initialVelocity = (int) velocityTracker.getXVelocity();
 
-                if ((Math.abs(initialVelocity) > mMinimumVelocity) && getChildCount() > 0) {
-                    fling(-initialVelocity);
+                if (getChildCount() > 0) {
+                    if ((Math.abs(initialVelocity) > mMinimumVelocity)) {
+                        fling(-initialVelocity);
+                    } else {
+                        final int right = Math.max(0, getChildAt(0).getHeight() - 
+                                (getHeight() - mPaddingRight - mPaddingLeft));
+                        if (mScroller.springback(mScrollX, mScrollY, 0, 0, right, 0)) {
+                            invalidate();
+                        }
+                    }
                 }
 
                 if (mVelocityTracker != null) {
@@ -913,14 +902,10 @@
             int oldY = mScrollY;
             int x = mScroller.getCurrX();
             int y = mScroller.getCurrY();
-            if (getChildCount() > 0) {
-                View child = getChildAt(0);
-                mScrollX = clamp(x, getWidth() - mPaddingRight - mPaddingLeft, child.getWidth());
-                mScrollY = clamp(y, getHeight() - mPaddingBottom - mPaddingTop, child.getHeight());
-            } else {
-                mScrollX = x;
-                mScrollY = y;
-            }
+
+            mScrollX = x;
+            mScrollY = y;
+
             if (oldX != mScrollX || oldY != mScrollY) {
                 onScrollChanged(mScrollX, mScrollY, oldX, oldY);
             }
@@ -1156,7 +1141,8 @@
             int width = getWidth() - mPaddingRight - mPaddingLeft;
             int right = getChildAt(0).getWidth();
     
-            mScroller.fling(mScrollX, mScrollY, velocityX, 0, 0, right - width, 0, 0);
+            mScroller.fling(mScrollX, mScrollY, velocityX, 0, 0, 
+                    Math.max(0, right - width), 0, 0, width/2, 0);
     
             final boolean movingRight = velocityX > 0;
     

core/java/android/widget/OverScroller.java

diff --git a/core/java/android/widget/OverScroller.java b/core/java/android/widget/OverScroller.java
new file mode 100644
index 0000000..3fd5dcc
--- /dev/null
+++ b/core/java/android/widget/OverScroller.java
@@ -0,0 +1,354 @@
+/*
+ * Copyright (C) 2006 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package android.widget;
+
+import android.content.Context;
+import android.view.animation.AccelerateDecelerateInterpolator;
+import android.view.animation.DecelerateInterpolator;
+
+/**
+ * This class encapsulates scrolling with the ability to overshoot the bounds
+ * of a scrolling operation. This class attempts to be a drop-in replacement
+ * for {@link android.widget.Scroller} in most cases.
+ * 
+ * @hide Pending API approval
+ */
+public class OverScroller {
+    private static final int SPRINGBACK_DURATION = 150;
+    private static final int OVERFLING_DURATION = 150;
+    
+    private static final int MODE_DEFAULT = 0;
+    private static final int MODE_OVERFLING = 1;
+    private static final int MODE_SPRINGBACK = 2;
+    
+    private Scroller mDefaultScroller;
+    private Scroller mDecelScroller;
+    private Scroller mAccelDecelScroller;
+    private Scroller mCurrScroller;
+    
+    private int mScrollMode = MODE_DEFAULT;
+    
+    private int mMinimumX;
+    private int mMinimumY;
+    private int mMaximumX;
+    private int mMaximumY;
+    
+    public OverScroller(Context context) {
+        mDefaultScroller = new Scroller(context);
+        mDecelScroller = new Scroller(context, new DecelerateInterpolator(3.f));
+        mAccelDecelScroller = new Scroller(context, new AccelerateDecelerateInterpolator());
+        mCurrScroller = mDefaultScroller;
+    }
+    
+    /**
+     * Call this when you want to know the new location.  If it returns true,
+     * the animation is not yet finished.  loc will be altered to provide the
+     * new location.
+     */ 
+    public boolean computeScrollOffset() {
+        boolean inProgress = mCurrScroller.computeScrollOffset();
+        
+        switch (mScrollMode) {
+        case MODE_OVERFLING:
+            if (!inProgress) {
+                // Overfling ended
+                if (springback(mCurrScroller.getCurrX(), mCurrScroller.getCurrY(),
+                        mMinimumX, mMaximumX, mMinimumY, mMaximumY, mAccelDecelScroller)) {
+                    return mCurrScroller.computeScrollOffset();
+                } else {
+                    mCurrScroller = mDefaultScroller;
+                    mScrollMode = MODE_DEFAULT;
+                }
+            }
+            break;
+            
+        case MODE_SPRINGBACK:
+            if (!inProgress) {
+                mCurrScroller = mDefaultScroller;
+                mScrollMode = MODE_DEFAULT;
+            }
+            break;
+            
+        case MODE_DEFAULT:
+            // Fling/autoscroll - did we go off the edge?
+            if (inProgress) {
+                Scroller scroller = mCurrScroller;
+                final int x = scroller.getCurrX();
+                final int y = scroller.getCurrY();
+                final int minX = mMinimumX;
+                final int maxX = mMaximumX;
+                final int minY = mMinimumY;
+                final int maxY = mMaximumY;
+                if (x < minX || x > maxX || y < minY || y > maxY) {
+                    final int startx = scroller.getStartX();
+                    final int starty = scroller.getStartY();
+                    final int time = scroller.timePassed();
+                    final float timeSecs = time / 1000.f;
+                    final float xvel = ((x - startx) / timeSecs);
+                    final float yvel = ((y - starty) / timeSecs);
+                    
+                    if ((x < minX && xvel > 0) || (y < minY && yvel > 0) ||
+                            (x > maxX && xvel < 0) || (y > maxY && yvel < 0)) {
+                        // If our velocity would take us back into valid areas,
+                        // try to springback rather than overfling.
+                        if (springback(x, y, minX, maxX, minY, maxY)) {
+                            return mCurrScroller.computeScrollOffset();
+                        }
+                    } else {
+                        overfling(x, y, xvel, yvel);
+                        return mCurrScroller.computeScrollOffset();
+                    }
+                }
+            }
+            break;
+        }
+        
+        return inProgress;
+    }
+    
+    private void overfling(int startx, int starty, float xvel, float yvel) {
+        Scroller scroller = mDecelScroller;
+        final float durationSecs = (OVERFLING_DURATION / 1000.f);
+        int dx = (int)(xvel * durationSecs) / 8;
+        int dy = (int)(yvel * durationSecs) / 8;
+        scroller.startScroll(startx, starty, dx, dy, OVERFLING_DURATION);
+        mCurrScroller.abortAnimation();
+        mCurrScroller = scroller;
+        mScrollMode = MODE_OVERFLING;
+    }
+    
+    /**
+     * Call this when you want to 'spring back' into a valid coordinate range.
+     *
+     * @param startX Starting X coordinate
+     * @param startY Starting Y coordinate
+     * @param minX Minimum valid X value
+     * @param maxX Maximum valid X value
+     * @param minY Minimum valid Y value
+     * @param maxY Minimum valid Y value
+     * @return true if a springback was initiated, false if startX/startY was
+     *          already within the valid range.
+     */
+    public boolean springback(int startX, int startY, int minX, int maxX,
+            int minY, int maxY) {
+        return springback(startX, startY, minX, maxX, minY, maxY, mDecelScroller);
+    }
+    
+    private boolean springback(int startX, int startY, int minX, int maxX,
+            int minY, int maxY, Scroller scroller) {
+        int xoff = 0;
+        int yoff = 0;
+        if (startX < minX) {
+            xoff = minX - startX;
+        } else if (startX > maxX) {
+            xoff = maxX - startX;
+        }
+        if (startY < minY) {
+            yoff = minY - startY;
+        } else if (startY > maxY) {
+            yoff = maxY - startY;
+        }
+        
+        if (xoff != 0 || yoff != 0) {
+            scroller.startScroll(startX, startY, xoff, yoff, SPRINGBACK_DURATION);
+            mCurrScroller.abortAnimation();
+            mCurrScroller = scroller;
+            mScrollMode = MODE_SPRINGBACK;
+            return true;
+        }
+        
+        return false;
+    }
+
+    /**
+     * 
+     * Returns whether the scroller has finished scrolling.
+     * 
+     * @return True if the scroller has finished scrolling, false otherwise.
+     */
+    public final boolean isFinished() {
+        return mCurrScroller.isFinished();
+    }
+
+    /**
+     * Returns the current X offset in the scroll. 
+     * 
+     * @return The new X offset as an absolute distance from the origin.
+     */
+    public final int getCurrX() {
+        return mCurrScroller.getCurrX();
+    }
+    
+    /**
+     * Returns the current Y offset in the scroll. 
+     * 
+     * @return The new Y offset as an absolute distance from the origin.
+     */
+    public final int getCurrY() {
+        return mCurrScroller.getCurrY();
+    }
+    
+    /**
+     * Stops the animation, resets any springback/overfling and completes
+     * any standard flings/scrolls in progress.
+     */
+    public void abortAnimation() {
+        mCurrScroller.abortAnimation();
+        mCurrScroller = mDefaultScroller;
+        mScrollMode = MODE_DEFAULT;
+        mCurrScroller.abortAnimation();
+    }
+    
+    /**
+     * Start scrolling by providing a starting point and the distance to travel.
+     * The scroll will use the default value of 250 milliseconds for the
+     * duration.
+     * 
+     * @param startX Starting horizontal scroll offset in pixels. Positive
+     *        numbers will scroll the content to the left.
+     * @param startY Starting vertical scroll offset in pixels. Positive numbers
+     *        will scroll the content up.
+     * @param dx Horizontal distance to travel. Positive numbers will scroll the
+     *        content to the left.
+     * @param dy Vertical distance to travel. Positive numbers will scroll the
+     *        content up.
+     */
+    public void startScroll(int startX, int startY, int dx, int dy) {
+        mCurrScroller.abortAnimation();
+        mCurrScroller = mDefaultScroller;
+        mScrollMode = MODE_DEFAULT;
+        mMinimumX = Math.min(startX, startX + dx);
+        mMinimumY = Math.min(startY, startY + dy);
+        mMaximumX = Math.max(startX, startX + dx);
+        mMaximumY = Math.max(startY, startY + dy);
+        mCurrScroller.startScroll(startX, startY, dx, dy);
+    }
+
+    /**
+     * Start scrolling by providing a starting point and the distance to travel.
+     * 
+     * @param startX Starting horizontal scroll offset in pixels. Positive
+     *        numbers will scroll the content to the left.
+     * @param startY Starting vertical scroll offset in pixels. Positive numbers
+     *        will scroll the content up.
+     * @param dx Horizontal distance to travel. Positive numbers will scroll the
+     *        content to the left.
+     * @param dy Vertical distance to travel. Positive numbers will scroll the
+     *        content up.
+     * @param duration Duration of the scroll in milliseconds.
+     */
+    public void startScroll(int startX, int startY, int dx, int dy, int duration) {
+        mCurrScroller.abortAnimation();
+        mCurrScroller = mDefaultScroller;
+        mScrollMode = MODE_DEFAULT;
+        mMinimumX = Math.min(startX, startX + dx);
+        mMinimumY = Math.min(startY, startY + dy);
+        mMaximumX = Math.max(startX, startX + dx);
+        mMaximumY = Math.max(startY, startY + dy);
+        mCurrScroller.startScroll(startX, startY, dx, dy, duration);
+    }
+    
+    /**
+     * Returns the duration of the active scroll in progress; standard, fling,
+     * springback, or overfling. Does not account for any overflings or springback
+     * that may result.
+     */
+    public int getDuration() {
+        return mCurrScroller.getDuration();
+    }
+
+    /**
+     * Start scrolling based on a fling gesture. The distance travelled will
+     * depend on the initial velocity of the fling.
+     * 
+     * @param startX Starting point of the scroll (X)
+     * @param startY Starting point of the scroll (Y)
+     * @param velocityX Initial velocity of the fling (X) measured in pixels per
+     *        second.
+     * @param velocityY Initial velocity of the fling (Y) measured in pixels per
+     *        second
+     * @param minX Minimum X value. The scroller will not scroll past this
+     *        point.
+     * @param maxX Maximum X value. The scroller will not scroll past this
+     *        point.
+     * @param minY Minimum Y value. The scroller will not scroll past this
+     *        point.
+     * @param maxY Maximum Y value. The scroller will not scroll past this
+     *        point.
+     */
+    public void fling(int startX, int startY, int velocityX, int velocityY,
+            int minX, int maxX, int minY, int maxY) {
+        this.fling(startX, startY, velocityX, velocityY, minX, maxX, minY, maxY, 0, 0);
+    }
+
+    /**
+     * Start scrolling based on a fling gesture. The distance travelled will
+     * depend on the initial velocity of the fling.
+     * 
+     * @param startX Starting point of the scroll (X)
+     * @param startY Starting point of the scroll (Y)
+     * @param velocityX Initial velocity of the fling (X) measured in pixels per
+     *        second.
+     * @param velocityY Initial velocity of the fling (Y) measured in pixels per
+     *        second
+     * @param minX Minimum X value. The scroller will not scroll past this
+     *        point unless overX > 0. If overfling is allowed, it will use minX
+     *        as a springback boundary.
+     * @param maxX Maximum X value. The scroller will not scroll past this
+     *        point unless overX > 0. If overfling is allowed, it will use maxX
+     *        as a springback boundary.
+     * @param minY Minimum Y value. The scroller will not scroll past this
+     *        point unless overY > 0. If overfling is allowed, it will use minY
+     *        as a springback boundary.
+     * @param maxY Maximum Y value. The scroller will not scroll past this
+     *        point unless overY > 0. If overfling is allowed, it will use maxY
+     *        as a springback boundary.
+     * @param overX Overfling range. If > 0, horizontal overfling in either
+     *        direction will be possible.
+     * @param overY Overfling range. If > 0, vertical overfling in either
+     *        direction will be possible.
+     */
+    public void fling(int startX, int startY, int velocityX, int velocityY,
+            int minX, int maxX, int minY, int maxY, int overX, int overY) {
+        mCurrScroller = mDefaultScroller;
+        mScrollMode = MODE_DEFAULT;
+        mMinimumX = minX;
+        mMaximumX = maxX;
+        mMinimumY = minY;
+        mMaximumY = maxY;
+        mCurrScroller.fling(startX, startY, velocityX, velocityY, 
+                minX - overX, maxX + overX, minY - overY, maxY + overY);
+    }
+
+    /**
+     * Returns where the scroll will end. Valid only for "fling" scrolls.
+     * 
+     * @return The final X offset as an absolute distance from the origin.
+     */
+    public int getFinalX() {
+        return mCurrScroller.getFinalX();
+    }
+    
+    /**
+     * Returns where the scroll will end. Valid only for "fling" scrolls.
+     * 
+     * @return The final Y offset as an absolute distance from the origin.
+     */
+    public int getFinalY() {
+        return mCurrScroller.getFinalY();
+    }
+}

core/java/android/widget/ProgressBar.java

diff --git a/core/java/android/widget/ProgressBar.java b/core/java/android/widget/ProgressBar.java
index 2f28d9f..1dcb203 100644
--- a/core/java/android/widget/ProgressBar.java
+++ b/core/java/android/widget/ProgressBar.java
@@ -177,6 +177,8 @@
         Drawable drawable = a.getDrawable(R.styleable.ProgressBar_progressDrawable);
         if (drawable != null) {
             drawable = tileify(drawable, false);
+            // Calling this method can set mMaxHeight, make sure the corresponding
+            // XML attribute for mMaxHeight is read after calling this method
             setProgressDrawable(drawable);
         }
 
@@ -421,6 +423,13 @@
     public void setProgressDrawable(Drawable d) {
         if (d != null) {
             d.setCallback(this);
+
+            // Make sure the ProgressBar is always tall enough
+            int drawableHeight = d.getMinimumHeight();
+            if (mMaxHeight < drawableHeight) {
+                mMaxHeight = drawableHeight;
+                requestLayout();
+            }
         }
         mProgressDrawable = d;
         if (!mIndeterminate) {

core/java/android/widget/ScrollView.java

diff --git a/core/java/android/widget/ScrollView.java b/core/java/android/widget/ScrollView.java
index bf16e28..62797f3 100644
--- a/core/java/android/widget/ScrollView.java
+++ b/core/java/android/widget/ScrollView.java
@@ -16,6 +16,8 @@
 
 package android.widget;
 
+import com.android.internal.R;
+
 import android.content.Context;
 import android.content.res.TypedArray;
 import android.graphics.Rect;
@@ -30,8 +32,6 @@
 import android.view.ViewParent;
 import android.view.animation.AnimationUtils;
 
-import com.android.internal.R;
-
 import java.util.List;
 
 /**
@@ -59,7 +59,7 @@
     private long mLastScroll;
 
     private final Rect mTempRect = new Rect();
-    private Scroller mScroller;
+    private OverScroller mScroller;
 
     /**
      * Flag to indicate that we are moving focus ourselves. This is so the
@@ -173,7 +173,7 @@
 
 
     private void initScrollView() {
-        mScroller = new Scroller(getContext());
+        mScroller = new OverScroller(getContext());
         setFocusable(true);
         setDescendantFocusability(FOCUS_AFTER_DESCENDANTS);
         setWillNotDraw(false);
@@ -378,11 +378,6 @@
             return true;
         }
 
-        if (!canScroll()) {
-            mIsBeingDragged = false;
-            return false;
-        }
-
         final float y = ev.getY();
 
         switch (action) {
@@ -437,10 +432,6 @@
             // descendants.
             return false;
         }
-        
-        if (!canScroll()) {
-            return false;
-        }
 
         if (mVelocityTracker == null) {
             mVelocityTracker = VelocityTracker.obtain();
@@ -468,25 +459,23 @@
                 final int deltaY = (int) (mLastMotionY - y);
                 mLastMotionY = y;
 
-                if (deltaY < 0) {
-                    if (mScrollY > 0) {
-                        scrollBy(0, deltaY);
-                    }
-                } else if (deltaY > 0) {
-                    final int bottomEdge = getHeight() - mPaddingBottom;
-                    final int availableToScroll = getChildAt(0).getBottom() - mScrollY - bottomEdge;
-                    if (availableToScroll > 0) {
-                        scrollBy(0, Math.min(availableToScroll, deltaY));
-                    }
-                }
+                super.scrollTo(mScrollX, mScrollY + deltaY);
                 break;
             case MotionEvent.ACTION_UP:
                 final VelocityTracker velocityTracker = mVelocityTracker;
                 velocityTracker.computeCurrentVelocity(1000, mMaximumVelocity);
                 int initialVelocity = (int) velocityTracker.getYVelocity();
 
-                if ((Math.abs(initialVelocity) > mMinimumVelocity) && getChildCount() > 0) {
-                    fling(-initialVelocity);
+                if (getChildCount() > 0) {
+                    if ((Math.abs(initialVelocity) > mMinimumVelocity)) {
+                        fling(-initialVelocity);
+                    } else {
+                        final int bottom = Math.max(0, getChildAt(0).getHeight() - 
+                                (getHeight() - mPaddingBottom - mPaddingTop));
+                        if (mScroller.springback(mScrollX, mScrollY, 0, 0, 0, bottom)) {
+                            invalidate();
+                        }
+                    }
                 }
 
                 if (mVelocityTracker != null) {
@@ -915,14 +904,10 @@
             int oldY = mScrollY;
             int x = mScroller.getCurrX();
             int y = mScroller.getCurrY();
-            if (getChildCount() > 0) {
-                View child = getChildAt(0);
-                mScrollX = clamp(x, getWidth() - mPaddingRight - mPaddingLeft, child.getWidth());
-                mScrollY = clamp(y, getHeight() - mPaddingBottom - mPaddingTop, child.getHeight());
-            } else {
-                mScrollX = x;
-                mScrollY = y;
-            }            
+
+            mScrollX = x;
+            mScrollY = y;
+
             if (oldX != mScrollX || oldY != mScrollY) {
                 onScrollChanged(mScrollX, mScrollY, oldX, oldY);
             }
@@ -1159,7 +1144,8 @@
             int height = getHeight() - mPaddingBottom - mPaddingTop;
             int bottom = getChildAt(0).getHeight();
     
-            mScroller.fling(mScrollX, mScrollY, 0, velocityY, 0, 0, 0, bottom - height);
+            mScroller.fling(mScrollX, mScrollY, 0, velocityY, 0, 0, 0, 
+                    Math.max(0, bottom - height), 0, height/2);
     
             final boolean movingDown = velocityY > 0;
     

core/java/android/widget/ViewAnimator.java

diff --git a/core/java/android/widget/ViewAnimator.java b/core/java/android/widget/ViewAnimator.java
index 4112501..907cfb3 100644
--- a/core/java/android/widget/ViewAnimator.java
+++ b/core/java/android/widget/ViewAnimator.java
@@ -138,14 +138,15 @@
         final int count = getChildCount();
         for (int i = 0; i < count; i++) {
             final View child = getChildAt(i);
+            final boolean checkForFirst = (!mFirstTime || mAnimateFirstTime);
             if (i == childIndex) {
-                if ((!mFirstTime || mAnimateFirstTime) && mInAnimation != null) {
+                if (checkForFirst && mInAnimation != null) {
                     child.startAnimation(mInAnimation);
                 }
                 child.setVisibility(View.VISIBLE);
                 mFirstTime = false;
             } else {
-                if (mOutAnimation != null && child.getVisibility() == View.VISIBLE) {
+                if (checkForFirst && mOutAnimation != null && child.getVisibility() == View.VISIBLE) {
                     child.startAnimation(mOutAnimation);
                 } else if (child.getAnimation() == mInAnimation)
                     child.clearAnimation();

core/java/com/android/internal/widget/ContactHeaderWidget.java

diff --git a/core/java/com/android/internal/widget/ContactHeaderWidget.java b/core/java/com/android/internal/widget/ContactHeaderWidget.java
index 33fd936..c4f9988 100644
--- a/core/java/com/android/internal/widget/ContactHeaderWidget.java
+++ b/core/java/com/android/internal/widget/ContactHeaderWidget.java
@@ -201,7 +201,7 @@
             mNoPhotoResource = R.drawable.ic_contact_picture_3;
         }
 
-        mQueryHandler = new QueryHandler(mContentResolver);
+        resetAsyncQueryHandler();
     }
 
     public void enableClickListeners() {
@@ -237,6 +237,11 @@
         @Override
         protected void onQueryComplete(int token, Object cookie, Cursor cursor) {
             try{
+                if (this != mQueryHandler) {
+                    Log.d(TAG, "onQueryComplete: discard result, the query handler is reset!");
+                    return;
+                }
+
                 switch (token) {
                     case TOKEN_PHOTO_QUERY: {
                         //Set the photo
@@ -263,8 +268,14 @@
                             bindContactInfo(cursor);
                             Uri lookupUri = Contacts.getLookupUri(cursor.getLong(ContactQuery._ID),
                                     cursor.getString(ContactQuery.LOOKUP_KEY));
-                            startPhotoQuery(cursor.getLong(ContactQuery.PHOTO_ID), lookupUri);
+                            startPhotoQuery(cursor.getLong(ContactQuery.PHOTO_ID),
+                                    lookupUri, false /* don't reset query handler */);
                             invalidate();
+                        } else {
+                            // shouldn't really happen
+                            setDisplayName(null, null);
+                            setSocialSnippet(null);
+                            setPhoto(loadPlaceholderPhoto(null));
                         }
                         break;
                     }
@@ -273,11 +284,13 @@
                             long contactId = cursor.getLong(PHONE_LOOKUP_CONTACT_ID_COLUMN_INDEX);
                             String lookupKey = cursor.getString(
                                     PHONE_LOOKUP_CONTACT_LOOKUP_KEY_COLUMN_INDEX);
-                            bindFromContactUri(Contacts.getLookupUri(contactId, lookupKey));
+                            bindFromContactUriInternal(Contacts.getLookupUri(contactId, lookupKey),
+                                    false /* don't reset query handler */);
                         } else {
                             String phoneNumber = (String) cookie;
                             setDisplayName(phoneNumber, null);
                             setSocialSnippet(null);
+                            setPhoto(loadPlaceholderPhoto(null));
                             mPhotoView.assignContactFromPhone(phoneNumber, true);
                         }
                         break;
@@ -287,11 +300,13 @@
                             long contactId = cursor.getLong(EMAIL_LOOKUP_CONTACT_ID_COLUMN_INDEX);
                             String lookupKey = cursor.getString(
                                     EMAIL_LOOKUP_CONTACT_LOOKUP_KEY_COLUMN_INDEX);
-                            bindFromContactUri(Contacts.getLookupUri(contactId, lookupKey));
+                            bindFromContactUriInternal(Contacts.getLookupUri(contactId, lookupKey),
+                                    false /* don't reset query handler */);
                         } else {
                             String emailAddress = (String) cookie;
                             setDisplayName(emailAddress, null);
                             setSocialSnippet(null);
+                            setPhoto(loadPlaceholderPhoto(null));
                             mPhotoView.assignContactFromEmail(emailAddress, true);
                         }
                         break;
@@ -397,22 +412,22 @@
      * Convenience method for binding all available data from an existing
      * contact.
      *
-     * @param conatctUri a {Contacts.CONTENT_LOOKUP_URI} style URI.
+     * @param contactLookupUri a {Contacts.CONTENT_LOOKUP_URI} style URI.
      */
     public void bindFromContactLookupUri(Uri contactLookupUri) {
-        mContactUri = contactLookupUri;
-        startContactQuery(contactLookupUri);
+        bindFromContactUriInternal(contactLookupUri, true /* reset query handler */);
     }
 
     /**
      * Convenience method for binding all available data from an existing
      * contact.
      *
-     * @param conatctUri a {Contacts.CONTENT_URI} style URI.
+     * @param contactUri a {Contacts.CONTENT_URI} style URI.
+     * @param resetQueryHandler whether to use a new AsyncQueryHandler or not.
      */
-    public void bindFromContactUri(Uri contactUri) {
+    private void bindFromContactUriInternal(Uri contactUri, boolean resetQueryHandler) {
         mContactUri = contactUri;
-        startContactQuery(contactUri);
+        startContactQuery(contactUri, resetQueryHandler);
     }
 
     /**
@@ -424,6 +439,8 @@
      * address, one of them will be chosen to bind to.
      */
     public void bindFromEmail(String emailAddress) {
+        resetAsyncQueryHandler();
+
         mQueryHandler.startQuery(TOKEN_EMAIL_LOOKUP, emailAddress,
                 Uri.withAppendedPath(Email.CONTENT_LOOKUP_URI, Uri.encode(emailAddress)),
                 EMAIL_LOOKUP_PROJECTION, null, null, null);
@@ -438,36 +455,72 @@
      * number, one of them will be chosen to bind to.
      */
     public void bindFromPhoneNumber(String number) {
+        resetAsyncQueryHandler();
+
         mQueryHandler.startQuery(TOKEN_PHONE_LOOKUP, number,
                 Uri.withAppendedPath(PhoneLookup.CONTENT_FILTER_URI, Uri.encode(number)),
                 PHONE_LOOKUP_PROJECTION, null, null, null);
     }
 
     /**
-     * Method to force this widget to forget everything it knows about the contact.
-     * The widget isn't automatically updated or redrawn.
+     * startContactQuery
      *
+     * internal method to query contact by Uri.
+     *
+     * @param contactUri the contact uri
+     * @param resetQueryHandler whether to use a new AsyncQueryHandler or not
      */
-    public void wipeClean() {
-        setDisplayName(null, null);
-        setPhoto(null);
-        setSocialSnippet(null);
-        mContactUri = null;
-        mExcludeMimes = null;
-    }
+    private void startContactQuery(Uri contactUri, boolean resetQueryHandler) {
+        if (resetQueryHandler) {
+            resetAsyncQueryHandler();
+        }
 
-    private void startContactQuery(Uri contactUri) {
         mQueryHandler.startQuery(TOKEN_CONTACT_INFO, null, contactUri, ContactQuery.COLUMNS,
                 null, null, null);
     }
 
-    protected void startPhotoQuery(long photoId, Uri lookupKey) {
+    /**
+     * startPhotoQuery
+     *
+     * internal method to query contact photo by photo id and uri.
+     *
+     * @param photoId the photo id.
+     * @param lookupKey the lookup uri.
+     * @param resetQueryHandler whether to use a new AsyncQueryHandler or not.
+     */
+    protected void startPhotoQuery(long photoId, Uri lookupKey, boolean resetQueryHandler) {
+        if (resetQueryHandler) {
+            resetAsyncQueryHandler();
+        }
+
         mQueryHandler.startQuery(TOKEN_PHOTO_QUERY, lookupKey,
                 ContentUris.withAppendedId(Data.CONTENT_URI, photoId), PhotoQuery.COLUMNS,
                 null, null, null);
     }
 
     /**
+     * Method to force this widget to forget everything it knows about the contact.
+     * We need to stop any existing async queries for phone, email, contact, and photos.
+     */
+    public void wipeClean() {
+        resetAsyncQueryHandler();
+
+        setDisplayName(null, null);
+        setPhoto(loadPlaceholderPhoto(null));
+        setSocialSnippet(null);
+        setPresence(0);
+        mContactUri = null;
+        mExcludeMimes = null;
+    }
+
+
+    private void resetAsyncQueryHandler() {
+        // the api AsyncQueryHandler.cancelOperation() doesn't really work. Since we really
+        // need the old async queries to be cancelled, let's do it the hard way.
+        mQueryHandler = new QueryHandler(mContentResolver);
+    }
+
+    /**
      * Bind the contact details provided by the given {@link Cursor}.
      */
     protected void bindContactInfo(Cursor c) {

core/java/com/android/internal/widget/LockPatternUtils.java

diff --git a/core/java/com/android/internal/widget/LockPatternUtils.java b/core/java/com/android/internal/widget/LockPatternUtils.java
index aafe453..bd41a13 100644
--- a/core/java/com/android/internal/widget/LockPatternUtils.java
+++ b/core/java/com/android/internal/widget/LockPatternUtils.java
@@ -121,11 +121,6 @@
 
     }
 
-    public boolean isDevicePolicyActive() {
-        ComponentName admin = mDevicePolicyManager.getActiveAdmin();
-        return admin != null ? mDevicePolicyManager.isAdminActive(admin) : false;
-    }
-
     public int getRequestedMinimumPasswordLength() {
         return mDevicePolicyManager.getMinimumPasswordLength();
     }

core/res/res/values-cs/strings.xml

diff --git a/core/res/res/values-cs/strings.xml b/core/res/res/values-cs/strings.xml
index 016900d..22cdd2c 100644
--- a/core/res/res/values-cs/strings.xml
+++ b/core/res/res/values-cs/strings.xml
@@ -513,6 +513,7 @@
     <string name="lockscreen_missing_sim_message_short" msgid="7381499217732227295">"Není vložena SIM karta."</string>
     <string name="lockscreen_missing_sim_message" msgid="2186920585695169078">"V telefonu není žádná karta SIM."</string>
     <string name="lockscreen_missing_sim_instructions" msgid="8874620818937719067">"Prosím vložte kartu SIM."</string>
+    <string name="emergency_calls_only" msgid="6733978304386365407">"Pouze tísňová volání"</string>
     <string name="lockscreen_network_locked_message" msgid="143389224986028501">"Síť je blokována"</string>
     <string name="lockscreen_sim_puk_locked_message" msgid="7441797339976230">"Karta SIM je zablokována pomocí kódu PUK."</string>
     <string name="lockscreen_sim_puk_locked_instructions" msgid="635967534992394321">"Další informace naleznete v uživatelské příručce, nebo kontaktujte podporu zákazníků."</string>

core/res/res/values-da/strings.xml

diff --git a/core/res/res/values-da/strings.xml b/core/res/res/values-da/strings.xml
index 61ee2e7..4e49363 100644
--- a/core/res/res/values-da/strings.xml
+++ b/core/res/res/values-da/strings.xml
@@ -513,6 +513,7 @@
     <string name="lockscreen_missing_sim_message_short" msgid="7381499217732227295">"Der er ikke noget SIM-kort."</string>
     <string name="lockscreen_missing_sim_message" msgid="2186920585695169078">"Der er ikke noget SIM-kort i telefonen."</string>
     <string name="lockscreen_missing_sim_instructions" msgid="8874620818937719067">"Indsæt et SIM-kort."</string>
+    <string name="emergency_calls_only" msgid="6733978304386365407">"Kun nødopkald"</string>
     <string name="lockscreen_network_locked_message" msgid="143389224986028501">"Netværket er låst"</string>
     <string name="lockscreen_sim_puk_locked_message" msgid="7441797339976230">"SIM-kortet er låst med PUK-koden."</string>
     <string name="lockscreen_sim_puk_locked_instructions" msgid="635967534992394321">"Se brugervejledningen, eller kontakt kundeservice."</string>

core/res/res/values-de/strings.xml

diff --git a/core/res/res/values-de/strings.xml b/core/res/res/values-de/strings.xml
index 9ad1614..a52e8bf 100644
--- a/core/res/res/values-de/strings.xml
+++ b/core/res/res/values-de/strings.xml
@@ -513,6 +513,7 @@
     <string name="lockscreen_missing_sim_message_short" msgid="7381499217732227295">"Keine SIM-Karte."</string>
     <string name="lockscreen_missing_sim_message" msgid="2186920585695169078">"Keine SIM-Karte im Telefon."</string>
     <string name="lockscreen_missing_sim_instructions" msgid="8874620818937719067">"Bitte legen Sie eine SIM-Karte ein."</string>
+    <string name="emergency_calls_only" msgid="6733978304386365407">"Nur Notrufe"</string>
     <string name="lockscreen_network_locked_message" msgid="143389224986028501">"Netzwerk gesperrt"</string>
     <string name="lockscreen_sim_puk_locked_message" msgid="7441797339976230">"SIM-Karte ist gesperrt. PUK-Eingabe erforderlich."</string>
     <string name="lockscreen_sim_puk_locked_instructions" msgid="635967534992394321">"Weitere Informationen finden Sie in der Bedienungsanleitung oder wenden Sie sich an den Kundendienst."</string>

core/res/res/values-el/strings.xml

diff --git a/core/res/res/values-el/strings.xml b/core/res/res/values-el/strings.xml
index 33a3a41..a55dded 100644
--- a/core/res/res/values-el/strings.xml
+++ b/core/res/res/values-el/strings.xml
@@ -513,6 +513,7 @@
     <string name="lockscreen_missing_sim_message_short" msgid="7381499217732227295">"Δεν υπάρχει κάρτα SIM."</string>
     <string name="lockscreen_missing_sim_message" msgid="2186920585695169078">"Δεν υπάρχει κάρτα SIM στο τηλέφωνο."</string>
     <string name="lockscreen_missing_sim_instructions" msgid="8874620818937719067">"Τοποθετήστε μια κάρτα SIM."</string>
+    <string name="emergency_calls_only" msgid="6733978304386365407">"Μόνο κλήσεις έκτακτης ανάγκης"</string>
     <string name="lockscreen_network_locked_message" msgid="143389224986028501">"Το δίκτυο κλειδώθηκε"</string>
     <string name="lockscreen_sim_puk_locked_message" msgid="7441797339976230">"Η κάρτα SIM είναι κλειδωμένη με κωδικό PUK."</string>
     <string name="lockscreen_sim_puk_locked_instructions" msgid="635967534992394321">"Ανατρέξτε στον οδηγό χρήσης ή επικοινωνήστε με την εξυπηρέτηση πελατών."</string>

core/res/res/values-es-rUS/strings.xml

diff --git a/core/res/res/values-es-rUS/strings.xml b/core/res/res/values-es-rUS/strings.xml
index 806d64e..b2aaa7d3 100644
--- a/core/res/res/values-es-rUS/strings.xml
+++ b/core/res/res/values-es-rUS/strings.xml
@@ -513,6 +513,7 @@
     <string name="lockscreen_missing_sim_message_short" msgid="7381499217732227295">"No hay tarjeta SIM."</string>
     <string name="lockscreen_missing_sim_message" msgid="2186920585695169078">"No hay tarjeta SIM en el teléfono."</string>
     <string name="lockscreen_missing_sim_instructions" msgid="8874620818937719067">"Inserta una tarjeta SIM."</string>
+    <string name="emergency_calls_only" msgid="6733978304386365407">"Sólo llamadas de emergencia"</string>
     <string name="lockscreen_network_locked_message" msgid="143389224986028501">"Red bloqueada"</string>
     <string name="lockscreen_sim_puk_locked_message" msgid="7441797339976230">"La tarjeta SIM está bloqueada con PUK."</string>
     <string name="lockscreen_sim_puk_locked_instructions" msgid="635967534992394321">"Consulta la guía del usuario o comunícate con el servicio de atención al cliente."</string>

core/res/res/values-es/strings.xml

diff --git a/core/res/res/values-es/strings.xml b/core/res/res/values-es/strings.xml
index 4626326..032fbdc 100644
--- a/core/res/res/values-es/strings.xml
+++ b/core/res/res/values-es/strings.xml
@@ -513,6 +513,7 @@
     <string name="lockscreen_missing_sim_message_short" msgid="7381499217732227295">"Falta la tarjeta SIM"</string>
     <string name="lockscreen_missing_sim_message" msgid="2186920585695169078">"No se ha insertado ninguna tarjeta SIM en el teléfono."</string>
     <string name="lockscreen_missing_sim_instructions" msgid="8874620818937719067">"Inserta una tarjeta SIM."</string>
+    <string name="emergency_calls_only" msgid="6733978304386365407">"Sólo llamadas de emergencia"</string>
     <string name="lockscreen_network_locked_message" msgid="143389224986028501">"Bloqueada para la red"</string>
     <string name="lockscreen_sim_puk_locked_message" msgid="7441797339976230">"La tarjeta SIM está bloqueada con el código PUK."</string>
     <string name="lockscreen_sim_puk_locked_instructions" msgid="635967534992394321">"Consulta la guía del usuario o ponte en contacto con el servicio de atención al cliente."</string>

core/res/res/values-fr/strings.xml

diff --git a/core/res/res/values-fr/strings.xml b/core/res/res/values-fr/strings.xml
index d46820a..3679fd2 100644
--- a/core/res/res/values-fr/strings.xml
+++ b/core/res/res/values-fr/strings.xml
@@ -513,6 +513,7 @@
     <string name="lockscreen_missing_sim_message_short" msgid="7381499217732227295">"Aucune carte SIM n\'a été trouvée."</string>
     <string name="lockscreen_missing_sim_message" msgid="2186920585695169078">"Aucune carte SIM n\'est insérée dans le téléphone."</string>
     <string name="lockscreen_missing_sim_instructions" msgid="8874620818937719067">"Insérez une carte SIM."</string>
+    <string name="emergency_calls_only" msgid="6733978304386365407">"Appels d\'urgence uniquement"</string>
     <string name="lockscreen_network_locked_message" msgid="143389224986028501">"Réseau verrouillé"</string>
     <string name="lockscreen_sim_puk_locked_message" msgid="7441797339976230">"La carte SIM est verrouillée par clé PUK."</string>
     <string name="lockscreen_sim_puk_locked_instructions" msgid="635967534992394321">"Veuillez consulter le guide d\'utilisation ou contacter l\'assistance clientèle."</string>

core/res/res/values-it/strings.xml

diff --git a/core/res/res/values-it/strings.xml b/core/res/res/values-it/strings.xml
index ff6107a..58229dd 100644
--- a/core/res/res/values-it/strings.xml
+++ b/core/res/res/values-it/strings.xml
@@ -513,6 +513,7 @@
     <string name="lockscreen_missing_sim_message_short" msgid="7381499217732227295">"Nessuna SIM presente."</string>
     <string name="lockscreen_missing_sim_message" msgid="2186920585695169078">"Nessuna SIM presente nel telefono."</string>
     <string name="lockscreen_missing_sim_instructions" msgid="8874620818937719067">"Inserisci una SIM."</string>
+    <string name="emergency_calls_only" msgid="6733978304386365407">"Solo chiamate di emergenza"</string>
     <string name="lockscreen_network_locked_message" msgid="143389224986028501">"Rete bloccata"</string>
     <string name="lockscreen_sim_puk_locked_message" msgid="7441797339976230">"La SIM è bloccata tramite PUK."</string>
     <string name="lockscreen_sim_puk_locked_instructions" msgid="635967534992394321">"Consulta il Manuale utente o contatta il servizio clienti."</string>

core/res/res/values-ja/strings.xml

diff --git a/core/res/res/values-ja/strings.xml b/core/res/res/values-ja/strings.xml
index 31c823c..b6ac84e 100644
--- a/core/res/res/values-ja/strings.xml
+++ b/core/res/res/values-ja/strings.xml
@@ -513,6 +513,7 @@
     <string name="lockscreen_missing_sim_message_short" msgid="7381499217732227295">"SIMカードが挿入されていません"</string>
     <string name="lockscreen_missing_sim_message" msgid="2186920585695169078">"SIMカードが挿入されていません"</string>
     <string name="lockscreen_missing_sim_instructions" msgid="8874620818937719067">"SIMカードを挿入してください。"</string>
+    <string name="emergency_calls_only" msgid="6733978304386365407">"緊急通報のみ"</string>
     <string name="lockscreen_network_locked_message" msgid="143389224986028501">"ネットワークがロックされました"</string>
     <string name="lockscreen_sim_puk_locked_message" msgid="7441797339976230">"SIMカードはPUKでロックされています。"</string>
     <string name="lockscreen_sim_puk_locked_instructions" msgid="635967534992394321">"ユーザーガイドを参照するか、お客様サポートにお問い合わせください。"</string>

core/res/res/values-ko/strings.xml

diff --git a/core/res/res/values-ko/strings.xml b/core/res/res/values-ko/strings.xml
index 8afa494..222139b 100644
--- a/core/res/res/values-ko/strings.xml
+++ b/core/res/res/values-ko/strings.xml
@@ -513,6 +513,7 @@
     <string name="lockscreen_missing_sim_message_short" msgid="7381499217732227295">"SIM 카드가 없습니다."</string>
     <string name="lockscreen_missing_sim_message" msgid="2186920585695169078">"휴대전화에 SIM 카드가 없습니다."</string>
     <string name="lockscreen_missing_sim_instructions" msgid="8874620818937719067">"SIM 카드를 삽입하세요."</string>
+    <string name="emergency_calls_only" msgid="6733978304386365407">"비상 전화만"</string>
     <string name="lockscreen_network_locked_message" msgid="143389224986028501">"네트워크 잠김"</string>
     <string name="lockscreen_sim_puk_locked_message" msgid="7441797339976230">"SIM 카드의 PUK가 잠겨 있습니다."</string>
     <string name="lockscreen_sim_puk_locked_instructions" msgid="635967534992394321">"사용자 가이드를 참조하거나 고객지원팀에 문의하세요."</string>

core/res/res/values-nb/strings.xml

diff --git a/core/res/res/values-nb/strings.xml b/core/res/res/values-nb/strings.xml
index ed4f596..8eb3463 100644
--- a/core/res/res/values-nb/strings.xml
+++ b/core/res/res/values-nb/strings.xml
@@ -513,6 +513,7 @@
     <string name="lockscreen_missing_sim_message_short" msgid="7381499217732227295">"Mangler SIM-kort."</string>
     <string name="lockscreen_missing_sim_message" msgid="2186920585695169078">"Ikke noe SIM-kort i telefonen."</string>
     <string name="lockscreen_missing_sim_instructions" msgid="8874620818937719067">"Sett inn et SIM-kort."</string>
+    <string name="emergency_calls_only" msgid="6733978304386365407">"Kun nødsamtaler"</string>
     <string name="lockscreen_network_locked_message" msgid="143389224986028501">"Nettverk ikke tillatt"</string>
     <string name="lockscreen_sim_puk_locked_message" msgid="7441797339976230">"SIM-kortet er PUK-låst."</string>
     <string name="lockscreen_sim_puk_locked_instructions" msgid="635967534992394321">"Se manualen eller kontakt kundeservice."</string>

core/res/res/values-nl/strings.xml

diff --git a/core/res/res/values-nl/strings.xml b/core/res/res/values-nl/strings.xml
index a6ebcde..aad7744 100644
--- a/core/res/res/values-nl/strings.xml
+++ b/core/res/res/values-nl/strings.xml
@@ -513,6 +513,7 @@
     <string name="lockscreen_missing_sim_message_short" msgid="7381499217732227295">"Geen SIM-kaart."</string>
     <string name="lockscreen_missing_sim_message" msgid="2186920585695169078">"Geen SIM-kaart in telefoon."</string>
     <string name="lockscreen_missing_sim_instructions" msgid="8874620818937719067">"Plaats een SIM-kaart."</string>
+    <string name="emergency_calls_only" msgid="6733978304386365407">"Alleen noodoproepen"</string>
     <string name="lockscreen_network_locked_message" msgid="143389224986028501">"Netwerk vergrendeld"</string>
     <string name="lockscreen_sim_puk_locked_message" msgid="7441797339976230">"SIM-kaart is vergrendeld met PUK-code."</string>
     <string name="lockscreen_sim_puk_locked_instructions" msgid="635967534992394321">"Raadpleeg de gebruikershandleiding of neem contact op met de klantenservice."</string>

core/res/res/values-pl/strings.xml

diff --git a/core/res/res/values-pl/strings.xml b/core/res/res/values-pl/strings.xml
index 6d0539e..ce7ade5 100644
--- a/core/res/res/values-pl/strings.xml
+++ b/core/res/res/values-pl/strings.xml
@@ -513,6 +513,7 @@
     <string name="lockscreen_missing_sim_message_short" msgid="7381499217732227295">"Brak karty SIM."</string>
     <string name="lockscreen_missing_sim_message" msgid="2186920585695169078">"Brak karty SIM w telefonie."</string>
     <string name="lockscreen_missing_sim_instructions" msgid="8874620818937719067">"Włóż kartę SIM."</string>
+    <string name="emergency_calls_only" msgid="6733978304386365407">"Tylko połączenia alarmowe"</string>
     <string name="lockscreen_network_locked_message" msgid="143389224986028501">"Sieć zablokowana"</string>
     <string name="lockscreen_sim_puk_locked_message" msgid="7441797339976230">"Karta SIM jest zablokowana kodem PUK."</string>
     <string name="lockscreen_sim_puk_locked_instructions" msgid="635967534992394321">"Zapoznaj się z instrukcją obsługi lub skontaktuj się z działem obsługi klienta."</string>

core/res/res/values-pt-rPT/strings.xml

diff --git a/core/res/res/values-pt-rPT/strings.xml b/core/res/res/values-pt-rPT/strings.xml
index 1872cb4..e4e0d64 100644
--- a/core/res/res/values-pt-rPT/strings.xml
+++ b/core/res/res/values-pt-rPT/strings.xml
@@ -513,6 +513,7 @@
     <string name="lockscreen_missing_sim_message_short" msgid="7381499217732227295">"Nenhum cartão SIM."</string>
     <string name="lockscreen_missing_sim_message" msgid="2186920585695169078">"Nenhum cartão SIM no telefone."</string>
     <string name="lockscreen_missing_sim_instructions" msgid="8874620818937719067">"Introduza um cartão SIM."</string>
+    <string name="emergency_calls_only" msgid="6733978304386365407">"Apenas chamadas de emergência"</string>
     <string name="lockscreen_network_locked_message" msgid="143389224986028501">"Rede bloqueada"</string>
     <string name="lockscreen_sim_puk_locked_message" msgid="7441797339976230">"O cartão SIM está bloqueado por PUK"</string>
     <string name="lockscreen_sim_puk_locked_instructions" msgid="635967534992394321">"Consulte o Manual de utilizador ou contacte a Assistência a clientes."</string>

core/res/res/values-pt/strings.xml

diff --git a/core/res/res/values-pt/strings.xml b/core/res/res/values-pt/strings.xml
index 6841fec..f81f332 100644
--- a/core/res/res/values-pt/strings.xml
+++ b/core/res/res/values-pt/strings.xml
@@ -513,6 +513,7 @@
     <string name="lockscreen_missing_sim_message_short" msgid="7381499217732227295">"Sem cartão SIM."</string>
     <string name="lockscreen_missing_sim_message" msgid="2186920585695169078">"Não há um cartão SIM no telefone."</string>
     <string name="lockscreen_missing_sim_instructions" msgid="8874620818937719067">"Insira um cartão SIM."</string>
+    <string name="emergency_calls_only" msgid="6733978304386365407">"Apenas chamadas de emergência"</string>
     <string name="lockscreen_network_locked_message" msgid="143389224986028501">"Rede bloqueada"</string>
     <string name="lockscreen_sim_puk_locked_message" msgid="7441797339976230">"O cartão SIM está bloqueado pelo PUK."</string>
     <string name="lockscreen_sim_puk_locked_instructions" msgid="635967534992394321">"Consulte o Guia do Usuário ou entre em contato com o Serviço de atendimento ao cliente."</string>

core/res/res/values-ru/strings.xml

diff --git a/core/res/res/values-ru/strings.xml b/core/res/res/values-ru/strings.xml
index 0fa02dc..3864283 100644
--- a/core/res/res/values-ru/strings.xml
+++ b/core/res/res/values-ru/strings.xml
@@ -513,6 +513,7 @@
     <string name="lockscreen_missing_sim_message_short" msgid="7381499217732227295">"Нет SIM-карты."</string>
     <string name="lockscreen_missing_sim_message" msgid="2186920585695169078">"SIM-карта не установлена."</string>
     <string name="lockscreen_missing_sim_instructions" msgid="8874620818937719067">"Вставьте SIM-карту."</string>
+    <string name="emergency_calls_only" msgid="6733978304386365407">"Только вызовы службы экстренной помощи"</string>
     <string name="lockscreen_network_locked_message" msgid="143389224986028501">"Сеть заблокирована"</string>
     <string name="lockscreen_sim_puk_locked_message" msgid="7441797339976230">"SIM-карта заблокирована с помощью кода PUK."</string>
     <string name="lockscreen_sim_puk_locked_instructions" msgid="635967534992394321">"См. руководство пользователя или свяжитесь со службой поддержки."</string>

core/res/res/values-sv/strings.xml

diff --git a/core/res/res/values-sv/strings.xml b/core/res/res/values-sv/strings.xml
index 313073f..1737414 100644
--- a/core/res/res/values-sv/strings.xml
+++ b/core/res/res/values-sv/strings.xml
@@ -513,6 +513,7 @@
     <string name="lockscreen_missing_sim_message_short" msgid="7381499217732227295">"Inget SIM-kort."</string>
     <string name="lockscreen_missing_sim_message" msgid="2186920585695169078">"Inget SIM-kort i telefonen."</string>
     <string name="lockscreen_missing_sim_instructions" msgid="8874620818937719067">"Sätt i ett SIM-kort."</string>
+    <string name="emergency_calls_only" msgid="6733978304386365407">"Endast nödsamtal"</string>
     <string name="lockscreen_network_locked_message" msgid="143389224986028501">"Nätverk låst"</string>
     <string name="lockscreen_sim_puk_locked_message" msgid="7441797339976230">"SIM-kortet är PUK-låst."</string>
     <string name="lockscreen_sim_puk_locked_instructions" msgid="635967534992394321">"Se användarhandboken eller kontakta Kundtjänst."</string>

core/res/res/values-tr/strings.xml

diff --git a/core/res/res/values-tr/strings.xml b/core/res/res/values-tr/strings.xml
index d7a02bc..26ac5b0 100644
--- a/core/res/res/values-tr/strings.xml
+++ b/core/res/res/values-tr/strings.xml
@@ -513,6 +513,7 @@
     <string name="lockscreen_missing_sim_message_short" msgid="7381499217732227295">"SIM kart yok."</string>
     <string name="lockscreen_missing_sim_message" msgid="2186920585695169078">"Telefonda SIM kart yok."</string>
     <string name="lockscreen_missing_sim_instructions" msgid="8874620818937719067">"Lütfen SIM kart takın."</string>
+    <string name="emergency_calls_only" msgid="6733978304386365407">"Yalnızca acil çağrılar için"</string>
     <string name="lockscreen_network_locked_message" msgid="143389224986028501">"Ağ kilitli"</string>
     <string name="lockscreen_sim_puk_locked_message" msgid="7441797339976230">"SIM kart PUK kilidi devrede."</string>
     <string name="lockscreen_sim_puk_locked_instructions" msgid="635967534992394321">"Lütfen Kullanıcı Rehberi\'ne bakın veya Müşteri Hizmetleri\'ne başvurun."</string>

core/res/res/values-zh-rCN/strings.xml

diff --git a/core/res/res/values-zh-rCN/strings.xml b/core/res/res/values-zh-rCN/strings.xml
index 3f3549b..5be8676 100644
--- a/core/res/res/values-zh-rCN/strings.xml
+++ b/core/res/res/values-zh-rCN/strings.xml
@@ -513,6 +513,7 @@
     <string name="lockscreen_missing_sim_message_short" msgid="7381499217732227295">"没有 SIM 卡"</string>
     <string name="lockscreen_missing_sim_message" msgid="2186920585695169078">"手机中无 SIM 卡"</string>
     <string name="lockscreen_missing_sim_instructions" msgid="8874620818937719067">"请插入 SIM 卡"</string>
+    <string name="emergency_calls_only" msgid="6733978304386365407">"仅限于急救或报警电话"</string>
     <string name="lockscreen_network_locked_message" msgid="143389224986028501">"网络已锁定"</string>
     <string name="lockscreen_sim_puk_locked_message" msgid="7441797339976230">"SIM 卡已用 PUK 码锁定"</string>
     <string name="lockscreen_sim_puk_locked_instructions" msgid="635967534992394321">"请参阅《用户指南》或联系客服人员。"</string>

core/res/res/values-zh-rTW/strings.xml

diff --git a/core/res/res/values-zh-rTW/strings.xml b/core/res/res/values-zh-rTW/strings.xml
index ee31333..d500b51 100644
--- a/core/res/res/values-zh-rTW/strings.xml
+++ b/core/res/res/values-zh-rTW/strings.xml
@@ -513,6 +513,7 @@
     <string name="lockscreen_missing_sim_message_short" msgid="7381499217732227295">"沒有 SIM  卡。"</string>
     <string name="lockscreen_missing_sim_message" msgid="2186920585695169078">"手機未插入 SIM 卡。"</string>
     <string name="lockscreen_missing_sim_instructions" msgid="8874620818937719067">"請插入 SIM 卡。"</string>
+    <string name="emergency_calls_only" msgid="6733978304386365407">"只能撥打緊急電話"</string>
     <string name="lockscreen_network_locked_message" msgid="143389224986028501">"網路已鎖定"</string>
     <string name="lockscreen_sim_puk_locked_message" msgid="7441797339976230">"SIM 的 PUK 已鎖定。"</string>
     <string name="lockscreen_sim_puk_locked_instructions" msgid="635967534992394321">"請參閱《使用者指南》或聯絡客戶服務中心。"</string>

core/res/res/values/strings.xml

diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml
index 259398f..42553d4 100644
--- a/core/res/res/values/strings.xml
+++ b/core/res/res/values/strings.xml
@@ -1453,6 +1453,8 @@
     <!-- Shown in the lock screen to ask the user to insert a SIM card. -->
     <string name="lockscreen_missing_sim_instructions">Please insert a SIM card.</string>
 
+    <!-- Shown in the lock screen when there is emergency calls only mode. -->
+    <string name="emergency_calls_only" msgid="2485604591272668370">Emergency calls only</string>
 
     <!-- When the user inserts a sim card from an unsupported network, it becomes network
          locked -->

core/tests/coretests/AndroidManifest.xml

diff --git a/core/tests/coretests/AndroidManifest.xml b/core/tests/coretests/AndroidManifest.xml
index 674bda7..02961f4 100644
--- a/core/tests/coretests/AndroidManifest.xml
+++ b/core/tests/coretests/AndroidManifest.xml
@@ -32,7 +32,13 @@
     <uses-permission android:name="android.permission.WRITE_SECURE_SETTINGS"/>
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
     
-    <application>
+    <uses-permission android:name="android.permission.HARDWARE_TEST" />
+    <uses-permission android:name="android.permission.WRITE_SETTINGS" />
+    <uses-permission android:name="android.permission.ACCESSIBILITY_EVENT_VIEW_TYPES" />
+    <uses-permission android:name="android.permission.ACCESSIBILITY_EVENT_TRANSITION_TYPES" />
+    <uses-permission android:name="android.permission.ACCESSIBILITY_EVENT_NOTIFICATION_TYPES" />
+
+    <application android:theme="@style/Theme">
         <uses-library android:name="android.test.runner" />
         <activity android:name="StubTestBrowserActivity" android:label="Stubbed Test Browser">
             <intent-filter>
@@ -47,6 +53,928 @@
                 <category android:name="android.intent.category.UNIT_TEST"/>
             </intent-filter>
         </activity>
+
+        <activity android:name="android.widget.focus.DescendantFocusability" android:label="DescendantFocusability">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+            </intent-filter>            
+        </activity>
+
+        <activity android:name="android.widget.focus.FocusAfterRemoval" android:label="FocusAfterRemoval">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+            </intent-filter>
+        </activity>
+
+        <activity android:name="android.widget.focus.RequestFocus" android:label="RequestFocus">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+            </intent-filter>
+        </activity>
+
+        <activity android:name="android.widget.focus.ListOfButtons" android:label="ListOfButtons">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+            </intent-filter>
+        </activity>
+
+        <activity android:name="android.widget.focus.LinearLayoutGrid" android:label="LinearLayoutGrid">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+            </intent-filter>            
+        </activity>
+
+        <activity android:name="android.widget.focus.ListOfEditTexts" android:label="ListOfEditTexts">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+            </intent-filter>            
+        </activity>
+
+        <activity android:name="android.widget.focus.ListOfInternalSelectionViews" android:label="ListOfInternalSelectionViews">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+            </intent-filter>                        
+        </activity>
+
+        <activity android:name="android.widget.focus.ListWithFooterViewAndNewLabels" android:label="FocusListWithFooter">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+            </intent-filter>            
+        </activity>
+
+        <activity android:name="android.widget.focus.ListWithMailMessages" android:label="ListWithMailMessages">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+            </intent-filter>
+        </activity>
+
+        <activity android:name="android.widget.focus.HorizontalFocusSearch" android:label="HorizontalFocusSearch">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+            </intent-filter>            
+        </activity>
+
+        <activity android:name="android.widget.focus.VerticalFocusSearch" android:label="VerticalFocusSearch">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+            </intent-filter>
+        </activity>
+
+        <activity android:name="android.widget.focus.AdjacentVerticalRectLists" android:label="AdjacentVerticalRectLists">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+            </intent-filter>
+        </activity>
+
+        <activity android:name="android.widget.focus.GoneParentFocusedChild" android:label="GoneParentFocusedChild">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+            </intent-filter>
+        </activity>
+
+        <activity android:name="android.widget.layout.frame.FrameLayoutGravity" android:label="FrameLayoutGravity">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+            </intent-filter>
+        </activity>
+
+        <activity android:name="android.widget.layout.frame.FrameLayoutMargin" android:label="FrameLayoutMargin">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+            </intent-filter>
+        </activity>
+
+        <activity android:name="android.widget.layout.linear.BaselineAlignmentCenterGravity" android:label="BaselineAlignmentCenterGravity">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+            </intent-filter>
+        </activity>
+
+        <activity android:name="android.widget.layout.linear.BaselineButtons" android:label="BaselineButtons">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+            </intent-filter>
+        </activity>
+
+        <activity android:name="android.widget.layout.linear.FillInWrap" android:label="FillInWrap">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+            </intent-filter>
+        </activity>
+
+        <activity android:name="android.widget.layout.linear.BaselineAlignmentZeroWidthAndWeight" android:label="Baseline0WidthAndWeight">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+            </intent-filter>
+        </activity>
+
+        <activity android:name="android.widget.layout.linear.HorizontalOrientationVerticalAlignment" android:label="HorizontalOrientationVerticalAlignment">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+            </intent-filter>
+        </activity>
+
+        <activity android:name="android.widget.layout.linear.LLEditTextThenButton" android:label="LLEditTextThenButton">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+            </intent-filter>            
+        </activity>
+
+        <activity android:name="android.widget.layout.linear.LLOfButtons1" android:label="LLOfButtons1">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+            </intent-filter>
+        </activity>
+
+        <activity android:name="android.widget.layout.linear.LinearLayoutEditTexts" android:label="LinearLayoutEditTexts">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+            </intent-filter>
+        </activity>
+
+        <activity android:name="android.widget.layout.linear.LLOfButtons2" android:label="LLOfButtons2">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+            </intent-filter>
+        </activity>
+
+        <activity android:name="android.widget.layout.linear.LLOfTwoFocusableInTouchMode" android:label="LLOfTwoFocusableInTouchMode">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+            </intent-filter>            
+        </activity>
+
+        <activity android:name="android.widget.layout.linear.Weight" android:label="Weight">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+            </intent-filter>
+        </activity>
+
+        <activity android:name="android.widget.layout.linear.WeightSum" android:label="WeightSum">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+            </intent-filter>
+        </activity>
+
+        <activity android:name="android.widget.listview.AdjacentListsWithAdjacentISVsInside" android:label="AdjacentListsWithAdjacentISVsInside">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+            </intent-filter>
+        </activity>
+
+        <activity android:name="android.widget.listview.ListDividers" android:label="ListDividers">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+            </intent-filter>
+        </activity>
+
+        <activity android:name="android.widget.listview.ListViewHeight" android:label="ListViewHeight">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+            </intent-filter>
+        </activity>
+
+        <activity android:name="android.widget.layout.table.FixedWidth" android:label="CellFixedWidth">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+            </intent-filter>
+        </activity>
+
+        <activity android:name="android.widget.layout.table.Weight" android:label="CellWeight">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+            </intent-filter>
+        </activity>
+
+        <activity android:name="android.widget.layout.table.HorizontalGravity" android:label="CellHorizontalGravity">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+            </intent-filter>
+        </activity>
+
+        <activity android:name="android.widget.layout.table.VerticalGravity" android:label="CellVerticalGravity">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+            </intent-filter>
+        </activity>
+
+        <activity android:name="android.widget.layout.table.AddColumn" android:label="AddColumnInTable">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+            </intent-filter>
+        </activity>
+
+        <activity android:name="android.widget.layout.table.CellSpan" android:label="CellSpan">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+            </intent-filter>
+        </activity>
+
+        <activity android:name="android.widget.scroll.ButtonAboveTallInternalSelectionView" android:label="ButtonAboveTallInternalSelectionView">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+            </intent-filter>
+        </activity>
+
+        <activity android:name="android.widget.scroll.ButtonsWithTallTextViewInBetween" android:label="scrollButtonsWithTallTextViewInBetween">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+            </intent-filter>
+        </activity>
+
+        <activity android:name="android.widget.scroll.RequestRectangleVisible" android:label="ScrollToChildRect">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+            </intent-filter>
+        </activity>
+
+        <activity android:name="android.widget.scroll.RequestRectangleVisibleWithInternalScroll" android:label="ScrollToChildRectWithInternalScroll">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+            </intent-filter>
+        </activity>
+
+        <activity android:name="android.widget.scroll.ScrollViewButtonsAndLabels" android:label="ScrollViewButtonsAndLabels">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+            </intent-filter>
+        </activity>
+
+        <activity android:name="android.widget.scroll.ShortButtons" android:label="scrollShortButtons">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+            </intent-filter>
+        </activity>
+
+        <activity android:name="android.widget.scroll.TallTextAboveButton" android:label="scrollTallTextAboveButton">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+            </intent-filter>
+        </activity>
+
+        <activity android:name="android.view.Include" android:label="IncludeTag">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+            </intent-filter>
+        </activity>
+
+        <activity android:name="android.view.Merge" android:label="MergeTag">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+            </intent-filter>
+        </activity>
+
+        <activity android:name="android.view.StubbedView" android:label="ViewStub">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+            </intent-filter>
+        </activity>
+
+        <activity android:name="android.view.RunQueue" android:label="RunQueue">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+            </intent-filter>
+        </activity>
+
+        <activity android:name="android.view.Visibility" android:label="Visibility">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+            </intent-filter>
+        </activity>
+
+        <activity android:name="android.view.VisibilityCallback" android:label="VisibilityCallback">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+            </intent-filter>
+        </activity>
+
+        <activity android:name="android.view.BigCache" android:label="BigCache">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+            </intent-filter>
+        </activity>
+
+        <activity android:name="android.view.ZeroSized" android:label="ZeroSized">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+            </intent-filter>
+        </activity>
+
+        <activity android:name="android.view.Disabled" android:label="Disabled">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+            </intent-filter>
+        </activity>
+
+        <activity android:name="android.view.PopupWindowVisibility" android:label="PopupWindowVisibility">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+            </intent-filter>
+        </activity>
+        
+        <activity android:name="android.view.PreDrawListener" android:label="PreDrawListener">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+            </intent-filter>
+        </activity>
+
+        <activity android:name="android.view.GlobalFocusChange" android:label="GlobalFocusChange">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+            </intent-filter>
+        </activity>
+
+        <activity android:name="android.widget.listview.ListSetSelection" android:label="ListSetSelection">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+            </intent-filter>
+        </activity>
+
+        <activity android:name="android.widget.listview.ListSimple" android:label="ListSimple">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+            </intent-filter>
+        </activity>
+
+        <activity android:name="android.widget.listview.ListFilter" android:label="ListFilter">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+            </intent-filter>
+        </activity>
+        
+        <activity android:name="android.widget.listview.ListScrollListener" android:label="ListScrollListener">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+            </intent-filter>
+        </activity>
+
+        <activity android:name="android.widget.listview.ListThrasher" android:label="ListThrasher">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+            </intent-filter>
+        </activity>
+        
+        <activity android:name="android.widget.listview.ListTakeFocusFromSide" android:label="ListTakeFocusFromSide">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+            </intent-filter>
+        </activity>
+        
+        <activity android:name="android.widget.listview.ListBottomGravity" android:label="ListBottomGravity">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+            </intent-filter>
+        </activity>
+        
+        <activity android:name="android.widget.listview.ListBottomGravityMany" android:label="ListBottomGravityMany">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+            </intent-filter>
+        </activity>
+
+
+        <activity android:name="android.widget.listview.ListButtonsDiagonalAcrossItems" android:label="ListButtonsDiagonalAcrossItems">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+            </intent-filter>
+        </activity>
+
+        <activity android:name="android.widget.listview.ListTopGravity" android:label="ListTopGravity">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+            </intent-filter>
+        </activity>
+        
+        <activity android:name="android.widget.listview.ListTopGravityMany" android:label="ListTopGravityMany">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+            </intent-filter>
+        </activity>
+        
+        <activity android:name="android.widget.listview.ListEndingWithMultipleSeparators" android:label="ListEndingWithMultipleSeparators">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+            </intent-filter>                        
+        </activity>
+
+        <activity android:name="android.widget.listview.ListGetSelectedView" android:label="ListGetSelectedView">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+            </intent-filter>
+        </activity>
+
+        <activity android:name="android.widget.listview.ListInHorizontal" android:label="ListInHorizontal">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+            </intent-filter>
+        </activity>
+
+        <activity android:name="android.widget.listview.ListInVertical" android:label="ListInVertical">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+            </intent-filter>
+        </activity>
+
+        <activity android:name="android.widget.listview.ListInterleaveFocusables" android:label="ListInterleaveFocusables">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+             <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+         </intent-filter>
+        </activity>
+
+        <activity android:name="android.widget.listview.ListOfItemsShorterThanScreen" android:label="ListOfItemsShorterThanScreen">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+            </intent-filter>            
+        </activity>
+
+        <activity android:name="android.widget.listview.ListOfItemsTallerThanScreen" android:label="ListOfItemsTallerThanScreen">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+            </intent-filter>            
+        </activity>
+
+        <activity android:name="android.widget.listview.ListOfThinItems" android:label="ListOfThinItems">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+            </intent-filter>                        
+        </activity>
+
+        <activity android:name="android.widget.listview.ListOfShortTallShort" android:label="ListOfShortTallShort">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+            </intent-filter>
+        </activity>
+
+        <activity android:name="android.widget.listview.ListOfShortShortTallShortShort" android:label="ListOfShortShortTallShortShort">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+            </intent-filter>            
+        </activity>
+
+        <activity android:name="android.widget.listview.ListWithOffScreenNextSelectable" android:label="ListWithOffScreenNextSelectable">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+            </intent-filter>                                    
+        </activity>
+
+        <activity android:name="android.widget.listview.ListWithFirstScreenUnSelectable" android:label="ListWithFirstScreenUnSelectable">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+            </intent-filter>
+        </activity>
+
+
+        <activity android:name="android.widget.listview.ListWithSeparators" android:label="ListWithSeparators">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+            </intent-filter>            
+        </activity>
+
+        <activity android:name="android.widget.listview.ListWithHeaders" android:label="ListWithHeaders">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+            </intent-filter>
+        </activity>
+
+        <activity android:name="android.widget.listview.ListWithEditTextHeader" android:label="ListWithEditTextHeader">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+            </intent-filter>
+        </activity>
+
+        <activity android:name="android.widget.listview.ListWithNoFadingEdge" android:label="ListWithNoFadingEdge">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+            </intent-filter>            
+        </activity>
+
+        <activity android:name="android.widget.listview.ListWithScreenOfNoSelectables" android:label="ListWithScreenOfNoSelectables">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+            </intent-filter>            
+        </activity>
+
+        <activity android:name="android.widget.listview.ListItemFocusablesFarApart" android:label="ListItemFocusablesFarApart">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+            </intent-filter>
+        </activity>
+
+        <activity android:name="android.widget.listview.ListItemFocusableAboveUnfocusable" android:label="ListItemFocusableAboveUnfocusable">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+            </intent-filter>
+        </activity>
+
+        <activity android:name="android.widget.listview.ListItemFocusablesClose" android:label="ListItemFocusablesClose">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+            </intent-filter>
+        </activity>
+
+        <activity android:name="android.widget.listview.ListLastItemPartiallyVisible" android:label="ListLastItemPartiallyVisible">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+            </intent-filter>            
+        </activity>
+
+        <activity android:name="android.widget.listview.ListItemsExpandOnSelection" android:label="ListItemsExpandOnSelection">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+            </intent-filter>            
+        </activity>
+
+        <activity android:name="android.widget.listview.ListWithOnItemSelectedAction" android:label="ListWithOnItemSelectedAction">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+            </intent-filter>            
+        </activity>
+
+        <activity android:name="android.widget.listview.ListItemISVAndButton" android:label="ListItemISVAndButton">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+            </intent-filter>
+        </activity>
+
+        <activity android:name="android.widget.listview.ListOfTouchables" android:label="ListOfTouchables">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+            </intent-filter>
+        </activity>
+
+        <activity android:name="android.widget.listview.ListRecyclerProfiling" android:label="ListRecyclerProfiling">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+            </intent-filter>
+        </activity>
+
+        <activity android:name="android.widget.listview.ListHeterogeneous" android:label="ListHeterogeneous">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+            </intent-filter>
+        </activity>
+
+        <activity android:name="android.widget.listview.ListHorizontalFocusWithinItemWins" android:label="ListHorizontalFocusWithinItemWins">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+            </intent-filter>            
+        </activity>
+       
+	    <activity android:name="android.widget.listview.ListManagedCursor" android:label="ListManagedCursor">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+            </intent-filter>
+        </activity>
+       
+	    <activity android:name="android.widget.listview.ListWithEmptyView" android:label="ListWithEmptyView">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+            </intent-filter>
+        </activity>
+        
+        <activity android:name="android.widget.gridview.GridInHorizontal" android:label="GridInHorizontal">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+            </intent-filter>
+        </activity>
+        
+        <activity android:name="android.widget.gridview.GridPadding" android:label="GridPadding">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+            </intent-filter>
+        </activity>
+
+        <activity android:name="android.widget.gridview.GridInVertical" android:label="GridInVertical">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+            </intent-filter>
+        </activity>
+
+        <activity android:name="android.widget.gridview.GridScrollListener" android:label="GridScrollListener">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+            </intent-filter>
+        </activity>
+
+         <activity android:name="android.widget.gridview.GridThrasher" android:label="GridThrasher">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+            </intent-filter>
+        </activity>
+
+        <activity android:name="android.widget.gridview.GridSimple" android:label="GridSimple">
+           <intent-filter>
+               <action android:name="android.intent.action.MAIN" />
+               <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+           </intent-filter>
+       </activity>
+
+        <activity android:name="android.widget.gridview.GridDelete" android:label="GridDelete">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+            </intent-filter>
+        </activity>
+
+         <activity android:name="android.widget.gridview.GridSetSelection" android:label="GridSetSelection">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+            </intent-filter>
+        </activity>
+
+        <activity android:name="android.widget.gridview.GridSetSelectionMany" android:label="GridSetSelectionMany">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+            </intent-filter>
+        </activity>
+
+        <activity android:name="android.widget.gridview.GridSetSelectionStackFromBottom" android:label="GridSetSelectionStackFromBottom">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+            </intent-filter>
+        </activity>
+
+        <activity android:name="android.widget.gridview.GridSetSelectionStackFromBottomMany" android:label="GridSetSelectionStackFromBottomMany">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+            </intent-filter>
+        </activity>
+
+        <activity android:name="android.widget.gridview.GridStackFromBottom" android:label="GridStackFromBottom">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+            </intent-filter>
+        </activity>
+
+        <activity android:name="android.widget.gridview.GridStackFromBottomMany" android:label="GridStackFromBottomMany">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+            </intent-filter>
+        </activity>
+
+        <activity android:name="android.widget.gridview.GridVerticalSpacing" android:label="GridVerticalSpacing">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+            </intent-filter>
+        </activity>
+        
+        <activity android:name="android.widget.gridview.GridVerticalSpacingStackFromBottom" android:label="GridVerticalSpacingStackFromBottom">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+            </intent-filter>
+        </activity>
+        
+        <activity android:name="android.widget.gridview.GridSingleColumn" android:label="GridSingleColumn">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+            </intent-filter>
+        </activity>
+        
+        <activity android:name="android.view.menu.ListContextMenu" android:label="ListContextMenu">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+            </intent-filter>
+        </activity>
+
+        <activity android:name="android.view.ViewGroupChildren" android:label="ViewGroup Children">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+            </intent-filter>
+        </activity>
+
+        <activity android:name="android.view.RemoteViewsActivity" android:label="RemoteViewsActicity">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+            </intent-filter>
+        </activity>
+
+        <activity android:name="android.view.BitmapDrawable" android:label="BitmapDrawable">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+            </intent-filter>
+        </activity>
+
+        <activity android:name="android.view.DrawableBgMinSize" android:label="DrawableBgMinSize">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+            </intent-filter>
+        </activity>
+
+        <activity android:name="android.view.MutateDrawable" android:label="MutateDrawable">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+            </intent-filter>
+        </activity>
+
+        <activity android:name="android.app.TranslucentFancyActivity" android:label="TranslucentFancyActivity">
+           <intent-filter>
+               <action android:name="android.intent.action.MAIN" />
+               <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+           </intent-filter>
+       </activity>
+
+        <activity android:name="android.view.Longpress" android:label="Longpress">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+            </intent-filter>
+        </activity>
+
+        <activity android:name="android.widget.expandablelistview.ExpandableListWithHeaders" android:label="ExpandableListWithHeaders">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+            </intent-filter>
+        </activity>
+
+        <activity android:name="android.widget.listview.ListWithDisappearingItemBug" android:label="ListWithDisappearingItemBug">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+            </intent-filter>
+        </activity>
+
+        <activity android:name="android.view.menu.MenuWith1Item" android:label="MenuWith1Item">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+            </intent-filter>
+        </activity>
+
+        <activity android:name=".menus.MenuLayoutPortrait" android:label="MenuLayoutPortrait"
+                android:screenOrientation="portrait">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+            </intent-filter>
+        </activity>
+
+        <activity android:name="android.view.menu.MenuLayoutLandscape" android:label="MenuLayoutLandscape"
+                android:screenOrientation="landscape">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+            </intent-filter>
+        </activity>
+
+        <activity android:name="android.widget.expandablelistview.InflatedExpandableListView" android:label="ExpandableListView Inflated">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+            </intent-filter>
+        </activity>
+
+        <activity android:name="android.widget.expandablelistview.ExpandableListSimple" android:label="ExpandableListSimple">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+            </intent-filter>
+        </activity>
+
+        <activity android:name="android.os.BrightnessLimit" android:label="BrightnessLimit">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+            </intent-filter>
+        </activity>
+        
+        <activity android:name="android.widget.AutoCompleteTextViewSimple"
+                  android:label="AutoCompleteTextViewSimple">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+            </intent-filter>
+        </activity>
+
+        <service android:name="android.accessibility.AccessibilityTestService">
+            <intent-filter>
+                <action android:name="android.accessibilityservice.AccessibilityService" />
+            </intent-filter>
+        </service>
+        
+        <activity android:name="android.widget.RadioGroupActivity" android:label="RadioGroupActivity">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+            </intent-filter>            
+        </activity>
+        
     </application>
 
     <instrumentation

core/tests/coretests/res/drawable-hdpi/big_drawable_background.9.png

diff --git a/tests/FrameworkTest/res/drawable-hdpi/big_drawable_background.9.png b/core/tests/coretests/res/drawable-hdpi/big_drawable_background.9.png
similarity index 100%
rename from tests/FrameworkTest/res/drawable-hdpi/big_drawable_background.9.png
rename to core/tests/coretests/res/drawable-hdpi/big_drawable_background.9.png
Binary files differ

core/tests/coretests/res/drawable-hdpi/black_square.png

diff --git a/tests/FrameworkTest/res/drawable-hdpi/black_square.png b/core/tests/coretests/res/drawable-hdpi/black_square.png
similarity index 100%
rename from tests/FrameworkTest/res/drawable-hdpi/black_square.png
rename to core/tests/coretests/res/drawable-hdpi/black_square.png
Binary files differ

core/tests/coretests/res/drawable-hdpi/black_square_stretchable.9.png

diff --git a/tests/FrameworkTest/res/drawable-hdpi/black_square_stretchable.9.png b/core/tests/coretests/res/drawable-hdpi/black_square_stretchable.9.png
similarity index 100%
rename from tests/FrameworkTest/res/drawable-hdpi/black_square_stretchable.9.png
rename to core/tests/coretests/res/drawable-hdpi/black_square_stretchable.9.png
Binary files differ

core/tests/coretests/res/drawable-hdpi/drawable_background.9.png

diff --git a/tests/FrameworkTest/res/drawable-hdpi/drawable_background.9.png b/core/tests/coretests/res/drawable-hdpi/drawable_background.9.png
similarity index 100%
rename from tests/FrameworkTest/res/drawable-hdpi/drawable_background.9.png
rename to core/tests/coretests/res/drawable-hdpi/drawable_background.9.png
Binary files differ

core/tests/coretests/res/drawable-hdpi/sym_now_playing_pause_1.png

diff --git a/tests/FrameworkTest/res/drawable-hdpi/sym_now_playing_pause_1.png b/core/tests/coretests/res/drawable-hdpi/sym_now_playing_pause_1.png
similarity index 100%
rename from tests/FrameworkTest/res/drawable-hdpi/sym_now_playing_pause_1.png
rename to core/tests/coretests/res/drawable-hdpi/sym_now_playing_pause_1.png
Binary files differ

core/tests/coretests/res/drawable-hdpi/sym_now_playing_skip_backward_1.png

diff --git a/tests/FrameworkTest/res/drawable-hdpi/sym_now_playing_skip_backward_1.png b/core/tests/coretests/res/drawable-hdpi/sym_now_playing_skip_backward_1.png
similarity index 100%
rename from tests/FrameworkTest/res/drawable-hdpi/sym_now_playing_skip_backward_1.png
rename to core/tests/coretests/res/drawable-hdpi/sym_now_playing_skip_backward_1.png
Binary files differ

core/tests/coretests/res/drawable-hdpi/sym_now_playing_skip_forward_1.png

diff --git a/tests/FrameworkTest/res/drawable-hdpi/sym_now_playing_skip_forward_1.png b/core/tests/coretests/res/drawable-hdpi/sym_now_playing_skip_forward_1.png
similarity index 100%
rename from tests/FrameworkTest/res/drawable-hdpi/sym_now_playing_skip_forward_1.png
rename to core/tests/coretests/res/drawable-hdpi/sym_now_playing_skip_forward_1.png
Binary files differ

core/tests/coretests/res/drawable-mdpi/big_drawable_background.9.png

diff --git a/tests/FrameworkTest/res/drawable-mdpi/big_drawable_background.9.png b/core/tests/coretests/res/drawable-mdpi/big_drawable_background.9.png
similarity index 100%
rename from tests/FrameworkTest/res/drawable-mdpi/big_drawable_background.9.png
rename to core/tests/coretests/res/drawable-mdpi/big_drawable_background.9.png
Binary files differ

core/tests/coretests/res/drawable-mdpi/black_square.png

diff --git a/tests/FrameworkTest/res/drawable-mdpi/black_square.png b/core/tests/coretests/res/drawable-mdpi/black_square.png
similarity index 100%
rename from tests/FrameworkTest/res/drawable-mdpi/black_square.png
rename to core/tests/coretests/res/drawable-mdpi/black_square.png
Binary files differ

core/tests/coretests/res/drawable-mdpi/black_square_stretchable.9.png

diff --git a/tests/FrameworkTest/res/drawable-mdpi/black_square_stretchable.9.png b/core/tests/coretests/res/drawable-mdpi/black_square_stretchable.9.png
similarity index 100%
rename from tests/FrameworkTest/res/drawable-mdpi/black_square_stretchable.9.png
rename to core/tests/coretests/res/drawable-mdpi/black_square_stretchable.9.png
Binary files differ

core/tests/coretests/res/drawable-mdpi/drawable_background.9.png

diff --git a/tests/FrameworkTest/res/drawable-mdpi/drawable_background.9.png b/core/tests/coretests/res/drawable-mdpi/drawable_background.9.png
similarity index 100%
rename from tests/FrameworkTest/res/drawable-mdpi/drawable_background.9.png
rename to core/tests/coretests/res/drawable-mdpi/drawable_background.9.png
Binary files differ

core/tests/coretests/res/drawable-mdpi/sym_now_playing_pause_1.png

diff --git a/tests/FrameworkTest/res/drawable-mdpi/sym_now_playing_pause_1.png b/core/tests/coretests/res/drawable-mdpi/sym_now_playing_pause_1.png
similarity index 100%
rename from tests/FrameworkTest/res/drawable-mdpi/sym_now_playing_pause_1.png
rename to core/tests/coretests/res/drawable-mdpi/sym_now_playing_pause_1.png
Binary files differ

core/tests/coretests/res/drawable-mdpi/sym_now_playing_skip_backward_1.png

diff --git a/tests/FrameworkTest/res/drawable-mdpi/sym_now_playing_skip_backward_1.png b/core/tests/coretests/res/drawable-mdpi/sym_now_playing_skip_backward_1.png
similarity index 100%
rename from tests/FrameworkTest/res/drawable-mdpi/sym_now_playing_skip_backward_1.png
rename to core/tests/coretests/res/drawable-mdpi/sym_now_playing_skip_backward_1.png
Binary files differ

core/tests/coretests/res/drawable-mdpi/sym_now_playing_skip_forward_1.png

diff --git a/tests/FrameworkTest/res/drawable-mdpi/sym_now_playing_skip_forward_1.png b/core/tests/coretests/res/drawable-mdpi/sym_now_playing_skip_forward_1.png
similarity index 100%
rename from tests/FrameworkTest/res/drawable-mdpi/sym_now_playing_skip_forward_1.png
rename to core/tests/coretests/res/drawable-mdpi/sym_now_playing_skip_forward_1.png
Binary files differ

core/tests/coretests/res/drawable/bitmap_drawable.xml

diff --git a/tests/FrameworkTest/res/drawable/bitmap_drawable.xml b/core/tests/coretests/res/drawable/bitmap_drawable.xml
similarity index 100%
rename from tests/FrameworkTest/res/drawable/bitmap_drawable.xml
rename to core/tests/coretests/res/drawable/bitmap_drawable.xml

core/tests/coretests/res/drawable/box.xml

diff --git a/tests/FrameworkTest/res/drawable/box.xml b/core/tests/coretests/res/drawable/box.xml
similarity index 100%
rename from tests/FrameworkTest/res/drawable/box.xml
rename to core/tests/coretests/res/drawable/box.xml

core/tests/coretests/res/layout/add_column_in_table.xml

diff --git a/tests/FrameworkTest/res/layout/add_column_in_table.xml b/core/tests/coretests/res/layout/add_column_in_table.xml
similarity index 100%
rename from tests/FrameworkTest/res/layout/add_column_in_table.xml
rename to core/tests/coretests/res/layout/add_column_in_table.xml

core/tests/coretests/res/layout/autocompletetextview_simple.xml

diff --git a/tests/FrameworkTest/res/layout/autocompletetextview_simple.xml b/core/tests/coretests/res/layout/autocompletetextview_simple.xml
similarity index 100%
rename from tests/FrameworkTest/res/layout/autocompletetextview_simple.xml
rename to core/tests/coretests/res/layout/autocompletetextview_simple.xml

core/tests/coretests/res/layout/baseline_0width_and_weight.xml

diff --git a/tests/FrameworkTest/res/layout/baseline_0width_and_weight.xml b/core/tests/coretests/res/layout/baseline_0width_and_weight.xml
similarity index 96%
rename from tests/FrameworkTest/res/layout/baseline_0width_and_weight.xml
rename to core/tests/coretests/res/layout/baseline_0width_and_weight.xml
index aa3132d..acbb10b 100644
--- a/tests/FrameworkTest/res/layout/baseline_0width_and_weight.xml
+++ b/core/tests/coretests/res/layout/baseline_0width_and_weight.xml
@@ -26,7 +26,7 @@
             android:layout_height="wrap_content"
             android:orientation="horizontal"
             android:visibility="gone">
-        <com.android.frameworktest.layout.linear.ExceptionTextView
+        <android.widget.layout.linear.ExceptionTextView
              android:id="@+id/routeToField"
              android:textSize="16sp"
              android:layout_width="0dip"

core/tests/coretests/res/layout/baseline_buttons.xml

diff --git a/tests/FrameworkTest/res/layout/baseline_buttons.xml b/core/tests/coretests/res/layout/baseline_buttons.xml
similarity index 100%
rename from tests/FrameworkTest/res/layout/baseline_buttons.xml
rename to core/tests/coretests/res/layout/baseline_buttons.xml

core/tests/coretests/res/layout/baseline_center_gravity.xml

diff --git a/tests/FrameworkTest/res/layout/baseline_center_gravity.xml b/core/tests/coretests/res/layout/baseline_center_gravity.xml
similarity index 100%
rename from tests/FrameworkTest/res/layout/baseline_center_gravity.xml
rename to core/tests/coretests/res/layout/baseline_center_gravity.xml

core/tests/coretests/res/layout/brightness_limit.xml

diff --git a/tests/FrameworkTest/res/layout/brightness_limit.xml b/core/tests/coretests/res/layout/brightness_limit.xml
similarity index 100%
rename from tests/FrameworkTest/res/layout/brightness_limit.xml
rename to core/tests/coretests/res/layout/brightness_limit.xml

core/tests/coretests/res/layout/descendant_focusability.xml

diff --git a/tests/FrameworkTest/res/layout/descendant_focusability.xml b/core/tests/coretests/res/layout/descendant_focusability.xml
similarity index 100%
rename from tests/FrameworkTest/res/layout/descendant_focusability.xml
rename to core/tests/coretests/res/layout/descendant_focusability.xml

core/tests/coretests/res/layout/disabled.xml

diff --git a/tests/FrameworkTest/res/layout/disabled.xml b/core/tests/coretests/res/layout/disabled.xml
similarity index 100%
rename from tests/FrameworkTest/res/layout/disabled.xml
rename to core/tests/coretests/res/layout/disabled.xml

core/tests/coretests/res/layout/drawable_background_minimum_size.xml

diff --git a/tests/FrameworkTest/res/layout/drawable_background_minimum_size.xml b/core/tests/coretests/res/layout/drawable_background_minimum_size.xml
similarity index 100%
rename from tests/FrameworkTest/res/layout/drawable_background_minimum_size.xml
rename to core/tests/coretests/res/layout/drawable_background_minimum_size.xml

core/tests/coretests/res/layout/fill_in_wrap.xml

diff --git a/tests/FrameworkTest/res/layout/fill_in_wrap.xml b/core/tests/coretests/res/layout/fill_in_wrap.xml
similarity index 100%
rename from tests/FrameworkTest/res/layout/fill_in_wrap.xml
rename to core/tests/coretests/res/layout/fill_in_wrap.xml

core/tests/coretests/res/layout/focus_after_removal.xml

diff --git a/tests/FrameworkTest/res/layout/focus_after_removal.xml b/core/tests/coretests/res/layout/focus_after_removal.xml
similarity index 100%
rename from tests/FrameworkTest/res/layout/focus_after_removal.xml
rename to core/tests/coretests/res/layout/focus_after_removal.xml

core/tests/coretests/res/layout/focus_listener.xml

diff --git a/tests/FrameworkTest/res/layout/focus_listener.xml b/core/tests/coretests/res/layout/focus_listener.xml
similarity index 100%
rename from tests/FrameworkTest/res/layout/focus_listener.xml
rename to core/tests/coretests/res/layout/focus_listener.xml

core/tests/coretests/res/layout/framelayout_gravity.xml

diff --git a/tests/FrameworkTest/res/layout/framelayout_gravity.xml b/core/tests/coretests/res/layout/framelayout_gravity.xml
similarity index 100%
rename from tests/FrameworkTest/res/layout/framelayout_gravity.xml
rename to core/tests/coretests/res/layout/framelayout_gravity.xml

core/tests/coretests/res/layout/framelayout_margin.xml

diff --git a/tests/FrameworkTest/res/layout/framelayout_margin.xml b/core/tests/coretests/res/layout/framelayout_margin.xml
similarity index 100%
rename from tests/FrameworkTest/res/layout/framelayout_margin.xml
rename to core/tests/coretests/res/layout/framelayout_margin.xml

core/tests/coretests/res/layout/grid_in_horizontal.xml

diff --git a/tests/FrameworkTest/res/layout/grid_in_horizontal.xml b/core/tests/coretests/res/layout/grid_in_horizontal.xml
similarity index 100%
rename from tests/FrameworkTest/res/layout/grid_in_horizontal.xml
rename to core/tests/coretests/res/layout/grid_in_horizontal.xml

core/tests/coretests/res/layout/grid_in_vertical.xml

diff --git a/tests/FrameworkTest/res/layout/grid_in_vertical.xml b/core/tests/coretests/res/layout/grid_in_vertical.xml
similarity index 100%
rename from tests/FrameworkTest/res/layout/grid_in_vertical.xml
rename to core/tests/coretests/res/layout/grid_in_vertical.xml

core/tests/coretests/res/layout/grid_padding.xml

diff --git a/tests/FrameworkTest/res/layout/grid_padding.xml b/core/tests/coretests/res/layout/grid_padding.xml
similarity index 100%
rename from tests/FrameworkTest/res/layout/grid_padding.xml
rename to core/tests/coretests/res/layout/grid_padding.xml

core/tests/coretests/res/layout/grid_scroll_listener.xml

diff --git a/tests/FrameworkTest/res/layout/grid_scroll_listener.xml b/core/tests/coretests/res/layout/grid_scroll_listener.xml
similarity index 100%
rename from tests/FrameworkTest/res/layout/grid_scroll_listener.xml
rename to core/tests/coretests/res/layout/grid_scroll_listener.xml

core/tests/coretests/res/layout/grid_thrasher.xml

diff --git a/tests/FrameworkTest/res/layout/grid_thrasher.xml b/core/tests/coretests/res/layout/grid_thrasher.xml
similarity index 100%
rename from tests/FrameworkTest/res/layout/grid_thrasher.xml
rename to core/tests/coretests/res/layout/grid_thrasher.xml

core/tests/coretests/res/layout/include_button.xml

diff --git a/tests/FrameworkTest/res/layout/include_button.xml b/core/tests/coretests/res/layout/include_button.xml
similarity index 100%
rename from tests/FrameworkTest/res/layout/include_button.xml
rename to core/tests/coretests/res/layout/include_button.xml

core/tests/coretests/res/layout/include_button_with_size.xml

diff --git a/tests/FrameworkTest/res/layout/include_button_with_size.xml b/core/tests/coretests/res/layout/include_button_with_size.xml
similarity index 100%
rename from tests/FrameworkTest/res/layout/include_button_with_size.xml
rename to core/tests/coretests/res/layout/include_button_with_size.xml

core/tests/coretests/res/layout/include_tag.xml

diff --git a/tests/FrameworkTest/res/layout/include_tag.xml b/core/tests/coretests/res/layout/include_tag.xml
similarity index 100%
rename from tests/FrameworkTest/res/layout/include_tag.xml
rename to core/tests/coretests/res/layout/include_tag.xml

core/tests/coretests/res/layout/inflated_expandablelistview.xml

diff --git a/tests/FrameworkTest/res/layout/inflated_expandablelistview.xml b/core/tests/coretests/res/layout/inflated_expandablelistview.xml
similarity index 100%
rename from tests/FrameworkTest/res/layout/inflated_expandablelistview.xml
rename to core/tests/coretests/res/layout/inflated_expandablelistview.xml

core/tests/coretests/res/layout/linear_layout_buttons.xml

diff --git a/tests/FrameworkTest/res/layout/linear_layout_buttons.xml b/core/tests/coretests/res/layout/linear_layout_buttons.xml
similarity index 100%
rename from tests/FrameworkTest/res/layout/linear_layout_buttons.xml
rename to core/tests/coretests/res/layout/linear_layout_buttons.xml

core/tests/coretests/res/layout/linear_layout_edittext_then_button.xml

diff --git a/tests/FrameworkTest/res/layout/linear_layout_edittext_then_button.xml b/core/tests/coretests/res/layout/linear_layout_edittext_then_button.xml
similarity index 100%
rename from tests/FrameworkTest/res/layout/linear_layout_edittext_then_button.xml
rename to core/tests/coretests/res/layout/linear_layout_edittext_then_button.xml

core/tests/coretests/res/layout/linear_layout_grid.xml

diff --git a/tests/FrameworkTest/res/layout/linear_layout_grid.xml b/core/tests/coretests/res/layout/linear_layout_grid.xml
similarity index 100%
rename from tests/FrameworkTest/res/layout/linear_layout_grid.xml
rename to core/tests/coretests/res/layout/linear_layout_grid.xml

core/tests/coretests/res/layout/linear_layout_listview_height.xml

diff --git a/tests/FrameworkTest/res/layout/linear_layout_listview_height.xml b/core/tests/coretests/res/layout/linear_layout_listview_height.xml
similarity index 100%
rename from tests/FrameworkTest/res/layout/linear_layout_listview_height.xml
rename to core/tests/coretests/res/layout/linear_layout_listview_height.xml

core/tests/coretests/res/layout/linear_layout_spinner_then_button.xml

diff --git a/tests/FrameworkTest/res/layout/linear_layout_spinner_then_button.xml b/core/tests/coretests/res/layout/linear_layout_spinner_then_button.xml
similarity index 100%
rename from tests/FrameworkTest/res/layout/linear_layout_spinner_then_button.xml
rename to core/tests/coretests/res/layout/linear_layout_spinner_then_button.xml

core/tests/coretests/res/layout/linear_layout_textviews.xml

diff --git a/tests/FrameworkTest/res/layout/linear_layout_textviews.xml b/core/tests/coretests/res/layout/linear_layout_textviews.xml
similarity index 100%
rename from tests/FrameworkTest/res/layout/linear_layout_textviews.xml
rename to core/tests/coretests/res/layout/linear_layout_textviews.xml

core/tests/coretests/res/layout/linear_layout_weight.xml

diff --git a/tests/FrameworkTest/res/layout/linear_layout_weight.xml b/core/tests/coretests/res/layout/linear_layout_weight.xml
similarity index 100%
rename from tests/FrameworkTest/res/layout/linear_layout_weight.xml
rename to core/tests/coretests/res/layout/linear_layout_weight.xml

core/tests/coretests/res/layout/list_dividers.xml

diff --git a/tests/FrameworkTest/res/layout/list_dividers.xml b/core/tests/coretests/res/layout/list_dividers.xml
similarity index 100%
rename from tests/FrameworkTest/res/layout/list_dividers.xml
rename to core/tests/coretests/res/layout/list_dividers.xml

core/tests/coretests/res/layout/list_filter.xml

diff --git a/tests/FrameworkTest/res/layout/list_filter.xml b/core/tests/coretests/res/layout/list_filter.xml
similarity index 100%
rename from tests/FrameworkTest/res/layout/list_filter.xml
rename to core/tests/coretests/res/layout/list_filter.xml

core/tests/coretests/res/layout/list_in_horizontal.xml

diff --git a/tests/FrameworkTest/res/layout/list_in_horizontal.xml b/core/tests/coretests/res/layout/list_in_horizontal.xml
similarity index 100%
rename from tests/FrameworkTest/res/layout/list_in_horizontal.xml
rename to core/tests/coretests/res/layout/list_in_horizontal.xml

core/tests/coretests/res/layout/list_in_vertical.xml

diff --git a/tests/FrameworkTest/res/layout/list_in_vertical.xml b/core/tests/coretests/res/layout/list_in_vertical.xml
similarity index 100%
rename from tests/FrameworkTest/res/layout/list_in_vertical.xml
rename to core/tests/coretests/res/layout/list_in_vertical.xml

core/tests/coretests/res/layout/list_recycler_profiling.xml

diff --git a/tests/FrameworkTest/res/layout/list_recycler_profiling.xml b/core/tests/coretests/res/layout/list_recycler_profiling.xml
similarity index 100%
rename from tests/FrameworkTest/res/layout/list_recycler_profiling.xml
rename to core/tests/coretests/res/layout/list_recycler_profiling.xml

core/tests/coretests/res/layout/list_scroll_listener.xml

diff --git a/tests/FrameworkTest/res/layout/list_scroll_listener.xml b/core/tests/coretests/res/layout/list_scroll_listener.xml
similarity index 100%
rename from tests/FrameworkTest/res/layout/list_scroll_listener.xml
rename to core/tests/coretests/res/layout/list_scroll_listener.xml

core/tests/coretests/res/layout/list_take_focus_from_side.xml

diff --git a/tests/FrameworkTest/res/layout/list_take_focus_from_side.xml b/core/tests/coretests/res/layout/list_take_focus_from_side.xml
similarity index 100%
rename from tests/FrameworkTest/res/layout/list_take_focus_from_side.xml
rename to core/tests/coretests/res/layout/list_take_focus_from_side.xml

core/tests/coretests/res/layout/list_thrasher.xml

diff --git a/tests/FrameworkTest/res/layout/list_thrasher.xml b/core/tests/coretests/res/layout/list_thrasher.xml
similarity index 100%
rename from tests/FrameworkTest/res/layout/list_thrasher.xml
rename to core/tests/coretests/res/layout/list_thrasher.xml

core/tests/coretests/res/layout/list_with_button_above.xml

diff --git a/tests/FrameworkTest/res/layout/list_with_button_above.xml b/core/tests/coretests/res/layout/list_with_button_above.xml
similarity index 100%
rename from tests/FrameworkTest/res/layout/list_with_button_above.xml
rename to core/tests/coretests/res/layout/list_with_button_above.xml

core/tests/coretests/res/layout/list_with_disappearing_item_bug_item.xml

diff --git a/tests/FrameworkTest/res/layout/list_with_disappearing_item_bug_item.xml b/core/tests/coretests/res/layout/list_with_disappearing_item_bug_item.xml
similarity index 100%
rename from tests/FrameworkTest/res/layout/list_with_disappearing_item_bug_item.xml
rename to core/tests/coretests/res/layout/list_with_disappearing_item_bug_item.xml

core/tests/coretests/res/layout/list_with_empty_view.xml

diff --git a/tests/FrameworkTest/res/layout/list_with_empty_view.xml b/core/tests/coretests/res/layout/list_with_empty_view.xml
similarity index 100%
rename from tests/FrameworkTest/res/layout/list_with_empty_view.xml
rename to core/tests/coretests/res/layout/list_with_empty_view.xml

core/tests/coretests/res/layout/longpress.xml

diff --git a/tests/FrameworkTest/res/layout/longpress.xml b/core/tests/coretests/res/layout/longpress.xml
similarity index 100%
rename from tests/FrameworkTest/res/layout/longpress.xml
rename to core/tests/coretests/res/layout/longpress.xml

core/tests/coretests/res/layout/mail_message.xml

diff --git a/tests/FrameworkTest/res/layout/mail_message.xml b/core/tests/coretests/res/layout/mail_message.xml
similarity index 100%
rename from tests/FrameworkTest/res/layout/mail_message.xml
rename to core/tests/coretests/res/layout/mail_message.xml

core/tests/coretests/res/layout/merge_child.xml

diff --git a/tests/FrameworkTest/res/layout/merge_child.xml b/core/tests/coretests/res/layout/merge_child.xml
similarity index 100%
rename from tests/FrameworkTest/res/layout/merge_child.xml
rename to core/tests/coretests/res/layout/merge_child.xml

core/tests/coretests/res/layout/merge_tag.xml

diff --git a/tests/FrameworkTest/res/layout/merge_tag.xml b/core/tests/coretests/res/layout/merge_tag.xml
similarity index 100%
rename from tests/FrameworkTest/res/layout/merge_tag.xml
rename to core/tests/coretests/res/layout/merge_tag.xml

core/tests/coretests/res/layout/popup_window_visibility.xml

diff --git a/tests/FrameworkTest/res/layout/popup_window_visibility.xml b/core/tests/coretests/res/layout/popup_window_visibility.xml
similarity index 100%
rename from tests/FrameworkTest/res/layout/popup_window_visibility.xml
rename to core/tests/coretests/res/layout/popup_window_visibility.xml

core/tests/coretests/res/layout/pre_draw_listener.xml

diff --git a/tests/FrameworkTest/res/layout/pre_draw_listener.xml b/core/tests/coretests/res/layout/pre_draw_listener.xml
similarity index 92%
rename from tests/FrameworkTest/res/layout/pre_draw_listener.xml
rename to core/tests/coretests/res/layout/pre_draw_listener.xml
index 7a8f33f..f431f14 100644
--- a/tests/FrameworkTest/res/layout/pre_draw_listener.xml
+++ b/core/tests/coretests/res/layout/pre_draw_listener.xml
@@ -26,7 +26,7 @@
         android:layout_height="0dip"
         android:layout_weight="1">
         
-        <view class="com.android.frameworktest.view.PreDrawListener$MyLinearLayout" android:id="@+id/frame"
+        <view class="android.view.PreDrawListener$MyLinearLayout" android:id="@+id/frame"
             android:orientation="vertical"
             android:layout_width="match_parent" 
             android:layout_height="match_parent" />

core/tests/coretests/res/layout/radiogroup_checkedchild.xml

diff --git a/tests/FrameworkTest/res/layout/radiogroup_checkedchild.xml b/core/tests/coretests/res/layout/radiogroup_checkedchild.xml
similarity index 100%
rename from tests/FrameworkTest/res/layout/radiogroup_checkedchild.xml
rename to core/tests/coretests/res/layout/radiogroup_checkedchild.xml

core/tests/coretests/res/layout/remote_view_host.xml

diff --git a/tests/FrameworkTest/res/layout/remote_view_host.xml b/core/tests/coretests/res/layout/remote_view_host.xml
similarity index 100%
rename from tests/FrameworkTest/res/layout/remote_view_host.xml
rename to core/tests/coretests/res/layout/remote_view_host.xml

core/tests/coretests/res/layout/remote_view_test_bad_1.xml

diff --git a/tests/FrameworkTest/res/layout/remote_view_test_bad_1.xml b/core/tests/coretests/res/layout/remote_view_test_bad_1.xml
similarity index 100%
rename from tests/FrameworkTest/res/layout/remote_view_test_bad_1.xml
rename to core/tests/coretests/res/layout/remote_view_test_bad_1.xml

core/tests/coretests/res/layout/remote_view_test_bad_2.xml

diff --git a/tests/FrameworkTest/res/layout/remote_view_test_bad_2.xml b/core/tests/coretests/res/layout/remote_view_test_bad_2.xml
similarity index 100%
rename from tests/FrameworkTest/res/layout/remote_view_test_bad_2.xml
rename to core/tests/coretests/res/layout/remote_view_test_bad_2.xml

core/tests/coretests/res/layout/remote_view_test_good.xml

diff --git a/tests/FrameworkTest/res/layout/remote_view_test_good.xml b/core/tests/coretests/res/layout/remote_view_test_good.xml
similarity index 100%
rename from tests/FrameworkTest/res/layout/remote_view_test_good.xml
rename to core/tests/coretests/res/layout/remote_view_test_good.xml

core/tests/coretests/res/layout/scroll_to_rect_with_internal_scroll.xml

diff --git a/tests/FrameworkTest/res/layout/scroll_to_rect_with_internal_scroll.xml b/core/tests/coretests/res/layout/scroll_to_rect_with_internal_scroll.xml
similarity index 100%
rename from tests/FrameworkTest/res/layout/scroll_to_rect_with_internal_scroll.xml
rename to core/tests/coretests/res/layout/scroll_to_rect_with_internal_scroll.xml

core/tests/coretests/res/layout/scroll_to_rectangle.xml

diff --git a/tests/FrameworkTest/res/layout/scroll_to_rectangle.xml b/core/tests/coretests/res/layout/scroll_to_rectangle.xml
similarity index 100%
rename from tests/FrameworkTest/res/layout/scroll_to_rectangle.xml
rename to core/tests/coretests/res/layout/scroll_to_rectangle.xml

core/tests/coretests/res/layout/scrollview_linear_layout.xml

diff --git a/tests/FrameworkTest/res/layout/scrollview_linear_layout.xml b/core/tests/coretests/res/layout/scrollview_linear_layout.xml
similarity index 100%
rename from tests/FrameworkTest/res/layout/scrollview_linear_layout.xml
rename to core/tests/coretests/res/layout/scrollview_linear_layout.xml

core/tests/coretests/res/layout/scrollview_with_webviews.xml

diff --git a/tests/FrameworkTest/res/layout/scrollview_with_webviews.xml b/core/tests/coretests/res/layout/scrollview_with_webviews.xml
similarity index 100%
rename from tests/FrameworkTest/res/layout/scrollview_with_webviews.xml
rename to core/tests/coretests/res/layout/scrollview_with_webviews.xml

core/tests/coretests/res/layout/table_layout_cell_span.xml

diff --git a/tests/FrameworkTest/res/layout/table_layout_cell_span.xml b/core/tests/coretests/res/layout/table_layout_cell_span.xml
similarity index 100%
rename from tests/FrameworkTest/res/layout/table_layout_cell_span.xml
rename to core/tests/coretests/res/layout/table_layout_cell_span.xml

core/tests/coretests/res/layout/table_layout_fixed_width.xml

diff --git a/tests/FrameworkTest/res/layout/table_layout_fixed_width.xml b/core/tests/coretests/res/layout/table_layout_fixed_width.xml
similarity index 100%
rename from tests/FrameworkTest/res/layout/table_layout_fixed_width.xml
rename to core/tests/coretests/res/layout/table_layout_fixed_width.xml

core/tests/coretests/res/layout/table_layout_horizontal_gravity.xml

diff --git a/tests/FrameworkTest/res/layout/table_layout_horizontal_gravity.xml b/core/tests/coretests/res/layout/table_layout_horizontal_gravity.xml
similarity index 100%
rename from tests/FrameworkTest/res/layout/table_layout_horizontal_gravity.xml
rename to core/tests/coretests/res/layout/table_layout_horizontal_gravity.xml

core/tests/coretests/res/layout/table_layout_vertical_gravity.xml

diff --git a/tests/FrameworkTest/res/layout/table_layout_vertical_gravity.xml b/core/tests/coretests/res/layout/table_layout_vertical_gravity.xml
similarity index 100%
rename from tests/FrameworkTest/res/layout/table_layout_vertical_gravity.xml
rename to core/tests/coretests/res/layout/table_layout_vertical_gravity.xml

core/tests/coretests/res/layout/table_layout_weight.xml

diff --git a/tests/FrameworkTest/res/layout/table_layout_weight.xml b/core/tests/coretests/res/layout/table_layout_weight.xml
similarity index 100%
rename from tests/FrameworkTest/res/layout/table_layout_weight.xml
rename to core/tests/coretests/res/layout/table_layout_weight.xml

core/tests/coretests/res/layout/translucent_background.xml

diff --git a/tests/FrameworkTest/res/layout/translucent_background.xml b/core/tests/coretests/res/layout/translucent_background.xml
similarity index 100%
rename from tests/FrameworkTest/res/layout/translucent_background.xml
rename to core/tests/coretests/res/layout/translucent_background.xml

core/tests/coretests/res/layout/viewgroupchildren.xml

diff --git a/tests/FrameworkTest/res/layout/viewgroupchildren.xml b/core/tests/coretests/res/layout/viewgroupchildren.xml
similarity index 100%
rename from tests/FrameworkTest/res/layout/viewgroupchildren.xml
rename to core/tests/coretests/res/layout/viewgroupchildren.xml

core/tests/coretests/res/layout/viewstub.xml

diff --git a/tests/FrameworkTest/res/layout/viewstub.xml b/core/tests/coretests/res/layout/viewstub.xml
similarity index 100%
rename from tests/FrameworkTest/res/layout/viewstub.xml
rename to core/tests/coretests/res/layout/viewstub.xml

core/tests/coretests/res/layout/visibility.xml

diff --git a/tests/FrameworkTest/res/layout/visibility.xml b/core/tests/coretests/res/layout/visibility.xml
similarity index 100%
rename from tests/FrameworkTest/res/layout/visibility.xml
rename to core/tests/coretests/res/layout/visibility.xml

core/tests/coretests/res/layout/visibility_callback.xml

diff --git a/tests/FrameworkTest/res/layout/visibility_callback.xml b/core/tests/coretests/res/layout/visibility_callback.xml
similarity index 96%
rename from tests/FrameworkTest/res/layout/visibility_callback.xml
rename to core/tests/coretests/res/layout/visibility_callback.xml
index 322b640..9034b3f 100644
--- a/tests/FrameworkTest/res/layout/visibility_callback.xml
+++ b/core/tests/coretests/res/layout/visibility_callback.xml
@@ -40,7 +40,7 @@
       <FrameLayout android:id="@+id/parent"
                    android:layout_width="match_parent"
                    android:layout_height="wrap_content">
-          <view class="com.android.frameworktest.view.VisibilityCallback$MonitoredTextView"
+          <view class="android.view.VisibilityCallback$MonitoredTextView"
                 android:id="@+id/victim"
                 android:background="@drawable/green"
                 android:layout_width="match_parent"

core/tests/coretests/res/layout/weight_sum.xml

diff --git a/tests/FrameworkTest/res/layout/weight_sum.xml b/core/tests/coretests/res/layout/weight_sum.xml
similarity index 100%
rename from tests/FrameworkTest/res/layout/weight_sum.xml
rename to core/tests/coretests/res/layout/weight_sum.xml

core/tests/coretests/res/layout/with_bitmap_background.xml

diff --git a/tests/FrameworkTest/res/layout/with_bitmap_background.xml b/core/tests/coretests/res/layout/with_bitmap_background.xml
similarity index 100%
rename from tests/FrameworkTest/res/layout/with_bitmap_background.xml
rename to core/tests/coretests/res/layout/with_bitmap_background.xml

core/tests/coretests/res/layout/zero_sized.xml

diff --git a/tests/FrameworkTest/res/layout/zero_sized.xml b/core/tests/coretests/res/layout/zero_sized.xml
similarity index 100%
rename from tests/FrameworkTest/res/layout/zero_sized.xml
rename to core/tests/coretests/res/layout/zero_sized.xml

core/tests/coretests/res/values/arrays.xml

diff --git a/tests/FrameworkTest/res/values/arrays.xml b/core/tests/coretests/res/values/arrays.xml
similarity index 100%
rename from tests/FrameworkTest/res/values/arrays.xml
rename to core/tests/coretests/res/values/arrays.xml

core/tests/coretests/res/values/attrs.xml

diff --git a/tests/FrameworkTest/res/values/attrs.xml b/core/tests/coretests/res/values/attrs.xml
similarity index 100%
rename from tests/FrameworkTest/res/values/attrs.xml
rename to core/tests/coretests/res/values/attrs.xml

core/tests/coretests/res/values/colors.xml

diff --git a/tests/FrameworkTest/res/values/colors.xml b/core/tests/coretests/res/values/colors.xml
similarity index 100%
rename from tests/FrameworkTest/res/values/colors.xml
rename to core/tests/coretests/res/values/colors.xml

core/tests/coretests/res/values/strings.xml

diff --git a/tests/FrameworkTest/res/values/strings.xml b/core/tests/coretests/res/values/strings.xml
similarity index 100%
rename from tests/FrameworkTest/res/values/strings.xml
rename to core/tests/coretests/res/values/strings.xml

core/tests/coretests/res/values/styles.xml

diff --git a/core/tests/coretests/res/values/styles.xml b/core/tests/coretests/res/values/styles.xml
new file mode 100644
index 0000000..7a90197
--- /dev/null
+++ b/core/tests/coretests/res/values/styles.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<resources>
+    <style name="Theme" parent="android:Theme">
+        <item name="android:windowAnimationStyle">@style/Animation</item>
+    </style>
+
+    <style name="Animation">
+        <item name="android:activityOpenEnterAnimation">@null</item>
+        <item name="android:activityOpenExitAnimation">@null</item>
+        <item name="android:activityCloseEnterAnimation">@null</item>
+        <item name="android:activityCloseExitAnimation">@null</item>
+        <item name="android:taskOpenEnterAnimation">@null</item>
+        <item name="android:taskOpenExitAnimation">@null</item>
+        <item name="android:taskCloseEnterAnimation">@null</item>
+        <item name="android:taskCloseExitAnimation">@null</item>
+        <item name="android:taskToFrontEnterAnimation">@null</item>
+        <item name="android:taskToFrontExitAnimation">@null</item>
+        <item name="android:taskToBackEnterAnimation">@null</item>
+        <item name="android:taskToBackExitAnimation">@null</item>
+    </style>
+</resources>

core/tests/coretests/src/android/accessibilityservice/AccessibilityTestService.java

diff --git a/tests/FrameworkTest/src/com/android/frameworktest/accessibility/AccessibilityTestService.java b/core/tests/coretests/src/android/accessibilityservice/AccessibilityTestService.java
similarity index 98%
rename from tests/FrameworkTest/src/com/android/frameworktest/accessibility/AccessibilityTestService.java
rename to core/tests/coretests/src/android/accessibilityservice/AccessibilityTestService.java
index 83d6056..2a51eea 100644
--- a/tests/FrameworkTest/src/com/android/frameworktest/accessibility/AccessibilityTestService.java
+++ b/core/tests/coretests/src/android/accessibilityservice/AccessibilityTestService.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.accessibility;
+package android.accessibilityservice;
 
 import android.accessibilityservice.AccessibilityService;
 import android.accessibilityservice.AccessibilityServiceInfo;

core/tests/coretests/src/android/app/TranslucentFancyActivity.java

diff --git a/tests/FrameworkTest/src/com/android/frameworktest/activity/TranslucentFancyActivity.java b/core/tests/coretests/src/android/app/TranslucentFancyActivity.java
similarity index 96%
rename from tests/FrameworkTest/src/com/android/frameworktest/activity/TranslucentFancyActivity.java
rename to core/tests/coretests/src/android/app/TranslucentFancyActivity.java
index 9492f91..ec5ad7a 100644
--- a/tests/FrameworkTest/src/com/android/frameworktest/activity/TranslucentFancyActivity.java
+++ b/core/tests/coretests/src/android/app/TranslucentFancyActivity.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.activity;
+package android.app;
 
-import com.android.frameworktest.R;
+import com.android.frameworks.coretests.R;
 
 import android.app.Activity;
 import android.os.Bundle;

core/tests/coretests/src/android/content/ContentProviderOperationTest.java

diff --git a/tests/FrameworkTest/tests/src/android/content/ContentProviderOperationTest.java b/core/tests/coretests/src/android/content/ContentProviderOperationTest.java
similarity index 100%
rename from tests/FrameworkTest/tests/src/android/content/ContentProviderOperationTest.java
rename to core/tests/coretests/src/android/content/ContentProviderOperationTest.java

core/tests/coretests/src/android/content/SearchRecentSuggestionsProviderTest.java

diff --git a/tests/FrameworkTest/tests/src/android/content/SearchRecentSuggestionsProviderTest.java b/core/tests/coretests/src/android/content/SearchRecentSuggestionsProviderTest.java
similarity index 100%
rename from tests/FrameworkTest/tests/src/android/content/SearchRecentSuggestionsProviderTest.java
rename to core/tests/coretests/src/android/content/SearchRecentSuggestionsProviderTest.java

core/tests/coretests/src/android/database/sqlite/AbstractJDBCDriverTest.java

diff --git a/core/tests/coretests/src/android/database/sqlite/AbstractJDBCDriverTest.java b/core/tests/coretests/src/android/database/sqlite/AbstractJDBCDriverTest.java
index e381a5e..19c7bcb 100644
--- a/core/tests/coretests/src/android/database/sqlite/AbstractJDBCDriverTest.java
+++ b/core/tests/coretests/src/android/database/sqlite/AbstractJDBCDriverTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package android.core;
+package android.database.sqlite;
 
 import java.io.File;
 import java.sql.Connection;

core/tests/coretests/src/android/database/sqlite/SQLiteJDBCDriverTest.java

diff --git a/core/tests/coretests/src/android/database/sqlite/SQLiteJDBCDriverTest.java b/core/tests/coretests/src/android/database/sqlite/SQLiteJDBCDriverTest.java
index eec82aa..8e677a5 100644
--- a/core/tests/coretests/src/android/database/sqlite/SQLiteJDBCDriverTest.java
+++ b/core/tests/coretests/src/android/database/sqlite/SQLiteJDBCDriverTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package android.core;
+package android.database.sqlite;
 
 import java.io.File;
 import java.sql.Connection;

core/tests/coretests/src/android/os/BrightnessLimit.java

diff --git a/tests/FrameworkTest/src/com/android/frameworktest/settings/BrightnessLimit.java b/core/tests/coretests/src/android/os/BrightnessLimit.java
similarity index 95%
rename from tests/FrameworkTest/src/com/android/frameworktest/settings/BrightnessLimit.java
rename to core/tests/coretests/src/android/os/BrightnessLimit.java
index 6d5996c..5e9b906 100644
--- a/tests/FrameworkTest/src/com/android/frameworktest/settings/BrightnessLimit.java
+++ b/core/tests/coretests/src/android/os/BrightnessLimit.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.settings;
+package android.os;
 
 import android.os.IPowerManager;
 
@@ -27,7 +27,7 @@
 import android.view.View.OnClickListener;
 import android.widget.Button;
 
-import com.android.frameworktest.R;
+import com.android.frameworks.coretests.R;
 
 /**
  * Tries to set the brightness to 0. Should be silently thwarted by the framework.

core/tests/coretests/src/android/text/HtmlTest.java

diff --git a/tests/FrameworkTest/tests/src/com/android/frameworktest/text/HtmlTest.java b/core/tests/coretests/src/android/text/HtmlTest.java
similarity index 97%
rename from tests/FrameworkTest/tests/src/com/android/frameworktest/text/HtmlTest.java
rename to core/tests/coretests/src/android/text/HtmlTest.java
index 9b309c4..a79b93e 100644
--- a/tests/FrameworkTest/tests/src/com/android/frameworktest/text/HtmlTest.java
+++ b/core/tests/coretests/src/android/text/HtmlTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.text;
+package android.text;
 
 import android.test.InstrumentationTestCase;
 import android.test.suitebuilder.annotation.MediumTest;

core/tests/coretests/src/android/text/SpannableStringBuilderTest.java

diff --git a/tests/FrameworkTest/tests/src/com/android/frameworktest/text/SpannableStringBuilderTest.java b/core/tests/coretests/src/android/text/SpannableStringBuilderTest.java
similarity index 86%
rename from tests/FrameworkTest/tests/src/com/android/frameworktest/text/SpannableStringBuilderTest.java
rename to core/tests/coretests/src/android/text/SpannableStringBuilderTest.java
index a807977..02c7634 100644
--- a/tests/FrameworkTest/tests/src/com/android/frameworktest/text/SpannableStringBuilderTest.java
+++ b/core/tests/coretests/src/android/text/SpannableStringBuilderTest.java
@@ -1,4 +1,4 @@
-package com.android.frameworktest.text;
+package android.text;
 
 import android.text.Spannable;
 import android.text.SpannableStringBuilder;

core/tests/coretests/src/android/text/SpannableStringTest.java

diff --git a/tests/FrameworkTest/tests/src/com/android/frameworktest/text/SpannableStringTest.java b/core/tests/coretests/src/android/text/SpannableStringTest.java
similarity index 85%
rename from tests/FrameworkTest/tests/src/com/android/frameworktest/text/SpannableStringTest.java
rename to core/tests/coretests/src/android/text/SpannableStringTest.java
index 311df23..e9a3281 100644
--- a/tests/FrameworkTest/tests/src/com/android/frameworktest/text/SpannableStringTest.java
+++ b/core/tests/coretests/src/android/text/SpannableStringTest.java
@@ -1,4 +1,4 @@
-package com.android.frameworktest.text;
+package android.text;
 
 import android.text.Spannable;
 import android.text.SpannableString;

core/tests/coretests/src/android/text/SpannableTest.java

diff --git a/tests/FrameworkTest/tests/src/com/android/frameworktest/text/SpannableTest.java b/core/tests/coretests/src/android/text/SpannableTest.java
similarity index 96%
rename from tests/FrameworkTest/tests/src/com/android/frameworktest/text/SpannableTest.java
rename to core/tests/coretests/src/android/text/SpannableTest.java
index a5f6836..8e78912 100644
--- a/tests/FrameworkTest/tests/src/com/android/frameworktest/text/SpannableTest.java
+++ b/core/tests/coretests/src/android/text/SpannableTest.java
@@ -1,4 +1,4 @@
-package com.android.frameworktest.text;
+package android.text;
 
 import android.test.InstrumentationTestCase;
 import android.test.MoreAsserts;

core/tests/coretests/src/android/util/ExpandableListScenario.java

diff --git a/tests/FrameworkTest/src/com/android/frameworktest/util/ExpandableListScenario.java b/core/tests/coretests/src/android/util/ExpandableListScenario.java
similarity index 99%
rename from tests/FrameworkTest/src/com/android/frameworktest/util/ExpandableListScenario.java
rename to core/tests/coretests/src/android/util/ExpandableListScenario.java
index 5aa9479..4a12b0d 100644
--- a/tests/FrameworkTest/src/com/android/frameworktest/util/ExpandableListScenario.java
+++ b/core/tests/coretests/src/android/util/ExpandableListScenario.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.util;
+package android.util;
 
 import java.util.ArrayList;
 import java.util.List;

core/tests/coretests/src/android/util/GridScenario.java

diff --git a/tests/FrameworkTest/src/com/android/frameworktest/util/GridScenario.java b/core/tests/coretests/src/android/util/GridScenario.java
similarity index 99%
rename from tests/FrameworkTest/src/com/android/frameworktest/util/GridScenario.java
rename to core/tests/coretests/src/android/util/GridScenario.java
index 76a1101..0f1730e 100644
--- a/tests/FrameworkTest/src/com/android/frameworktest/util/GridScenario.java
+++ b/core/tests/coretests/src/android/util/GridScenario.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.util;
+package android.util;
 
 import android.app.Activity;
 import android.os.Bundle;

core/tests/coretests/src/android/util/InternalSelectionView.java

diff --git a/tests/FrameworkTest/src/com/android/frameworktest/util/InternalSelectionView.java b/core/tests/coretests/src/android/util/InternalSelectionView.java
similarity index 98%
rename from tests/FrameworkTest/src/com/android/frameworktest/util/InternalSelectionView.java
rename to core/tests/coretests/src/android/util/InternalSelectionView.java
index e500b94..babf38d 100644
--- a/tests/FrameworkTest/src/com/android/frameworktest/util/InternalSelectionView.java
+++ b/core/tests/coretests/src/android/util/InternalSelectionView.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.util;
+package android.util;
 
-import com.android.frameworktest.R;
+import com.android.frameworks.coretests.R;
 
 import android.view.View;
 import android.view.KeyEvent;

core/tests/coretests/src/android/util/KeyUtils.java

diff --git a/tests/FrameworkTest/src/com/android/frameworktest/util/KeyUtils.java b/core/tests/coretests/src/android/util/KeyUtils.java
similarity index 98%
rename from tests/FrameworkTest/src/com/android/frameworktest/util/KeyUtils.java
rename to core/tests/coretests/src/android/util/KeyUtils.java
index 06feab4..b58fda3 100644
--- a/tests/FrameworkTest/src/com/android/frameworktest/util/KeyUtils.java
+++ b/core/tests/coretests/src/android/util/KeyUtils.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.util;
+package android.util;
 
 import android.app.Instrumentation;
 import android.os.SystemClock;

core/tests/coretests/src/android/util/ListItemFactory.java

diff --git a/tests/FrameworkTest/src/com/android/frameworktest/util/ListItemFactory.java b/core/tests/coretests/src/android/util/ListItemFactory.java
similarity index 99%
rename from tests/FrameworkTest/src/com/android/frameworktest/util/ListItemFactory.java
rename to core/tests/coretests/src/android/util/ListItemFactory.java
index 2c1cf5b..e8a498d 100644
--- a/tests/FrameworkTest/src/com/android/frameworktest/util/ListItemFactory.java
+++ b/core/tests/coretests/src/android/util/ListItemFactory.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.util;
+package android.util;
 
 import android.content.Context;
 import android.view.Gravity;

core/tests/coretests/src/android/util/ListScenario.java

diff --git a/tests/FrameworkTest/src/com/android/frameworktest/util/ListScenario.java b/core/tests/coretests/src/android/util/ListScenario.java
similarity index 99%
rename from tests/FrameworkTest/src/com/android/frameworktest/util/ListScenario.java
rename to core/tests/coretests/src/android/util/ListScenario.java
index a6ae188..22be4e7 100644
--- a/tests/FrameworkTest/src/com/android/frameworktest/util/ListScenario.java
+++ b/core/tests/coretests/src/android/util/ListScenario.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.util;
+package android.util;
 
 import android.app.Activity;
 import android.graphics.Rect;

core/tests/coretests/src/android/util/ListUtil.java

diff --git a/tests/FrameworkTest/src/com/android/frameworktest/util/ListUtil.java b/core/tests/coretests/src/android/util/ListUtil.java
similarity index 98%
rename from tests/FrameworkTest/src/com/android/frameworktest/util/ListUtil.java
rename to core/tests/coretests/src/android/util/ListUtil.java
index 1a05fac..2a7cb96 100644
--- a/tests/FrameworkTest/src/com/android/frameworktest/util/ListUtil.java
+++ b/core/tests/coretests/src/android/util/ListUtil.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.util;
+package android.util;
 
 import android.app.Instrumentation;
 import android.view.KeyEvent;

core/tests/coretests/src/android/util/ScrollViewScenario.java

diff --git a/tests/FrameworkTest/src/com/android/frameworktest/util/ScrollViewScenario.java b/core/tests/coretests/src/android/util/ScrollViewScenario.java
similarity index 99%
rename from tests/FrameworkTest/src/com/android/frameworktest/util/ScrollViewScenario.java
rename to core/tests/coretests/src/android/util/ScrollViewScenario.java
index daa168d..83afe06 100644
--- a/tests/FrameworkTest/src/com/android/frameworktest/util/ScrollViewScenario.java
+++ b/core/tests/coretests/src/android/util/ScrollViewScenario.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.util;
+package android.util;
 
 import com.google.android.collect.Lists;
 

core/tests/coretests/src/android/util/TouchModeFlexibleAsserts.java

diff --git a/tests/FrameworkTest/src/com/android/frameworktest/util/TouchModeFlexibleAsserts.java b/core/tests/coretests/src/android/util/TouchModeFlexibleAsserts.java
similarity index 98%
rename from tests/FrameworkTest/src/com/android/frameworktest/util/TouchModeFlexibleAsserts.java
rename to core/tests/coretests/src/android/util/TouchModeFlexibleAsserts.java
index 66adb17..ca12a15 100644
--- a/tests/FrameworkTest/src/com/android/frameworktest/util/TouchModeFlexibleAsserts.java
+++ b/core/tests/coretests/src/android/util/TouchModeFlexibleAsserts.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.util;
+package android.util;
 
 import junit.framework.Assert;
 

core/tests/coretests/src/android/view/BigCache.java

diff --git a/tests/FrameworkTest/src/com/android/frameworktest/view/BigCache.java b/core/tests/coretests/src/android/view/BigCache.java
similarity index 96%
rename from tests/FrameworkTest/src/com/android/frameworktest/view/BigCache.java
rename to core/tests/coretests/src/android/view/BigCache.java
index 52f7a07..2182176 100644
--- a/tests/FrameworkTest/src/com/android/frameworktest/view/BigCache.java
+++ b/core/tests/coretests/src/android/view/BigCache.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.view;
+package android.view;
 
-import com.android.frameworktest.R;
+import com.android.frameworks.coretests.R;
 
 import android.os.Bundle;
 import android.app.Activity;

core/tests/coretests/src/android/view/BigCacheTest.java

diff --git a/tests/FrameworkTest/tests/src/com/android/frameworktest/view/BigCacheTest.java b/core/tests/coretests/src/android/view/BigCacheTest.java
similarity index 93%
rename from tests/FrameworkTest/tests/src/com/android/frameworktest/view/BigCacheTest.java
rename to core/tests/coretests/src/android/view/BigCacheTest.java
index 8c5dc60..8c2c865 100644
--- a/tests/FrameworkTest/tests/src/com/android/frameworktest/view/BigCacheTest.java
+++ b/core/tests/coretests/src/android/view/BigCacheTest.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.view;
+package android.view;
 
-import com.android.frameworktest.view.BigCache;
-import com.android.frameworktest.R;
+import android.view.BigCache;
+import com.android.frameworks.coretests.R;
 
 import android.test.ActivityInstrumentationTestCase;
 import android.test.suitebuilder.annotation.MediumTest;
@@ -35,7 +35,7 @@
     private View mLarge;
 
     public BigCacheTest() {
-        super("com.android.frameworktest", BigCache.class);
+        super("com.android.frameworks.coretests", BigCache.class);
     }
 
     @Override

core/tests/coretests/src/android/view/BitmapDrawable.java

diff --git a/tests/FrameworkTest/src/com/android/frameworktest/drawable/BitmapDrawable.java b/core/tests/coretests/src/android/view/BitmapDrawable.java
similarity index 93%
rename from tests/FrameworkTest/src/com/android/frameworktest/drawable/BitmapDrawable.java
rename to core/tests/coretests/src/android/view/BitmapDrawable.java
index e88ebf9..f7bad84 100644
--- a/tests/FrameworkTest/src/com/android/frameworktest/drawable/BitmapDrawable.java
+++ b/core/tests/coretests/src/android/view/BitmapDrawable.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.drawable;
+package android.view;
 
-import com.android.frameworktest.R;
+import com.android.frameworks.coretests.R;
 
 import android.app.Activity;
 import android.graphics.drawable.Drawable;

core/tests/coretests/src/android/view/Disabled.java

diff --git a/tests/FrameworkTest/src/com/android/frameworktest/view/Disabled.java b/core/tests/coretests/src/android/view/Disabled.java
similarity index 94%
rename from tests/FrameworkTest/src/com/android/frameworktest/view/Disabled.java
rename to core/tests/coretests/src/android/view/Disabled.java
index 1f1f4f4..fa92107 100644
--- a/tests/FrameworkTest/src/com/android/frameworktest/view/Disabled.java
+++ b/core/tests/coretests/src/android/view/Disabled.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.view;
+package android.view;
 
-import com.android.frameworktest.R;
+import com.android.frameworks.coretests.R;
 
 import android.os.Bundle;
 import android.widget.Button;

core/tests/coretests/src/android/view/DisabledLongpressTest.java

diff --git a/tests/FrameworkTest/tests/src/com/android/frameworktest/view/DisabledLongpressTest.java b/core/tests/coretests/src/android/view/DisabledLongpressTest.java
similarity index 91%
rename from tests/FrameworkTest/tests/src/com/android/frameworktest/view/DisabledLongpressTest.java
rename to core/tests/coretests/src/android/view/DisabledLongpressTest.java
index ef3ecee..3123897 100644
--- a/tests/FrameworkTest/tests/src/com/android/frameworktest/view/DisabledLongpressTest.java
+++ b/core/tests/coretests/src/android/view/DisabledLongpressTest.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.view;
+package android.view;
 
-import com.android.frameworktest.view.Longpress;
-import com.android.frameworktest.R;
-import com.android.frameworktest.util.KeyUtils;
+import android.view.Longpress;
+import com.android.frameworks.coretests.R;
+import android.util.KeyUtils;
 import android.test.TouchUtils;
 import android.test.suitebuilder.annotation.LargeTest;
 import android.test.suitebuilder.annotation.MediumTest;
@@ -36,7 +36,7 @@
     private boolean mLongClicked;
     
     public DisabledLongpressTest() {
-        super("com.android.frameworktest", Longpress.class);
+        super("com.android.frameworks.coretests", Longpress.class);
     }
 
     @Override

core/tests/coretests/src/android/view/DisabledTest.java

diff --git a/tests/FrameworkTest/tests/src/com/android/frameworktest/view/DisabledTest.java b/core/tests/coretests/src/android/view/DisabledTest.java
similarity index 94%
rename from tests/FrameworkTest/tests/src/com/android/frameworktest/view/DisabledTest.java
rename to core/tests/coretests/src/android/view/DisabledTest.java
index d9ed033..992c277 100644
--- a/tests/FrameworkTest/tests/src/com/android/frameworktest/view/DisabledTest.java
+++ b/core/tests/coretests/src/android/view/DisabledTest.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.view;
+package android.view;
 
-import com.android.frameworktest.R;
+import com.android.frameworks.coretests.R;
 import android.test.TouchUtils;
 import android.test.suitebuilder.annotation.MediumTest;
 import android.test.suitebuilder.annotation.LargeTest;
@@ -36,7 +36,7 @@
     private boolean mParentClicked;
 
     public DisabledTest() {
-        super("com.android.frameworktest", Disabled.class);
+        super("com.android.frameworks.coretests", Disabled.class);
     }
 
     @Override

core/tests/coretests/src/android/view/DrawableBgMinSize.java

diff --git a/tests/FrameworkTest/src/com/android/frameworktest/drawable/DrawableBgMinSize.java b/core/tests/coretests/src/android/view/DrawableBgMinSize.java
similarity index 97%
rename from tests/FrameworkTest/src/com/android/frameworktest/drawable/DrawableBgMinSize.java
rename to core/tests/coretests/src/android/view/DrawableBgMinSize.java
index a382995..a75b23a 100644
--- a/tests/FrameworkTest/src/com/android/frameworktest/drawable/DrawableBgMinSize.java
+++ b/core/tests/coretests/src/android/view/DrawableBgMinSize.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.drawable;
+package android.view;
 
-import com.android.frameworktest.R;
+import com.android.frameworks.coretests.R;
 
 import android.app.Activity;
 import android.graphics.drawable.Drawable;

core/tests/coretests/src/android/view/DrawableBgMinSizeTest.java

diff --git a/tests/FrameworkTest/tests/src/com/android/frameworktest/drawable/DrawableBgMinSizeTest.java b/core/tests/coretests/src/android/view/DrawableBgMinSizeTest.java
similarity index 95%
rename from tests/FrameworkTest/tests/src/com/android/frameworktest/drawable/DrawableBgMinSizeTest.java
rename to core/tests/coretests/src/android/view/DrawableBgMinSizeTest.java
index ef6297d..e705c87 100644
--- a/tests/FrameworkTest/tests/src/com/android/frameworktest/drawable/DrawableBgMinSizeTest.java
+++ b/core/tests/coretests/src/android/view/DrawableBgMinSizeTest.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.drawable;
+package android.view;
 
-import com.android.frameworktest.R;
-import com.android.frameworktest.drawable.DrawableBgMinSize;
+import com.android.frameworks.coretests.R;
+import android.view.DrawableBgMinSize;
 import android.test.TouchUtils;
 import android.test.suitebuilder.annotation.MediumTest;
 
@@ -49,7 +49,7 @@
     private AbsoluteLayout mAbsoluteLayout;
     
     public DrawableBgMinSizeTest() {
-        super("com.android.frameworktest", DrawableBgMinSize.class);
+        super("com.android.frameworks.coretests", DrawableBgMinSize.class);
     }
 
     @Override

core/tests/coretests/src/android/view/FocusFinderTest.java

diff --git a/core/tests/coretests/src/android/view/FocusFinderTest.java b/core/tests/coretests/src/android/view/FocusFinderTest.java
index 7ac8dfc..186689f 100644
--- a/core/tests/coretests/src/android/view/FocusFinderTest.java
+++ b/core/tests/coretests/src/android/view/FocusFinderTest.java
@@ -256,7 +256,7 @@
     }
 
     /**
-     * Grabbed from {@link com.android.frameworktest.focus.VerticalFocusSearchTest#testSearchFromMidLeft()}
+     * Grabbed from {@link android.widget.focus.VerticalFocusSearchTest#testSearchFromMidLeft()}
      */
     @SmallTest
     public void testVerticalFocusSearchScenario() {
@@ -350,7 +350,7 @@
 
     /**
      * A dial pad with 9 squares arranged in a grid.  no padding, so
-     * the edges are equal.  see {@link com.android.frameworktest.focus.LinearLayoutGrid}
+     * the edges are equal.  see {@link android.widget.focus.LinearLayoutGrid}
      */
     @SmallTest
     public void testGridWithTouchingEdges() {

core/tests/coretests/src/android/view/GlobalFocusChange.java

diff --git a/tests/FrameworkTest/src/com/android/frameworktest/view/GlobalFocusChange.java b/core/tests/coretests/src/android/view/GlobalFocusChange.java
similarity index 94%
rename from tests/FrameworkTest/src/com/android/frameworktest/view/GlobalFocusChange.java
rename to core/tests/coretests/src/android/view/GlobalFocusChange.java
index 1cbf05a..041c0de 100644
--- a/tests/FrameworkTest/src/com/android/frameworktest/view/GlobalFocusChange.java
+++ b/core/tests/coretests/src/android/view/GlobalFocusChange.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.view;
+package android.view;
 
-import com.android.frameworktest.R;
+import com.android.frameworks.coretests.R;
 
 import android.app.Activity;
 import android.os.Bundle;

core/tests/coretests/src/android/view/GlobalFocusChangeTest.java

diff --git a/tests/FrameworkTest/tests/src/com/android/frameworktest/view/GlobalFocusChangeTest.java b/core/tests/coretests/src/android/view/GlobalFocusChangeTest.java
similarity index 94%
rename from tests/FrameworkTest/tests/src/com/android/frameworktest/view/GlobalFocusChangeTest.java
rename to core/tests/coretests/src/android/view/GlobalFocusChangeTest.java
index 8a8d728..89e32e4 100644
--- a/tests/FrameworkTest/tests/src/com/android/frameworktest/view/GlobalFocusChangeTest.java
+++ b/core/tests/coretests/src/android/view/GlobalFocusChangeTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.view;
+package android.view;
 
 import android.test.ActivityInstrumentationTestCase;
 import android.test.FlakyTest;
@@ -23,7 +23,7 @@
 import android.test.TouchUtils;
 import android.view.View;
 import android.view.KeyEvent;
-import com.android.frameworktest.R;
+import com.android.frameworks.coretests.R;
 
 public class GlobalFocusChangeTest extends ActivityInstrumentationTestCase<GlobalFocusChange> {
     private GlobalFocusChange mActivity;
@@ -31,7 +31,7 @@
     private View mRight;
 
     public GlobalFocusChangeTest() {
-        super("com.android.frameworktest", GlobalFocusChange.class);
+        super("com.android.frameworks.coretests", GlobalFocusChange.class);
     }
 
     @Override

core/tests/coretests/src/android/view/Include.java

diff --git a/tests/FrameworkTest/src/com/android/frameworktest/view/Include.java b/core/tests/coretests/src/android/view/Include.java
similarity index 91%
rename from tests/FrameworkTest/src/com/android/frameworktest/view/Include.java
rename to core/tests/coretests/src/android/view/Include.java
index fc36e37..e90c484 100644
--- a/tests/FrameworkTest/src/com/android/frameworktest/view/Include.java
+++ b/core/tests/coretests/src/android/view/Include.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.view;
+package android.view;
 
-import com.android.frameworktest.R;
+import com.android.frameworks.coretests.R;
 
 import android.os.Bundle;
 import android.app.Activity;

core/tests/coretests/src/android/view/IncludeTest.java

diff --git a/tests/FrameworkTest/tests/src/com/android/frameworktest/view/IncludeTest.java b/core/tests/coretests/src/android/view/IncludeTest.java
similarity index 93%
rename from tests/FrameworkTest/tests/src/com/android/frameworktest/view/IncludeTest.java
rename to core/tests/coretests/src/android/view/IncludeTest.java
index 2e0a18a..cdcfa3c 100644
--- a/tests/FrameworkTest/tests/src/com/android/frameworktest/view/IncludeTest.java
+++ b/core/tests/coretests/src/android/view/IncludeTest.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.view;
+package android.view;
 
-import com.android.frameworktest.view.Include;
-import com.android.frameworktest.R;
+import android.view.Include;
+import com.android.frameworks.coretests.R;
 
 import android.test.ActivityInstrumentationTestCase;
 import android.test.suitebuilder.annotation.MediumTest;
@@ -26,7 +26,7 @@
 
 public class IncludeTest extends ActivityInstrumentationTestCase<Include> {
     public IncludeTest() {
-        super("com.android.frameworktest", Include.class);
+        super("com.android.frameworks.coretests", Include.class);
     }
 
     @Override

core/tests/coretests/src/android/view/ListContextMenu.java

diff --git a/tests/FrameworkTest/src/com/android/frameworktest/menus/ListContextMenu.java b/core/tests/coretests/src/android/view/ListContextMenu.java
similarity index 98%
rename from tests/FrameworkTest/src/com/android/frameworktest/menus/ListContextMenu.java
rename to core/tests/coretests/src/android/view/ListContextMenu.java
index 13c7552..1b4ece6 100644
--- a/tests/FrameworkTest/src/com/android/frameworktest/menus/ListContextMenu.java
+++ b/core/tests/coretests/src/android/view/ListContextMenu.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.menus;
+package android.view;
 
-import com.android.frameworktest.R;
+import com.android.frameworks.coretests.R;
 
 import android.app.ListActivity;
 import android.content.Context;

core/tests/coretests/src/android/view/Longpress.java

diff --git a/tests/FrameworkTest/src/com/android/frameworktest/view/Longpress.java b/core/tests/coretests/src/android/view/Longpress.java
similarity index 91%
rename from tests/FrameworkTest/src/com/android/frameworktest/view/Longpress.java
rename to core/tests/coretests/src/android/view/Longpress.java
index f3483fc..e8e6f13 100644
--- a/tests/FrameworkTest/src/com/android/frameworktest/view/Longpress.java
+++ b/core/tests/coretests/src/android/view/Longpress.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.view;
+package android.view;
 
-import com.android.frameworktest.R;
+import com.android.frameworks.coretests.R;
 
 import android.app.Activity;
 import android.os.Bundle;

core/tests/coretests/src/android/view/LongpressTest.java

diff --git a/tests/FrameworkTest/tests/src/com/android/frameworktest/view/LongpressTest.java b/core/tests/coretests/src/android/view/LongpressTest.java
similarity index 90%
rename from tests/FrameworkTest/tests/src/com/android/frameworktest/view/LongpressTest.java
rename to core/tests/coretests/src/android/view/LongpressTest.java
index 37106f6..45ce331 100644
--- a/tests/FrameworkTest/tests/src/com/android/frameworktest/view/LongpressTest.java
+++ b/core/tests/coretests/src/android/view/LongpressTest.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.view;
+package android.view;
 
-import com.android.frameworktest.view.Longpress;
-import com.android.frameworktest.R;
-import com.android.frameworktest.util.KeyUtils;
+import android.view.Longpress;
+import com.android.frameworks.coretests.R;
+import android.util.KeyUtils;
 import android.test.TouchUtils;
 import android.test.suitebuilder.annotation.LargeTest;
 import android.test.suitebuilder.annotation.MediumTest;
@@ -35,7 +35,7 @@
     private boolean mLongClicked;
     
     public LongpressTest() {
-        super("com.android.frameworktest", Longpress.class);
+        super("com.android.frameworks.coretests", Longpress.class);
     }
 
     @Override

core/tests/coretests/src/android/view/Merge.java

diff --git a/tests/FrameworkTest/src/com/android/frameworktest/view/Merge.java b/core/tests/coretests/src/android/view/Merge.java
similarity index 93%
rename from tests/FrameworkTest/src/com/android/frameworktest/view/Merge.java
rename to core/tests/coretests/src/android/view/Merge.java
index 9596e91..bdacd81 100644
--- a/tests/FrameworkTest/src/com/android/frameworktest/view/Merge.java
+++ b/core/tests/coretests/src/android/view/Merge.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.view;
+package android.view;
 
-import com.android.frameworktest.R;
+import com.android.frameworks.coretests.R;
 
 import android.os.Bundle;
 import android.app.Activity;

core/tests/coretests/src/android/view/MergeTest.java

diff --git a/tests/FrameworkTest/tests/src/com/android/frameworktest/view/MergeTest.java b/core/tests/coretests/src/android/view/MergeTest.java
similarity index 89%
rename from tests/FrameworkTest/tests/src/com/android/frameworktest/view/MergeTest.java
rename to core/tests/coretests/src/android/view/MergeTest.java
index 612ebd4..acfee7e 100644
--- a/tests/FrameworkTest/tests/src/com/android/frameworktest/view/MergeTest.java
+++ b/core/tests/coretests/src/android/view/MergeTest.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.view;
+package android.view;
 
-import com.android.frameworktest.view.Merge;
+import android.view.Merge;
 
 import android.test.ActivityInstrumentationTestCase;
 import android.test.suitebuilder.annotation.MediumTest;
@@ -24,7 +24,7 @@
 
 public class MergeTest extends ActivityInstrumentationTestCase<Merge> {
     public MergeTest() {
-        super("com.android.frameworktest", Merge.class);
+        super("com.android.frameworks.coretests", Merge.class);
     }
 
     @Override

core/tests/coretests/src/android/view/MutateDrawable.java

diff --git a/tests/FrameworkTest/src/com/android/frameworktest/drawable/MutateDrawable.java b/core/tests/coretests/src/android/view/MutateDrawable.java
similarity index 94%
rename from tests/FrameworkTest/src/com/android/frameworktest/drawable/MutateDrawable.java
rename to core/tests/coretests/src/android/view/MutateDrawable.java
index 2fcaea3..39b5789 100644
--- a/tests/FrameworkTest/src/com/android/frameworktest/drawable/MutateDrawable.java
+++ b/core/tests/coretests/src/android/view/MutateDrawable.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.drawable;
+package android.view;
 
 import android.app.Activity;
 import android.os.Bundle;
 import android.widget.LinearLayout;
 import android.widget.Button;
-import com.android.frameworktest.R;
+import com.android.frameworks.coretests.R;
 
 public class MutateDrawable extends Activity {
     @Override

core/tests/coretests/src/android/view/MutateDrawableTest.java

diff --git a/tests/FrameworkTest/tests/src/com/android/frameworktest/drawable/MutateDrawableTest.java b/core/tests/coretests/src/android/view/MutateDrawableTest.java
similarity index 89%
rename from tests/FrameworkTest/tests/src/com/android/frameworktest/drawable/MutateDrawableTest.java
rename to core/tests/coretests/src/android/view/MutateDrawableTest.java
index 53085ca..74e011d 100644
--- a/tests/FrameworkTest/tests/src/com/android/frameworktest/drawable/MutateDrawableTest.java
+++ b/core/tests/coretests/src/android/view/MutateDrawableTest.java
@@ -14,26 +14,27 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.drawable;
+package android.view;
 
 import android.test.ActivityInstrumentationTestCase2;
 import android.test.suitebuilder.annotation.MediumTest;
 import android.view.View;
+import android.view.MutateDrawable;
 
 public class MutateDrawableTest extends ActivityInstrumentationTestCase2<MutateDrawable> {
     private View mFirstButton;
     private View mSecondButton;
 
     public MutateDrawableTest() {
-        super("com.android.frameworktest", MutateDrawable.class);
+        super("com.android.frameworks.coretests", MutateDrawable.class);
     }
 
     @Override
     protected void setUp() throws Exception {
         super.setUp();
 
-        mFirstButton = getActivity().findViewById(com.android.frameworktest.R.id.a);
-        mSecondButton = getActivity().findViewById(com.android.frameworktest.R.id.b);
+        mFirstButton = getActivity().findViewById(com.android.frameworks.coretests.R.id.a);
+        mSecondButton = getActivity().findViewById(com.android.frameworks.coretests.R.id.b);
     }
 
     @MediumTest

core/tests/coretests/src/android/view/PopupWindowVisibility.java

diff --git a/tests/FrameworkTest/src/com/android/frameworktest/view/PopupWindowVisibility.java b/core/tests/coretests/src/android/view/PopupWindowVisibility.java
similarity index 98%
rename from tests/FrameworkTest/src/com/android/frameworktest/view/PopupWindowVisibility.java
rename to core/tests/coretests/src/android/view/PopupWindowVisibility.java
index f4d477d4..7eb0468 100644
--- a/tests/FrameworkTest/src/com/android/frameworktest/view/PopupWindowVisibility.java
+++ b/core/tests/coretests/src/android/view/PopupWindowVisibility.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.view;
+package android.view;
 
 import android.app.Activity;
 import android.os.Bundle;
@@ -25,7 +25,7 @@
 import android.widget.Button;
 import android.widget.Spinner;
 
-import com.android.frameworktest.R;
+import com.android.frameworks.coretests.R;
 
 /**
  * Tests views with popupWindows becoming invisible

core/tests/coretests/src/android/view/PreDrawListener.java

diff --git a/tests/FrameworkTest/src/com/android/frameworktest/view/PreDrawListener.java b/core/tests/coretests/src/android/view/PreDrawListener.java
similarity index 96%
rename from tests/FrameworkTest/src/com/android/frameworktest/view/PreDrawListener.java
rename to core/tests/coretests/src/android/view/PreDrawListener.java
index e907b24..981c6c0 100644
--- a/tests/FrameworkTest/src/com/android/frameworktest/view/PreDrawListener.java
+++ b/core/tests/coretests/src/android/view/PreDrawListener.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.view;
+package android.view;
 
 import android.app.Activity;
 import android.content.Context;
@@ -26,7 +26,7 @@
 import android.widget.Button;
 import android.widget.LinearLayout;
 
-import com.android.frameworktest.R;
+import com.android.frameworks.coretests.R;
 
 
 /**

core/tests/coretests/src/android/view/RemoteViewsActivity.java

diff --git a/tests/FrameworkTest/src/com/android/frameworktest/view/RemoteViewsActivity.java b/core/tests/coretests/src/android/view/RemoteViewsActivity.java
similarity index 92%
rename from tests/FrameworkTest/src/com/android/frameworktest/view/RemoteViewsActivity.java
rename to core/tests/coretests/src/android/view/RemoteViewsActivity.java
index 146c0ab..6f3ba04 100644
--- a/tests/FrameworkTest/src/com/android/frameworktest/view/RemoteViewsActivity.java
+++ b/core/tests/coretests/src/android/view/RemoteViewsActivity.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.view;
+package android.view;
 
 import android.app.Activity;
 import android.os.Bundle;
 
-import com.android.frameworktest.R;
+import com.android.frameworks.coretests.R;
 
 /**
  * Exercise RemoteViews -- especially filtering

core/tests/coretests/src/android/view/RunQueue.java

diff --git a/tests/FrameworkTest/src/com/android/frameworktest/view/RunQueue.java b/core/tests/coretests/src/android/view/RunQueue.java
similarity index 96%
rename from tests/FrameworkTest/src/com/android/frameworktest/view/RunQueue.java
rename to core/tests/coretests/src/android/view/RunQueue.java
index c8c3c28..85dd32e 100644
--- a/tests/FrameworkTest/src/com/android/frameworktest/view/RunQueue.java
+++ b/core/tests/coretests/src/android/view/RunQueue.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.view;
+package android.view;
 
 import android.app.Activity;
 import android.os.Bundle;
 import android.widget.TextView;
 import android.view.View;
 import android.view.ViewTreeObserver;
-import com.android.frameworktest.R;
+import com.android.frameworks.coretests.R;
 
 /**
  * Tests views using post*() and getViewTreeObserver() before onAttachedToWindow().

core/tests/coretests/src/android/view/RunQueueTest.java

diff --git a/tests/FrameworkTest/tests/src/com/android/frameworktest/view/RunQueueTest.java b/core/tests/coretests/src/android/view/RunQueueTest.java
similarity index 94%
rename from tests/FrameworkTest/tests/src/com/android/frameworktest/view/RunQueueTest.java
rename to core/tests/coretests/src/android/view/RunQueueTest.java
index dc8fcd8..d69860b 100644
--- a/tests/FrameworkTest/tests/src/com/android/frameworktest/view/RunQueueTest.java
+++ b/core/tests/coretests/src/android/view/RunQueueTest.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.view;
+package android.view;
 
 import android.test.ActivityInstrumentationTestCase;
 import android.test.suitebuilder.annotation.MediumTest;
 
 public class RunQueueTest extends ActivityInstrumentationTestCase<RunQueue> {
     public RunQueueTest() {
-        super("com.android.frameworktest", RunQueue.class);
+        super("com.android.frameworks.coretests", RunQueue.class);
     }
 
     @Override

core/tests/coretests/src/android/view/SetTagsTest.java

diff --git a/tests/FrameworkTest/tests/src/com/android/frameworktest/view/SetTagsTest.java b/core/tests/coretests/src/android/view/SetTagsTest.java
similarity index 95%
rename from tests/FrameworkTest/tests/src/com/android/frameworktest/view/SetTagsTest.java
rename to core/tests/coretests/src/android/view/SetTagsTest.java
index 523eeaf..373dce6 100644
--- a/tests/FrameworkTest/tests/src/com/android/frameworktest/view/SetTagsTest.java
+++ b/core/tests/coretests/src/android/view/SetTagsTest.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.view;
+package android.view;
 
-import com.android.frameworktest.R;
+import com.android.frameworks.coretests.R;
 import android.test.suitebuilder.annotation.MediumTest;
 
 import android.test.ActivityInstrumentationTestCase2;
@@ -29,7 +29,7 @@
     private Button mView;
 
     public SetTagsTest() {
-        super("com.android.frameworktest", Disabled.class);
+        super("com.android.frameworks.coretests", Disabled.class);
     }
 
     @Override

core/tests/coretests/src/android/view/StubbedView.java

diff --git a/tests/FrameworkTest/src/com/android/frameworktest/view/StubbedView.java b/core/tests/coretests/src/android/view/StubbedView.java
similarity index 93%
rename from tests/FrameworkTest/src/com/android/frameworktest/view/StubbedView.java
rename to core/tests/coretests/src/android/view/StubbedView.java
index 2b0db9d..612095c 100644
--- a/tests/FrameworkTest/src/com/android/frameworktest/view/StubbedView.java
+++ b/core/tests/coretests/src/android/view/StubbedView.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.view;
+package android.view;
 
-import com.android.frameworktest.R;
+import com.android.frameworks.coretests.R;
 
 import android.os.Bundle;
 import android.app.Activity;

core/tests/coretests/src/android/view/ViewGroupChildren.java

diff --git a/tests/FrameworkTest/src/com/android/frameworktest/view/ViewGroupChildren.java b/core/tests/coretests/src/android/view/ViewGroupChildren.java
similarity index 92%
rename from tests/FrameworkTest/src/com/android/frameworktest/view/ViewGroupChildren.java
rename to core/tests/coretests/src/android/view/ViewGroupChildren.java
index 163e03c..f39720b 100644
--- a/tests/FrameworkTest/src/com/android/frameworktest/view/ViewGroupChildren.java
+++ b/core/tests/coretests/src/android/view/ViewGroupChildren.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.view;
+package android.view;
 
-import com.android.frameworktest.R;
+import com.android.frameworks.coretests.R;
 
 import android.os.Bundle;
 import android.widget.Button;

core/tests/coretests/src/android/view/ViewGroupChildrenTest.java

diff --git a/tests/FrameworkTest/tests/src/com/android/frameworktest/view/ViewGroupChildrenTest.java b/core/tests/coretests/src/android/view/ViewGroupChildrenTest.java
similarity index 97%
rename from tests/FrameworkTest/tests/src/com/android/frameworktest/view/ViewGroupChildrenTest.java
rename to core/tests/coretests/src/android/view/ViewGroupChildrenTest.java
index a6007e1..d1665ef 100644
--- a/tests/FrameworkTest/tests/src/com/android/frameworktest/view/ViewGroupChildrenTest.java
+++ b/core/tests/coretests/src/android/view/ViewGroupChildrenTest.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.view;
+package android.view;
 
-import com.android.frameworktest.R;
-import com.android.frameworktest.view.ViewGroupChildren;
+import com.android.frameworks.coretests.R;
+import android.view.ViewGroupChildren;
 
 import android.test.ActivityInstrumentationTestCase;
 import android.test.suitebuilder.annotation.MediumTest;
@@ -35,7 +35,7 @@
     private ViewGroup mGroup;
 
     public ViewGroupChildrenTest() {
-        super("com.android.frameworktest", ViewGroupChildren.class);
+        super("com.android.frameworks.coretests", ViewGroupChildren.class);
     }
 
     @Override

core/tests/coretests/src/android/view/ViewStubTest.java

diff --git a/tests/FrameworkTest/tests/src/com/android/frameworktest/view/ViewStubTest.java b/core/tests/coretests/src/android/view/ViewStubTest.java
similarity index 93%
rename from tests/FrameworkTest/tests/src/com/android/frameworktest/view/ViewStubTest.java
rename to core/tests/coretests/src/android/view/ViewStubTest.java
index 89bd646..ebd52a6 100644
--- a/tests/FrameworkTest/tests/src/com/android/frameworktest/view/ViewStubTest.java
+++ b/core/tests/coretests/src/android/view/ViewStubTest.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.view;
+package android.view;
 
-import com.android.frameworktest.view.StubbedView;
-import com.android.frameworktest.R;
+import android.view.StubbedView;
+import com.android.frameworks.coretests.R;
 
 import android.test.ActivityInstrumentationTestCase;
 import android.test.suitebuilder.annotation.MediumTest;
@@ -27,7 +27,7 @@
 
 public class ViewStubTest extends ActivityInstrumentationTestCase<StubbedView> {
     public ViewStubTest() {
-        super("com.android.frameworktest", StubbedView.class);
+        super("com.android.frameworks.coretests", StubbedView.class);
     }
 
     @Override

core/tests/coretests/src/android/view/Visibility.java

diff --git a/tests/FrameworkTest/src/com/android/frameworktest/view/Visibility.java b/core/tests/coretests/src/android/view/Visibility.java
similarity index 96%
rename from tests/FrameworkTest/src/com/android/frameworktest/view/Visibility.java
rename to core/tests/coretests/src/android/view/Visibility.java
index e068620..97ff252 100644
--- a/tests/FrameworkTest/src/com/android/frameworktest/view/Visibility.java
+++ b/core/tests/coretests/src/android/view/Visibility.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.view;
+package android.view;
 
-import com.android.frameworktest.R;
+import com.android.frameworks.coretests.R;
 
 import android.os.Bundle;
 import android.widget.Button;

core/tests/coretests/src/android/view/VisibilityCallback.java

diff --git a/tests/FrameworkTest/src/com/android/frameworktest/view/VisibilityCallback.java b/core/tests/coretests/src/android/view/VisibilityCallback.java
similarity index 97%
rename from tests/FrameworkTest/src/com/android/frameworktest/view/VisibilityCallback.java
rename to core/tests/coretests/src/android/view/VisibilityCallback.java
index c601f102..7290a62 100644
--- a/tests/FrameworkTest/src/com/android/frameworktest/view/VisibilityCallback.java
+++ b/core/tests/coretests/src/android/view/VisibilityCallback.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.view;
+package android.view;
 
 import android.content.Context;
 import android.util.AttributeSet;
 import android.util.Log;
 import android.widget.TextView;
-import com.android.frameworktest.R;
+import com.android.frameworks.coretests.R;
 
 import android.os.Bundle;
 import android.widget.Button;

core/tests/coretests/src/android/view/VisibilityCallbackTest.java

diff --git a/tests/FrameworkTest/tests/src/com/android/frameworktest/view/VisibilityCallbackTest.java b/core/tests/coretests/src/android/view/VisibilityCallbackTest.java
similarity index 95%
rename from tests/FrameworkTest/tests/src/com/android/frameworktest/view/VisibilityCallbackTest.java
rename to core/tests/coretests/src/android/view/VisibilityCallbackTest.java
index 6bef230..ec956d2 100644
--- a/tests/FrameworkTest/tests/src/com/android/frameworktest/view/VisibilityCallbackTest.java
+++ b/core/tests/coretests/src/android/view/VisibilityCallbackTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.view;
+package android.view;
 
 import android.test.ActivityInstrumentationTestCase2;
 import android.test.UiThreadTest;
@@ -23,7 +23,7 @@
 import android.view.ViewGroup;
 import android.widget.Button;
 import android.widget.TextView;
-import com.android.frameworktest.R;
+import com.android.frameworks.coretests.R;
 
 /**
  * Exercises {@link android.view.View}'s ability to change visibility between
@@ -39,7 +39,7 @@
     private Button mGone;
 
     public VisibilityCallbackTest() {
-        super("com.android.frameworktest", VisibilityCallback.class);
+        super("com.android.frameworks.coretests", VisibilityCallback.class);
     }
 
     @Override

core/tests/coretests/src/android/view/VisibilityTest.java

diff --git a/tests/FrameworkTest/tests/src/com/android/frameworktest/view/VisibilityTest.java b/core/tests/coretests/src/android/view/VisibilityTest.java
similarity index 96%
rename from tests/FrameworkTest/tests/src/com/android/frameworktest/view/VisibilityTest.java
rename to core/tests/coretests/src/android/view/VisibilityTest.java
index 77b281d..17d2e3e 100644
--- a/tests/FrameworkTest/tests/src/com/android/frameworktest/view/VisibilityTest.java
+++ b/core/tests/coretests/src/android/view/VisibilityTest.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.view;
+package android.view;
 
-import com.android.frameworktest.view.Visibility;
-import com.android.frameworktest.R;
+import android.view.Visibility;
+import com.android.frameworks.coretests.R;
 
 import android.test.ActivityInstrumentationTestCase;
 import android.test.suitebuilder.annotation.LargeTest;
@@ -40,7 +40,7 @@
     private Button mGone;
 
     public VisibilityTest() {
-        super("com.android.frameworktest", Visibility.class);
+        super("com.android.frameworks.coretests", Visibility.class);
     }
 
     @Override

core/tests/coretests/src/android/view/ZeroSized.java

diff --git a/tests/FrameworkTest/src/com/android/frameworktest/view/ZeroSized.java b/core/tests/coretests/src/android/view/ZeroSized.java
similarity index 92%
rename from tests/FrameworkTest/src/com/android/frameworktest/view/ZeroSized.java
rename to core/tests/coretests/src/android/view/ZeroSized.java
index e858fc0..f2a6b3e 100644
--- a/tests/FrameworkTest/src/com/android/frameworktest/view/ZeroSized.java
+++ b/core/tests/coretests/src/android/view/ZeroSized.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.view;
+package android.view;
 
-import com.android.frameworktest.R;
+import com.android.frameworks.coretests.R;
 
 import android.os.Bundle;
 import android.app.Activity;

core/tests/coretests/src/android/view/ZeroSizedTest.java

diff --git a/tests/FrameworkTest/tests/src/com/android/frameworktest/view/ZeroSizedTest.java b/core/tests/coretests/src/android/view/ZeroSizedTest.java
similarity index 94%
rename from tests/FrameworkTest/tests/src/com/android/frameworktest/view/ZeroSizedTest.java
rename to core/tests/coretests/src/android/view/ZeroSizedTest.java
index cd646e4..193fc98 100644
--- a/tests/FrameworkTest/tests/src/com/android/frameworktest/view/ZeroSizedTest.java
+++ b/core/tests/coretests/src/android/view/ZeroSizedTest.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.view;
+package android.view;
 
-import com.android.frameworktest.view.ZeroSized;
-import com.android.frameworktest.R;
+import android.view.ZeroSized;
+import com.android.frameworks.coretests.R;
 
 import android.test.ActivityInstrumentationTestCase;
 import android.test.suitebuilder.annotation.MediumTest;
@@ -36,7 +36,7 @@
     private View mWithNoDimension;
 
     public ZeroSizedTest() {
-        super("com.android.frameworktest", ZeroSized.class);
+        super("com.android.frameworks.coretests", ZeroSized.class);
     }
 
     @Override

core/tests/coretests/src/android/view/accessibility/RecycleAccessibilityEventTest.java

diff --git a/tests/FrameworkTest/tests/src/com/android/frameworktest/accessibility/RecycleAccessibilityEventTest.java b/core/tests/coretests/src/android/view/accessibility/RecycleAccessibilityEventTest.java
similarity index 97%
rename from tests/FrameworkTest/tests/src/com/android/frameworktest/accessibility/RecycleAccessibilityEventTest.java
rename to core/tests/coretests/src/android/view/accessibility/RecycleAccessibilityEventTest.java
index d6380f9..df8d836 100644
--- a/tests/FrameworkTest/tests/src/com/android/frameworktest/accessibility/RecycleAccessibilityEventTest.java
+++ b/core/tests/coretests/src/android/view/accessibility/RecycleAccessibilityEventTest.java
@@ -12,7 +12,7 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.accessibility;
+package android.view.accessibility;
 
 import android.test.suitebuilder.annotation.MediumTest;
 import android.view.accessibility.AccessibilityEvent;

core/tests/coretests/src/android/view/menu/MenuLayout.java

diff --git a/tests/FrameworkTest/src/com/android/frameworktest/menus/MenuLayout.java b/core/tests/coretests/src/android/view/menu/MenuLayout.java
similarity index 94%
rename from tests/FrameworkTest/src/com/android/frameworktest/menus/MenuLayout.java
rename to core/tests/coretests/src/android/view/menu/MenuLayout.java
index 6ed6433..356c948 100644
--- a/tests/FrameworkTest/src/com/android/frameworktest/menus/MenuLayout.java
+++ b/core/tests/coretests/src/android/view/menu/MenuLayout.java
@@ -14,9 +14,9 @@
  * under the License.
  */
 
-package com.android.frameworktest.menus;
+package android.view.menu;
 
-import com.android.frameworktest.menus.MenuScenario.Params;
+import android.view.menu.MenuScenario.Params;
 
 import android.os.Bundle;
 import android.view.Menu;

core/tests/coretests/src/android/view/menu/MenuLayoutLandscape.java

diff --git a/tests/FrameworkTest/src/com/android/frameworktest/menus/MenuLayoutLandscape.java b/core/tests/coretests/src/android/view/menu/MenuLayoutLandscape.java
similarity index 94%
rename from tests/FrameworkTest/src/com/android/frameworktest/menus/MenuLayoutLandscape.java
rename to core/tests/coretests/src/android/view/menu/MenuLayoutLandscape.java
index 8a98610..662cb6a 100644
--- a/tests/FrameworkTest/src/com/android/frameworktest/menus/MenuLayoutLandscape.java
+++ b/core/tests/coretests/src/android/view/menu/MenuLayoutLandscape.java
@@ -14,7 +14,7 @@
  * under the License.
  */
 
-package com.android.frameworktest.menus;
+package android.view.menu;
 
 /**
  * An activity (inherits from MenuLayout) that shows in landscape.

core/tests/coretests/src/android/view/menu/MenuLayoutLandscapeTest.java

diff --git a/tests/FrameworkTest/tests/src/com/android/frameworktest/menus/MenuLayoutLandscapeTest.java b/core/tests/coretests/src/android/view/menu/MenuLayoutLandscapeTest.java
similarity index 97%
rename from tests/FrameworkTest/tests/src/com/android/frameworktest/menus/MenuLayoutLandscapeTest.java
rename to core/tests/coretests/src/android/view/menu/MenuLayoutLandscapeTest.java
index 38cb6a1..d9bf860 100644
--- a/tests/FrameworkTest/tests/src/com/android/frameworktest/menus/MenuLayoutLandscapeTest.java
+++ b/core/tests/coretests/src/android/view/menu/MenuLayoutLandscapeTest.java
@@ -14,9 +14,9 @@
  * under the License.
  */
 
-package com.android.frameworktest.menus;
+package android.view.menu;
 
-import com.android.frameworktest.util.KeyUtils;
+import android.util.KeyUtils;
 import com.android.internal.view.menu.IconMenuView;
 import com.android.internal.view.menu.MenuBuilder;
 
@@ -30,7 +30,7 @@
     private MenuLayout mActivity;
     
     public MenuLayoutLandscapeTest() {
-        super("com.android.frameworktest", MenuLayoutLandscape.class);
+        super("com.android.frameworks.coretests", MenuLayoutLandscape.class);
     }
     
     @Override

core/tests/coretests/src/android/view/menu/MenuLayoutPortrait.java

diff --git a/tests/FrameworkTest/src/com/android/frameworktest/menus/MenuLayoutPortrait.java b/core/tests/coretests/src/android/view/menu/MenuLayoutPortrait.java
similarity index 94%
rename from tests/FrameworkTest/src/com/android/frameworktest/menus/MenuLayoutPortrait.java
rename to core/tests/coretests/src/android/view/menu/MenuLayoutPortrait.java
index 71e7e49..5e94bd7 100644
--- a/tests/FrameworkTest/src/com/android/frameworktest/menus/MenuLayoutPortrait.java
+++ b/core/tests/coretests/src/android/view/menu/MenuLayoutPortrait.java
@@ -14,7 +14,7 @@
  * under the License.
  */
 
-package com.android.frameworktest.menus;
+package android.view.menu;
 
 /**
  * An activity (inherits from MenuLayout) that shows in portrait.

core/tests/coretests/src/android/view/menu/MenuLayoutPortraitTest.java

diff --git a/tests/FrameworkTest/tests/src/com/android/frameworktest/menus/MenuLayoutPortraitTest.java b/core/tests/coretests/src/android/view/menu/MenuLayoutPortraitTest.java
similarity index 97%
rename from tests/FrameworkTest/tests/src/com/android/frameworktest/menus/MenuLayoutPortraitTest.java
rename to core/tests/coretests/src/android/view/menu/MenuLayoutPortraitTest.java
index a04ec62..ad746b07 100644
--- a/tests/FrameworkTest/tests/src/com/android/frameworktest/menus/MenuLayoutPortraitTest.java
+++ b/core/tests/coretests/src/android/view/menu/MenuLayoutPortraitTest.java
@@ -14,9 +14,9 @@
  * under the License.
  */
 
-package com.android.frameworktest.menus;
+package android.view.menu;
 
-import com.android.frameworktest.util.KeyUtils;
+import android.util.KeyUtils;
 import com.android.internal.view.menu.IconMenuView;
 import com.android.internal.view.menu.MenuBuilder;
 
@@ -30,7 +30,7 @@
     private MenuLayout mActivity;
     
     public MenuLayoutPortraitTest() {
-        super("com.android.frameworktest", MenuLayoutPortrait.class);
+        super("com.android.frameworks.coretests", MenuLayoutPortrait.class);
     }
     
     @Override

core/tests/coretests/src/android/view/menu/MenuScenario.java

diff --git a/tests/FrameworkTest/src/com/android/frameworktest/menus/MenuScenario.java b/core/tests/coretests/src/android/view/menu/MenuScenario.java
similarity index 98%
rename from tests/FrameworkTest/src/com/android/frameworktest/menus/MenuScenario.java
rename to core/tests/coretests/src/android/view/menu/MenuScenario.java
index 4df9b1b..b0b8802 100644
--- a/tests/FrameworkTest/src/com/android/frameworktest/menus/MenuScenario.java
+++ b/core/tests/coretests/src/android/view/menu/MenuScenario.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.menus;
+package android.view.menu;
 
-import com.android.frameworktest.util.ListScenario;
+import android.util.ListScenario;
 import com.android.internal.view.menu.MenuBuilder;
 import com.android.internal.view.menu.MenuBuilder.MenuAdapter;
 

core/tests/coretests/src/android/view/menu/MenuWith1Item.java

diff --git a/tests/FrameworkTest/src/com/android/frameworktest/menus/MenuWith1Item.java b/core/tests/coretests/src/android/view/menu/MenuWith1Item.java
similarity index 96%
rename from tests/FrameworkTest/src/com/android/frameworktest/menus/MenuWith1Item.java
rename to core/tests/coretests/src/android/view/menu/MenuWith1Item.java
index d7468f5..293c44b 100644
--- a/tests/FrameworkTest/src/com/android/frameworktest/menus/MenuWith1Item.java
+++ b/core/tests/coretests/src/android/view/menu/MenuWith1Item.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.menus;
+package android.view.menu;
 
 import android.os.Bundle;
 import android.widget.Button;

core/tests/coretests/src/android/view/menu/MenuWith1ItemTest.java

diff --git a/tests/FrameworkTest/tests/src/com/android/frameworktest/menus/MenuWith1ItemTest.java b/core/tests/coretests/src/android/view/menu/MenuWith1ItemTest.java
similarity index 92%
rename from tests/FrameworkTest/tests/src/com/android/frameworktest/menus/MenuWith1ItemTest.java
rename to core/tests/coretests/src/android/view/menu/MenuWith1ItemTest.java
index 286533c..4e71053 100644
--- a/tests/FrameworkTest/tests/src/com/android/frameworktest/menus/MenuWith1ItemTest.java
+++ b/core/tests/coretests/src/android/view/menu/MenuWith1ItemTest.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.menus;
+package android.view.menu;
 
-import com.android.frameworktest.menus.MenuWith1Item;
-import com.android.frameworktest.util.KeyUtils;
+import android.view.menu.MenuWith1Item;
+import android.util.KeyUtils;
 import com.android.internal.view.menu.MenuBuilder;
 
 import android.test.suitebuilder.annotation.LargeTest;
@@ -32,7 +32,7 @@
     private MenuWith1Item mActivity;
     
     public MenuWith1ItemTest() {
-        super("com.android.frameworktest", MenuWith1Item.class);
+        super("com.android.frameworks.coretests", MenuWith1Item.class);
     }
     
     @Override

core/tests/coretests/src/android/widget/AutoCompleteTextViewCallbacks.java

diff --git a/tests/FrameworkTest/tests/src/android/widget/AutoCompleteTextViewCallbacks.java b/core/tests/coretests/src/android/widget/AutoCompleteTextViewCallbacks.java
similarity index 98%
rename from tests/FrameworkTest/tests/src/android/widget/AutoCompleteTextViewCallbacks.java
rename to core/tests/coretests/src/android/widget/AutoCompleteTextViewCallbacks.java
index 1b81c98..8e73b52 100644
--- a/tests/FrameworkTest/tests/src/android/widget/AutoCompleteTextViewCallbacks.java
+++ b/core/tests/coretests/src/android/widget/AutoCompleteTextViewCallbacks.java
@@ -27,7 +27,7 @@
     private static final int WAIT_TIME = 200;
 
     public AutoCompleteTextViewCallbacks() {
-        super("com.android.frameworktest", AutoCompleteTextViewSimple.class);
+        super("com.android.frameworks.coretests", AutoCompleteTextViewSimple.class);
     }
 
     /** Test that the initial popup of the suggestions does not select anything.

core/tests/coretests/src/android/widget/AutoCompleteTextViewPopup.java

diff --git a/tests/FrameworkTest/tests/src/android/widget/AutoCompleteTextViewPopup.java b/core/tests/coretests/src/android/widget/AutoCompleteTextViewPopup.java
similarity index 98%
rename from tests/FrameworkTest/tests/src/android/widget/AutoCompleteTextViewPopup.java
rename to core/tests/coretests/src/android/widget/AutoCompleteTextViewPopup.java
index c48c056..ee0abae 100644
--- a/tests/FrameworkTest/tests/src/android/widget/AutoCompleteTextViewPopup.java
+++ b/core/tests/coretests/src/android/widget/AutoCompleteTextViewPopup.java
@@ -37,7 +37,7 @@
 
 
     public AutoCompleteTextViewPopup() {
-        super("com.android.frameworktest", AutoCompleteTextViewSimple.class);
+        super("com.android.frameworks.coretests", AutoCompleteTextViewSimple.class);
     }
 
     /** Test that we can move the selection and it responds as expected */

core/tests/coretests/src/android/widget/AutoCompleteTextViewSimple.java

diff --git a/tests/FrameworkTest/src/android/widget/AutoCompleteTextViewSimple.java b/core/tests/coretests/src/android/widget/AutoCompleteTextViewSimple.java
similarity index 98%
rename from tests/FrameworkTest/src/android/widget/AutoCompleteTextViewSimple.java
rename to core/tests/coretests/src/android/widget/AutoCompleteTextViewSimple.java
index af16cf8..f6cec26 100644
--- a/tests/FrameworkTest/src/android/widget/AutoCompleteTextViewSimple.java
+++ b/core/tests/coretests/src/android/widget/AutoCompleteTextViewSimple.java
@@ -16,7 +16,7 @@
 
 package android.widget;
 
-import com.android.frameworktest.R;
+import com.android.frameworks.coretests.R;
 
 import android.app.Activity;
 import android.os.Bundle;

core/tests/coretests/src/android/widget/ListViewTest.java

diff --git a/tests/FrameworkTest/tests/src/com/android/frameworktest/widget/ListViewTest.java b/core/tests/coretests/src/android/widget/ListViewTest.java
similarity index 98%
rename from tests/FrameworkTest/tests/src/com/android/frameworktest/widget/ListViewTest.java
rename to core/tests/coretests/src/android/widget/ListViewTest.java
index ecb7d3a..d09a16f 100644
--- a/tests/FrameworkTest/tests/src/com/android/frameworktest/widget/ListViewTest.java
+++ b/core/tests/coretests/src/android/widget/ListViewTest.java
@@ -1,4 +1,4 @@
-package com.android.frameworktest.widget;
+package android.widget;
 
 import com.google.android.collect.Lists;
 

core/tests/coretests/src/android/widget/RadioGroupActivity.java

diff --git a/tests/FrameworkTest/src/com/android/frameworktest/radiogroup/RadioGroupActivity.java b/core/tests/coretests/src/android/widget/RadioGroupActivity.java
similarity index 91%
rename from tests/FrameworkTest/src/com/android/frameworktest/radiogroup/RadioGroupActivity.java
rename to core/tests/coretests/src/android/widget/RadioGroupActivity.java
index ac9e870..c87aa3a 100644
--- a/tests/FrameworkTest/src/com/android/frameworktest/radiogroup/RadioGroupActivity.java
+++ b/core/tests/coretests/src/android/widget/RadioGroupActivity.java
@@ -15,9 +15,9 @@
  */
 
 
-package com.android.frameworktest.radiogroup;
+package android.widget;
 
-import com.android.frameworktest.R;
+import com.android.frameworks.coretests.R;
 
 import android.app.Activity;
 import android.os.Bundle;

core/tests/coretests/src/android/widget/RadioGroupPreCheckedTest.java

diff --git a/tests/FrameworkTest/tests/src/com/android/frameworktest/radiogroup/RadioGroupPreCheckedTest.java b/core/tests/coretests/src/android/widget/RadioGroupPreCheckedTest.java
similarity index 93%
rename from tests/FrameworkTest/tests/src/com/android/frameworktest/radiogroup/RadioGroupPreCheckedTest.java
rename to core/tests/coretests/src/android/widget/RadioGroupPreCheckedTest.java
index 8771830..855caae 100644
--- a/tests/FrameworkTest/tests/src/com/android/frameworktest/radiogroup/RadioGroupPreCheckedTest.java
+++ b/core/tests/coretests/src/android/widget/RadioGroupPreCheckedTest.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.radiogroup;
+package android.widget;
 
 import android.test.TouchUtils;
 import android.widget.RadioButton;
 import android.widget.RadioGroup;
-import com.android.frameworktest.R;
+import com.android.frameworks.coretests.R;
 
 import android.test.ActivityInstrumentationTestCase2;
 import android.test.suitebuilder.annotation.LargeTest;
@@ -29,7 +29,7 @@
  */
 public class RadioGroupPreCheckedTest extends ActivityInstrumentationTestCase2<RadioGroupActivity> {
     public RadioGroupPreCheckedTest() {
-        super("com.android.frameworktest", RadioGroupActivity.class);
+        super("com.android.frameworks.coretests", RadioGroupActivity.class);
     }
 
     @LargeTest

core/tests/coretests/src/android/widget/SimpleCursorAdapterTest.java

diff --git a/tests/FrameworkTest/tests/src/android/widget/SimpleCursorAdapterTest.java b/core/tests/coretests/src/android/widget/SimpleCursorAdapterTest.java
similarity index 100%
rename from tests/FrameworkTest/tests/src/android/widget/SimpleCursorAdapterTest.java
rename to core/tests/coretests/src/android/widget/SimpleCursorAdapterTest.java

core/tests/coretests/src/android/widget/expandablelistview/ExpandableListBasicTest.java

diff --git a/tests/FrameworkTest/tests/src/com/android/frameworktest/expandablelistview/ExpandableListBasicTest.java b/core/tests/coretests/src/android/widget/expandablelistview/ExpandableListBasicTest.java
similarity index 92%
rename from tests/FrameworkTest/tests/src/com/android/frameworktest/expandablelistview/ExpandableListBasicTest.java
rename to core/tests/coretests/src/android/widget/expandablelistview/ExpandableListBasicTest.java
index 163e084..23a4cde 100644
--- a/tests/FrameworkTest/tests/src/com/android/frameworktest/expandablelistview/ExpandableListBasicTest.java
+++ b/core/tests/coretests/src/android/widget/expandablelistview/ExpandableListBasicTest.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.expandablelistview;
+package android.widget.expandablelistview;
 
-import com.android.frameworktest.expandablelistview.ExpandableListSimple;
-import com.android.frameworktest.util.ExpandableListScenario;
-import com.android.frameworktest.util.ListUtil;
-import com.android.frameworktest.util.ExpandableListScenario.MyGroup;
+import android.widget.expandablelistview.ExpandableListSimple;
+import android.util.ExpandableListScenario;
+import android.util.ListUtil;
+import android.util.ExpandableListScenario.MyGroup;
 
 import java.util.List;
 
@@ -37,7 +37,7 @@
     private ListUtil mListUtil;
     
     public ExpandableListBasicTest() {
-        super("com.android.frameworktest",
+        super("com.android.frameworks.coretests",
                 ExpandableListSimple.class);
     }
 
@@ -126,4 +126,4 @@
                 mListView.isGroupExpanded(0));
     }
     
-}
\ No newline at end of file
+}

core/tests/coretests/src/android/widget/expandablelistview/ExpandableListSimple.java

diff --git a/tests/FrameworkTest/src/com/android/frameworktest/expandablelistview/ExpandableListSimple.java b/core/tests/coretests/src/android/widget/expandablelistview/ExpandableListSimple.java
similarity index 92%
rename from tests/FrameworkTest/src/com/android/frameworktest/expandablelistview/ExpandableListSimple.java
rename to core/tests/coretests/src/android/widget/expandablelistview/ExpandableListSimple.java
index cee1d4d..78db28c 100644
--- a/tests/FrameworkTest/src/com/android/frameworktest/expandablelistview/ExpandableListSimple.java
+++ b/core/tests/coretests/src/android/widget/expandablelistview/ExpandableListSimple.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.expandablelistview;
+package android.widget.expandablelistview;
 
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.MenuItem.OnMenuItemClickListener;
 import android.widget.BaseExpandableListAdapter;
 
-import com.android.frameworktest.util.ExpandableListScenario;
+import android.util.ExpandableListScenario;
 
 public class ExpandableListSimple extends ExpandableListScenario {
     private static final int[] NUM_CHILDREN = {4, 3, 2, 1, 0};

core/tests/coretests/src/android/widget/expandablelistview/ExpandableListWithHeaders.java

diff --git a/tests/FrameworkTest/src/com/android/frameworktest/expandablelistview/ExpandableListWithHeaders.java b/core/tests/coretests/src/android/widget/expandablelistview/ExpandableListWithHeaders.java
similarity index 94%
rename from tests/FrameworkTest/src/com/android/frameworktest/expandablelistview/ExpandableListWithHeaders.java
rename to core/tests/coretests/src/android/widget/expandablelistview/ExpandableListWithHeaders.java
index 0155f09..7965f9f 100644
--- a/tests/FrameworkTest/src/com/android/frameworktest/expandablelistview/ExpandableListWithHeaders.java
+++ b/core/tests/coretests/src/android/widget/expandablelistview/ExpandableListWithHeaders.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.expandablelistview;
+package android.widget.expandablelistview;
 
-import com.android.frameworktest.util.ExpandableListScenario;
+import android.util.ExpandableListScenario;
 
 import android.os.Bundle;
 import android.widget.Button;

core/tests/coretests/src/android/widget/expandablelistview/ExpandableListWithHeadersTest.java

diff --git a/core/tests/coretests/src/android/widget/expandablelistview/ExpandableListWithHeadersTest.java b/core/tests/coretests/src/android/widget/expandablelistview/ExpandableListWithHeadersTest.java
new file mode 100644
index 0000000..50d0929
--- /dev/null
+++ b/core/tests/coretests/src/android/widget/expandablelistview/ExpandableListWithHeadersTest.java
@@ -0,0 +1,66 @@
+/*
+ * Copyright (C) 2007 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package android.widget.expandablelistview;
+
+import android.test.ActivityInstrumentationTestCase;
+import android.test.suitebuilder.annotation.LargeTest;
+import android.test.suitebuilder.annotation.MediumTest;
+import android.view.KeyEvent;
+import android.widget.ExpandableListView;
+
+import android.widget.expandablelistview.ExpandableListWithHeaders;
+import android.util.ListUtil;
+
+public class ExpandableListWithHeadersTest extends ActivityInstrumentationTestCase<ExpandableListWithHeaders> {
+    private ExpandableListView mExpandableListView;
+    private ListUtil mListUtil;
+    
+    public ExpandableListWithHeadersTest() {
+        super("com.android.frameworks.coretests",
+                ExpandableListWithHeaders.class);
+    }
+
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+        
+        mExpandableListView = getActivity().getExpandableListView();
+        mListUtil = new ListUtil(mExpandableListView, getInstrumentation());
+    }
+    
+    @MediumTest
+    public void testPreconditions() {
+        assertNotNull(mExpandableListView);
+    }
+    
+    @MediumTest
+    public void testExpandOnFirstPosition() {
+        // Should be a header, and hence the first group should NOT have expanded
+        mListUtil.arrowScrollToSelectedPosition(0);
+        sendKeys(KeyEvent.KEYCODE_DPAD_CENTER);
+        getInstrumentation().waitForIdleSync();
+        assertFalse(mExpandableListView.isGroupExpanded(0));
+    }
+
+    @LargeTest
+    public void testExpandOnFirstGroup() {
+        mListUtil.arrowScrollToSelectedPosition(getActivity().getNumOfHeadersAndFooters());
+        sendKeys(KeyEvent.KEYCODE_DPAD_CENTER);
+        getInstrumentation().waitForIdleSync();
+        assertTrue(mExpandableListView.isGroupExpanded(0));
+    }
+}

core/tests/coretests/src/android/widget/expandablelistview/InflatedExpandableListView.java

diff --git a/tests/FrameworkTest/src/com/android/frameworktest/expandablelistview/InflatedExpandableListView.java b/core/tests/coretests/src/android/widget/expandablelistview/InflatedExpandableListView.java
similarity index 97%
rename from tests/FrameworkTest/src/com/android/frameworktest/expandablelistview/InflatedExpandableListView.java
rename to core/tests/coretests/src/android/widget/expandablelistview/InflatedExpandableListView.java
index aff0507..08b0d31 100644
--- a/tests/FrameworkTest/src/com/android/frameworktest/expandablelistview/InflatedExpandableListView.java
+++ b/core/tests/coretests/src/android/widget/expandablelistview/InflatedExpandableListView.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.expandablelistview;
+package android.view.widget.expandablelistview;
 
-import com.android.frameworktest.R;
+import com.android.frameworks.coretests.R;
 
 import android.app.Activity;
 import android.os.Bundle;

core/tests/coretests/src/android/widget/focus/AdjacentVerticalRectLists.java

diff --git a/tests/FrameworkTest/src/com/android/frameworktest/focus/AdjacentVerticalRectLists.java b/core/tests/coretests/src/android/widget/focus/AdjacentVerticalRectLists.java
similarity index 94%
rename from tests/FrameworkTest/src/com/android/frameworktest/focus/AdjacentVerticalRectLists.java
rename to core/tests/coretests/src/android/widget/focus/AdjacentVerticalRectLists.java
index 09bec2c..75da6fe 100644
--- a/tests/FrameworkTest/src/com/android/frameworktest/focus/AdjacentVerticalRectLists.java
+++ b/core/tests/coretests/src/android/widget/focus/AdjacentVerticalRectLists.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.focus;
+package android.widget.focus;
 
-import com.android.frameworktest.util.InternalSelectionView;
+import android.util.InternalSelectionView;
 
 import android.app.Activity;
 import android.os.Bundle;
@@ -31,7 +31,7 @@
  * rectangle of the previously focused view.  The view taking focus can use this
  * to set an internal selection more appropriate using this rect.
  *
- * This Activity excercises that behavior using three adjacent {@link com.android.frameworktest.util.InternalSelectionView}
+ * This Activity excercises that behavior using three adjacent {@link android.util.InternalSelectionView}
  * that report interesting rects when giving up focus, and use interesting rects
  * when taking focus to best select the internal row to show as selected.
  */

core/tests/coretests/src/android/widget/focus/DescendantFocusability.java

diff --git a/tests/FrameworkTest/src/com/android/frameworktest/focus/DescendantFocusability.java b/core/tests/coretests/src/android/widget/focus/DescendantFocusability.java
similarity index 95%
rename from tests/FrameworkTest/src/com/android/frameworktest/focus/DescendantFocusability.java
rename to core/tests/coretests/src/android/widget/focus/DescendantFocusability.java
index f0c1980..f7d91aa 100644
--- a/tests/FrameworkTest/src/com/android/frameworktest/focus/DescendantFocusability.java
+++ b/core/tests/coretests/src/android/widget/focus/DescendantFocusability.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.focus;
+package android.widget.focus;
 
-import com.android.frameworktest.R;
+import com.android.frameworks.coretests.R;
 
 import android.app.Activity;
 import android.os.Bundle;

core/tests/coretests/src/android/widget/focus/DescendantFocusabilityTest.java

diff --git a/tests/FrameworkTest/tests/src/com/android/frameworktest/focus/DescendantFocusabilityTest.java b/core/tests/coretests/src/android/widget/focus/DescendantFocusabilityTest.java
similarity index 95%
rename from tests/FrameworkTest/tests/src/com/android/frameworktest/focus/DescendantFocusabilityTest.java
rename to core/tests/coretests/src/android/widget/focus/DescendantFocusabilityTest.java
index 6bdd416..2af42ac 100644
--- a/tests/FrameworkTest/tests/src/com/android/frameworktest/focus/DescendantFocusabilityTest.java
+++ b/core/tests/coretests/src/android/widget/focus/DescendantFocusabilityTest.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.focus;
+package android.widget.focus;
 
-import com.android.frameworktest.focus.DescendantFocusability;
+import android.widget.focus.DescendantFocusability;
 
 import android.test.ActivityInstrumentationTestCase;
 import android.test.suitebuilder.annotation.LargeTest;
@@ -30,7 +30,7 @@
     private DescendantFocusability a;
 
     public DescendantFocusabilityTest() {
-        super("com.android.frameworktest", DescendantFocusability.class);
+        super("com.android.frameworks.coretests", DescendantFocusability.class);
     }
 
     @Override

core/tests/coretests/src/android/widget/focus/FocusAfterRemoval.java

diff --git a/tests/FrameworkTest/src/com/android/frameworktest/focus/FocusAfterRemoval.java b/core/tests/coretests/src/android/widget/focus/FocusAfterRemoval.java
similarity index 96%
rename from tests/FrameworkTest/src/com/android/frameworktest/focus/FocusAfterRemoval.java
rename to core/tests/coretests/src/android/widget/focus/FocusAfterRemoval.java
index 6c5f1c4..93245e7 100644
--- a/tests/FrameworkTest/src/com/android/frameworktest/focus/FocusAfterRemoval.java
+++ b/core/tests/coretests/src/android/widget/focus/FocusAfterRemoval.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.focus;
+package android.widget.focus;
 
-import com.android.frameworktest.R;
+import com.android.frameworks.coretests.R;
 
 import android.app.Activity;
 import android.os.Bundle;

core/tests/coretests/src/android/widget/focus/FocusAfterRemovalTest.java

diff --git a/tests/FrameworkTest/tests/src/com/android/frameworktest/focus/FocusAfterRemovalTest.java b/core/tests/coretests/src/android/widget/focus/FocusAfterRemovalTest.java
similarity index 95%
rename from tests/FrameworkTest/tests/src/com/android/frameworktest/focus/FocusAfterRemovalTest.java
rename to core/tests/coretests/src/android/widget/focus/FocusAfterRemovalTest.java
index 8fb9b01..a1b7bcb 100644
--- a/tests/FrameworkTest/tests/src/com/android/frameworktest/focus/FocusAfterRemovalTest.java
+++ b/core/tests/coretests/src/android/widget/focus/FocusAfterRemovalTest.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.focus;
+package android.widget.focus;
 
-import com.android.frameworktest.focus.FocusAfterRemoval;
-import com.android.frameworktest.R;
+import android.widget.focus.FocusAfterRemoval;
+import com.android.frameworks.coretests.R;
 
 import android.test.ActivityInstrumentationTestCase;
 import android.test.suitebuilder.annotation.MediumTest;
@@ -39,7 +39,7 @@
     private Button mBottomRightButton;
 
     public FocusAfterRemovalTest() {
-        super("com.android.frameworktest", FocusAfterRemoval.class);
+        super("com.android.frameworks.coretests", FocusAfterRemoval.class);
     }
 
     @Override

core/tests/coretests/src/android/widget/focus/FocusChangeWithInterestingRectHintTest.java

diff --git a/tests/FrameworkTest/tests/src/com/android/frameworktest/focus/FocusChangeWithInterestingRectHintTest.java b/core/tests/coretests/src/android/widget/focus/FocusChangeWithInterestingRectHintTest.java
similarity index 91%
rename from tests/FrameworkTest/tests/src/com/android/frameworktest/focus/FocusChangeWithInterestingRectHintTest.java
rename to core/tests/coretests/src/android/widget/focus/FocusChangeWithInterestingRectHintTest.java
index 6bdb1ca..8f8f184 100644
--- a/tests/FrameworkTest/tests/src/com/android/frameworktest/focus/FocusChangeWithInterestingRectHintTest.java
+++ b/core/tests/coretests/src/android/widget/focus/FocusChangeWithInterestingRectHintTest.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.focus;
+package android.widget.focus;
 
-import com.android.frameworktest.focus.AdjacentVerticalRectLists;
-import com.android.frameworktest.util.InternalSelectionView;
+import android.widget.focus.AdjacentVerticalRectLists;
+import android.util.InternalSelectionView;
 
 import android.test.ActivityInstrumentationTestCase;
 import android.test.suitebuilder.annotation.LargeTest;
@@ -32,7 +32,7 @@
  * rectangle of the previously focused view.  The view taking focus can use this
  * to set an internal selection more appropriate using this rect.
  *
- * This tests that behavior using three adjacent {@link com.android.frameworktest.util.InternalSelectionView}
+ * This tests that behavior using three adjacent {@link android.util.InternalSelectionView}
  * that report interesting rects when giving up focus, and use interesting rects
  * when taking focus to best select the internal row to show as selected.
  *
@@ -44,7 +44,7 @@
     private InternalSelectionView mRightColumn;
 
     public FocusChangeWithInterestingRectHintTest() {
-        super("com.android.frameworktest", AdjacentVerticalRectLists.class);
+        super("com.android.frameworks.coretests", AdjacentVerticalRectLists.class);
     }
 
     @Override

core/tests/coretests/src/android/widget/focus/GoneParentFocusedChild.java

diff --git a/tests/FrameworkTest/src/com/android/frameworktest/focus/GoneParentFocusedChild.java b/core/tests/coretests/src/android/widget/focus/GoneParentFocusedChild.java
similarity index 97%
rename from tests/FrameworkTest/src/com/android/frameworktest/focus/GoneParentFocusedChild.java
rename to core/tests/coretests/src/android/widget/focus/GoneParentFocusedChild.java
index 8f2245f..af90997 100644
--- a/tests/FrameworkTest/src/com/android/frameworktest/focus/GoneParentFocusedChild.java
+++ b/core/tests/coretests/src/android/widget/focus/GoneParentFocusedChild.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.focus;
+package android.widget.focus;
 
 import android.app.Activity;
 import android.os.Bundle;

core/tests/coretests/src/android/widget/focus/GoneParentFocusedChildTest.java

diff --git a/tests/FrameworkTest/tests/src/com/android/frameworktest/focus/GoneParentFocusedChildTest.java b/core/tests/coretests/src/android/widget/focus/GoneParentFocusedChildTest.java
similarity index 90%
rename from tests/FrameworkTest/tests/src/com/android/frameworktest/focus/GoneParentFocusedChildTest.java
rename to core/tests/coretests/src/android/widget/focus/GoneParentFocusedChildTest.java
index a490322..dcbddef 100644
--- a/tests/FrameworkTest/tests/src/com/android/frameworktest/focus/GoneParentFocusedChildTest.java
+++ b/core/tests/coretests/src/android/widget/focus/GoneParentFocusedChildTest.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.focus;
+package android.widget.focus;
 
 import android.test.ActivityInstrumentationTestCase;
 import android.test.suitebuilder.annotation.MediumTest;
 import android.view.KeyEvent;
 import android.view.View;
-import com.android.frameworktest.focus.GoneParentFocusedChild;
+import android.widget.focus.GoneParentFocusedChild;
 
 /**
  * When a parent is GONE, key events shouldn't go to its children, even if they
@@ -31,7 +31,7 @@
 
 
     public GoneParentFocusedChildTest() {
-        super("com.android.frameworktest", GoneParentFocusedChild.class);
+        super("com.android.frameworks.coretests", GoneParentFocusedChild.class);
     }
 
     @MediumTest

core/tests/coretests/src/android/widget/focus/HorizontalFocusSearch.java

diff --git a/tests/FrameworkTest/src/com/android/frameworktest/focus/HorizontalFocusSearch.java b/core/tests/coretests/src/android/widget/focus/HorizontalFocusSearch.java
similarity index 98%
rename from tests/FrameworkTest/src/com/android/frameworktest/focus/HorizontalFocusSearch.java
rename to core/tests/coretests/src/android/widget/focus/HorizontalFocusSearch.java
index 05f05ee..11cac1e 100644
--- a/tests/FrameworkTest/src/com/android/frameworktest/focus/HorizontalFocusSearch.java
+++ b/core/tests/coretests/src/android/widget/focus/HorizontalFocusSearch.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.focus;
+package android.widget.focus;
 
 import android.app.Activity;
 import android.widget.LinearLayout;

core/tests/coretests/src/android/widget/focus/HorizontalFocusSearchTest.java

diff --git a/tests/FrameworkTest/tests/src/com/android/frameworktest/focus/HorizontalFocusSearchTest.java b/core/tests/coretests/src/android/widget/focus/HorizontalFocusSearchTest.java
similarity index 92%
rename from tests/FrameworkTest/tests/src/com/android/frameworktest/focus/HorizontalFocusSearchTest.java
rename to core/tests/coretests/src/android/widget/focus/HorizontalFocusSearchTest.java
index ca7cd7e..b591e5f 100644
--- a/tests/FrameworkTest/tests/src/com/android/frameworktest/focus/HorizontalFocusSearchTest.java
+++ b/core/tests/coretests/src/android/widget/focus/HorizontalFocusSearchTest.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.focus;
+package android.widget.focus;
 
-import com.android.frameworktest.focus.HorizontalFocusSearch;
+import android.widget.focus.HorizontalFocusSearch;
 
 import android.test.ActivityInstrumentationTestCase;
 import android.test.suitebuilder.annotation.Suppress;
@@ -24,8 +24,8 @@
 import android.widget.Button;
 import android.view.View;
 
-import static com.android.frameworktest.focus.VerticalFocusSearchTest.FocusSearchAlg;
-import static com.android.frameworktest.focus.VerticalFocusSearchTest.NewFocusSearchAlg;
+import static android.widget.focus.VerticalFocusSearchTest.FocusSearchAlg;
+import static android.widget.focus.VerticalFocusSearchTest.NewFocusSearchAlg;
 
 /**
  * Tests that focus searching works on a horizontal linear layout of buttons of
@@ -45,7 +45,7 @@
 
 
     public HorizontalFocusSearchTest() {
-        super("com.android.frameworktest", HorizontalFocusSearch.class);
+        super("com.android.frameworks.coretests", HorizontalFocusSearch.class);
     }
 
     @Override

core/tests/coretests/src/android/widget/focus/LinearLayoutGrid.java

diff --git a/tests/FrameworkTest/src/com/android/frameworktest/focus/LinearLayoutGrid.java b/core/tests/coretests/src/android/widget/focus/LinearLayoutGrid.java
similarity index 95%
rename from tests/FrameworkTest/src/com/android/frameworktest/focus/LinearLayoutGrid.java
rename to core/tests/coretests/src/android/widget/focus/LinearLayoutGrid.java
index 9aec0d5..db082ec 100644
--- a/tests/FrameworkTest/src/com/android/frameworktest/focus/LinearLayoutGrid.java
+++ b/core/tests/coretests/src/android/widget/focus/LinearLayoutGrid.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.focus;
+package android.widget.focus;
 
 import android.app.Activity;
 import android.os.Bundle;
 import android.view.ViewGroup;
 import android.widget.Button;
 import android.widget.LinearLayout;
-import com.android.frameworktest.R;
+import com.android.frameworks.coretests.R;
 
 public class LinearLayoutGrid extends Activity {
 

core/tests/coretests/src/android/widget/focus/LinearLayoutGridTest.java

diff --git a/tests/FrameworkTest/tests/src/com/android/frameworktest/focus/LinearLayoutGridTest.java b/core/tests/coretests/src/android/widget/focus/LinearLayoutGridTest.java
similarity index 93%
rename from tests/FrameworkTest/tests/src/com/android/frameworktest/focus/LinearLayoutGridTest.java
rename to core/tests/coretests/src/android/widget/focus/LinearLayoutGridTest.java
index c26c331..89cb8bb 100644
--- a/tests/FrameworkTest/tests/src/com/android/frameworktest/focus/LinearLayoutGridTest.java
+++ b/core/tests/coretests/src/android/widget/focus/LinearLayoutGridTest.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.focus;
+package android.widget.focus;
 
 import android.test.SingleLaunchActivityTestCase;
 import android.test.suitebuilder.annotation.MediumTest;
 import android.view.FocusFinder;
 import android.view.View;
 import android.view.ViewGroup;
-import com.android.frameworktest.focus.LinearLayoutGrid;
+import android.widget.focus.LinearLayoutGrid;
 
 /**
  * Tests focus searching between buttons within a grid that are touching, for example,
@@ -34,7 +34,7 @@
     private ViewGroup mRootView;
 
     public LinearLayoutGridTest() {
-        super("com.android.frameworktest", LinearLayoutGrid.class);
+        super("com.android.frameworks.coretests", LinearLayoutGrid.class);
     }
 
     protected void setUp() throws Exception {

core/tests/coretests/src/android/widget/focus/ListOfButtons.java

diff --git a/tests/FrameworkTest/src/com/android/frameworktest/focus/ListOfButtons.java b/core/tests/coretests/src/android/widget/focus/ListOfButtons.java
similarity index 95%
rename from tests/FrameworkTest/src/com/android/frameworktest/focus/ListOfButtons.java
rename to core/tests/coretests/src/android/widget/focus/ListOfButtons.java
index 0abcebb..308861d 100644
--- a/tests/FrameworkTest/src/com/android/frameworktest/focus/ListOfButtons.java
+++ b/core/tests/coretests/src/android/widget/focus/ListOfButtons.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.focus;
+package android.widget.focus;
 
-import com.android.frameworktest.R;
+import com.android.frameworks.coretests.R;
 
 import android.app.ListActivity;
 import android.content.Context;

core/tests/coretests/src/android/widget/focus/ListOfButtonsTest.java

diff --git a/tests/FrameworkTest/tests/src/com/android/frameworktest/focus/ListOfButtonsTest.java b/core/tests/coretests/src/android/widget/focus/ListOfButtonsTest.java
similarity index 95%
rename from tests/FrameworkTest/tests/src/com/android/frameworktest/focus/ListOfButtonsTest.java
rename to core/tests/coretests/src/android/widget/focus/ListOfButtonsTest.java
index 902fc1c..3dba4e5 100644
--- a/tests/FrameworkTest/tests/src/com/android/frameworktest/focus/ListOfButtonsTest.java
+++ b/core/tests/coretests/src/android/widget/focus/ListOfButtonsTest.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.focus;
+package android.widget.focus;
 
-import com.android.frameworktest.focus.ListOfButtons;
-import com.android.frameworktest.R;
+import android.widget.focus.ListOfButtons;
+import com.android.frameworks.coretests.R;
 
 import android.test.ActivityInstrumentationTestCase;
 import android.test.suitebuilder.annotation.MediumTest;
@@ -39,7 +39,7 @@
     private ListView mListView;
 
     public ListOfButtonsTest() {
-        super("com.android.frameworktest", ListOfButtons.class);
+        super("com.android.frameworks.coretests", ListOfButtons.class);
     }
 
     @Override

core/tests/coretests/src/android/widget/focus/ListOfEditTexts.java

diff --git a/tests/FrameworkTest/src/com/android/frameworktest/focus/ListOfEditTexts.java b/core/tests/coretests/src/android/widget/focus/ListOfEditTexts.java
similarity index 98%
rename from tests/FrameworkTest/src/com/android/frameworktest/focus/ListOfEditTexts.java
rename to core/tests/coretests/src/android/widget/focus/ListOfEditTexts.java
index 41a276a..c2e7a26 100644
--- a/tests/FrameworkTest/src/com/android/frameworktest/focus/ListOfEditTexts.java
+++ b/core/tests/coretests/src/android/widget/focus/ListOfEditTexts.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.focus;
+package android.widget.focus;
 
 import android.app.Activity;
 import android.content.Context;

core/tests/coretests/src/android/widget/focus/ListOfInternalSelectionViews.java

diff --git a/tests/FrameworkTest/src/com/android/frameworktest/focus/ListOfInternalSelectionViews.java b/core/tests/coretests/src/android/widget/focus/ListOfInternalSelectionViews.java
similarity index 97%
rename from tests/FrameworkTest/src/com/android/frameworktest/focus/ListOfInternalSelectionViews.java
rename to core/tests/coretests/src/android/widget/focus/ListOfInternalSelectionViews.java
index 6104068..6518341 100644
--- a/tests/FrameworkTest/src/com/android/frameworktest/focus/ListOfInternalSelectionViews.java
+++ b/core/tests/coretests/src/android/widget/focus/ListOfInternalSelectionViews.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.focus;
+package android.widget.focus;
 
 import android.app.Activity;
 import android.os.Bundle;
@@ -22,7 +22,7 @@
 import android.view.ViewGroup;
 import android.widget.BaseAdapter;
 import android.widget.ListView;
-import com.android.frameworktest.util.InternalSelectionView;
+import android.util.InternalSelectionView;
 
 /**
  * A list of {@link InternalSelectionView}s paramatarized by the number of items,

core/tests/coretests/src/android/widget/focus/ListWithFooterViewAndNewLabels.java

diff --git a/tests/FrameworkTest/src/com/android/frameworktest/focus/ListWithFooterViewAndNewLabels.java b/core/tests/coretests/src/android/widget/focus/ListWithFooterViewAndNewLabels.java
similarity index 97%
rename from tests/FrameworkTest/src/com/android/frameworktest/focus/ListWithFooterViewAndNewLabels.java
rename to core/tests/coretests/src/android/widget/focus/ListWithFooterViewAndNewLabels.java
index 730f9aa..ceb0e95 100644
--- a/tests/FrameworkTest/src/com/android/frameworktest/focus/ListWithFooterViewAndNewLabels.java
+++ b/core/tests/coretests/src/android/widget/focus/ListWithFooterViewAndNewLabels.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.focus;
+package android.widget.focus;
 
 import android.app.ListActivity;
 import android.content.Context;
@@ -28,7 +28,7 @@
 import android.widget.TextView;
 
 import com.google.android.collect.Lists;
-import com.android.frameworktest.R;
+import com.android.frameworks.coretests.R;
 
 import java.util.List;
 

core/tests/coretests/src/android/widget/focus/ListWithFooterViewAndNewLabelsTest.java

diff --git a/tests/FrameworkTest/tests/src/com/android/frameworktest/focus/ListWithFooterViewAndNewLabelsTest.java b/core/tests/coretests/src/android/widget/focus/ListWithFooterViewAndNewLabelsTest.java
similarity index 91%
rename from tests/FrameworkTest/tests/src/com/android/frameworktest/focus/ListWithFooterViewAndNewLabelsTest.java
rename to core/tests/coretests/src/android/widget/focus/ListWithFooterViewAndNewLabelsTest.java
index c094882..57dbb78 100644
--- a/tests/FrameworkTest/tests/src/com/android/frameworktest/focus/ListWithFooterViewAndNewLabelsTest.java
+++ b/core/tests/coretests/src/android/widget/focus/ListWithFooterViewAndNewLabelsTest.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.focus;
+package android.widget.focus;
 
-import com.android.frameworktest.focus.ListWithFooterViewAndNewLabels;
-import com.android.frameworktest.R;
+import android.widget.focus.ListWithFooterViewAndNewLabels;
+import com.android.frameworks.coretests.R;
 
 import android.test.ActivityInstrumentationTestCase;
 import android.widget.Button;
@@ -35,7 +35,7 @@
 
 
     public ListWithFooterViewAndNewLabelsTest() {
-        super("com.android.frameworktest",
+        super("com.android.frameworks.coretests",
                 ListWithFooterViewAndNewLabels.class);
     }
 

core/tests/coretests/src/android/widget/focus/ListWithMailMessages.java

diff --git a/tests/FrameworkTest/src/com/android/frameworktest/focus/ListWithMailMessages.java b/core/tests/coretests/src/android/widget/focus/ListWithMailMessages.java
similarity index 97%
rename from tests/FrameworkTest/src/com/android/frameworktest/focus/ListWithMailMessages.java
rename to core/tests/coretests/src/android/widget/focus/ListWithMailMessages.java
index 27c642a..5de4ad5 100644
--- a/tests/FrameworkTest/src/com/android/frameworktest/focus/ListWithMailMessages.java
+++ b/core/tests/coretests/src/android/widget/focus/ListWithMailMessages.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.focus;
+package android.widget.focus;
 
-import com.android.frameworktest.R;
+import com.android.frameworks.coretests.R;
 import com.google.android.collect.Lists;
 
 import android.app.ListActivity;

core/tests/coretests/src/android/widget/focus/RequestFocus.java

diff --git a/tests/FrameworkTest/src/com/android/frameworktest/focus/RequestFocus.java b/core/tests/coretests/src/android/widget/focus/RequestFocus.java
similarity index 94%
rename from tests/FrameworkTest/src/com/android/frameworktest/focus/RequestFocus.java
rename to core/tests/coretests/src/android/widget/focus/RequestFocus.java
index 803815b..af9ee17 100644
--- a/tests/FrameworkTest/src/com/android/frameworktest/focus/RequestFocus.java
+++ b/core/tests/coretests/src/android/widget/focus/RequestFocus.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.focus;
+package android.widget.focus;
 
-import com.android.frameworktest.R;
+import com.android.frameworks.coretests.R;
 
 import android.app.Activity;
 import android.os.Bundle;

core/tests/coretests/src/android/widget/focus/RequestFocusTest.java

diff --git a/tests/FrameworkTest/tests/src/com/android/frameworktest/focus/RequestFocusTest.java b/core/tests/coretests/src/android/widget/focus/RequestFocusTest.java
similarity index 94%
rename from tests/FrameworkTest/tests/src/com/android/frameworktest/focus/RequestFocusTest.java
rename to core/tests/coretests/src/android/widget/focus/RequestFocusTest.java
index 5fb3a29..477831e 100644
--- a/tests/FrameworkTest/tests/src/com/android/frameworktest/focus/RequestFocusTest.java
+++ b/core/tests/coretests/src/android/widget/focus/RequestFocusTest.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.focus;
+package android.widget.focus;
 
-import com.android.frameworktest.focus.RequestFocus;
-import com.android.frameworktest.R;
+import android.widget.focus.RequestFocus;
+import com.android.frameworks.coretests.R;
 
 import android.os.Handler;
 import android.test.ActivityInstrumentationTestCase;
@@ -39,7 +39,7 @@
     private Handler mHandler;
 
     public RequestFocusTest() {
-        super("com.android.frameworktest", RequestFocus.class);
+        super("com.android.frameworks.coretests", RequestFocus.class);
     }
 
     @Override

core/tests/coretests/src/android/widget/focus/ScrollingThroughListOfFocusablesTest.java

diff --git a/tests/FrameworkTest/tests/src/com/android/frameworktest/focus/ScrollingThroughListOfFocusablesTest.java b/core/tests/coretests/src/android/widget/focus/ScrollingThroughListOfFocusablesTest.java
similarity index 96%
rename from tests/FrameworkTest/tests/src/com/android/frameworktest/focus/ScrollingThroughListOfFocusablesTest.java
rename to core/tests/coretests/src/android/widget/focus/ScrollingThroughListOfFocusablesTest.java
index 6fa9533..eb9192a 100644
--- a/tests/FrameworkTest/tests/src/com/android/frameworktest/focus/ScrollingThroughListOfFocusablesTest.java
+++ b/core/tests/coretests/src/android/widget/focus/ScrollingThroughListOfFocusablesTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.focus;
+package android.widget.focus;
 
 import android.graphics.Rect;
 import android.test.InstrumentationTestCase;
@@ -22,8 +22,8 @@
 import android.test.suitebuilder.annotation.MediumTest;
 import android.view.KeyEvent;
 import android.widget.ListView;
-import com.android.frameworktest.focus.ListOfInternalSelectionViews;
-import com.android.frameworktest.util.InternalSelectionView;
+import android.widget.focus.ListOfInternalSelectionViews;
+import android.util.InternalSelectionView;
 
 
 /**
@@ -44,7 +44,7 @@
     @Override
     protected void setUp() throws Exception {
         mActivity = launchActivity(
-                "com.android.frameworktest",
+                "com.android.frameworks.coretests",
                 ListOfInternalSelectionViews.class,
                 ListOfInternalSelectionViews.getBundleFor(
                     mNumItems,      // 4 items

core/tests/coretests/src/android/widget/focus/VerticalFocusSearch.java

diff --git a/tests/FrameworkTest/src/com/android/frameworktest/focus/VerticalFocusSearch.java b/core/tests/coretests/src/android/widget/focus/VerticalFocusSearch.java
similarity index 98%
rename from tests/FrameworkTest/src/com/android/frameworktest/focus/VerticalFocusSearch.java
rename to core/tests/coretests/src/android/widget/focus/VerticalFocusSearch.java
index a8f12d8..deb9e67 100644
--- a/tests/FrameworkTest/src/com/android/frameworktest/focus/VerticalFocusSearch.java
+++ b/core/tests/coretests/src/android/widget/focus/VerticalFocusSearch.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.focus;
+package android.widget.focus;
 
 import android.app.Activity;
 import android.os.Bundle;

core/tests/coretests/src/android/widget/focus/VerticalFocusSearchTest.java

diff --git a/tests/FrameworkTest/tests/src/com/android/frameworktest/focus/VerticalFocusSearchTest.java b/core/tests/coretests/src/android/widget/focus/VerticalFocusSearchTest.java
similarity index 96%
rename from tests/FrameworkTest/tests/src/com/android/frameworktest/focus/VerticalFocusSearchTest.java
rename to core/tests/coretests/src/android/widget/focus/VerticalFocusSearchTest.java
index 47a81fb..f05d83a 100644
--- a/tests/FrameworkTest/tests/src/com/android/frameworktest/focus/VerticalFocusSearchTest.java
+++ b/core/tests/coretests/src/android/widget/focus/VerticalFocusSearchTest.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.focus;
+package android.widget.focus;
 
-import com.android.frameworktest.focus.VerticalFocusSearch;
+import android.widget.focus.VerticalFocusSearch;
 
 import android.test.ActivityInstrumentationTestCase;
 import android.test.suitebuilder.annotation.Suppress;
@@ -59,7 +59,7 @@
     }
 
     public VerticalFocusSearchTest() {
-        super("com.android.frameworktest", VerticalFocusSearch.class);
+        super("com.android.frameworks.coretests", VerticalFocusSearch.class);
     }
 
 

core/tests/coretests/src/android/widget/gridview/GridDelete.java

diff --git a/tests/FrameworkTest/src/com/android/frameworktest/gridview/GridDelete.java b/core/tests/coretests/src/android/widget/gridview/GridDelete.java
similarity index 96%
rename from tests/FrameworkTest/src/com/android/frameworktest/gridview/GridDelete.java
rename to core/tests/coretests/src/android/widget/gridview/GridDelete.java
index 4c0d23b..57ae8f39 100644
--- a/tests/FrameworkTest/src/com/android/frameworktest/gridview/GridDelete.java
+++ b/core/tests/coretests/src/android/widget/gridview/GridDelete.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.gridview;
+package android.widget.gridview;
 
 import android.view.KeyEvent;
 import android.view.View;
@@ -23,7 +23,7 @@
 import android.widget.GridView;
 import android.widget.ListAdapter;
 
-import com.android.frameworktest.util.GridScenario;
+import android.util.GridScenario;
 
 import java.util.ArrayList;
 

core/tests/coretests/src/android/widget/gridview/GridInHorizontal.java

diff --git a/tests/FrameworkTest/src/com/android/frameworktest/gridview/GridInHorizontal.java b/core/tests/coretests/src/android/widget/gridview/GridInHorizontal.java
similarity index 94%
rename from tests/FrameworkTest/src/com/android/frameworktest/gridview/GridInHorizontal.java
rename to core/tests/coretests/src/android/widget/gridview/GridInHorizontal.java
index c10a53b..493c2cd 100644
--- a/tests/FrameworkTest/src/com/android/frameworktest/gridview/GridInHorizontal.java
+++ b/core/tests/coretests/src/android/widget/gridview/GridInHorizontal.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.gridview;
+package android.widget.gridview;
 
 import android.app.Activity;
 import android.os.Bundle;
@@ -23,7 +23,7 @@
 import android.widget.GridView;
 import android.widget.TextView;
 
-import com.android.frameworktest.R;
+import com.android.frameworks.coretests.R;
 
 /**
  * Exercises a grid in a horizontal linear layout

core/tests/coretests/src/android/widget/gridview/GridInHorizontalTest.java

diff --git a/tests/FrameworkTest/tests/src/com/android/frameworktest/gridview/GridInHorizontalTest.java b/core/tests/coretests/src/android/widget/gridview/GridInHorizontalTest.java
similarity index 88%
rename from tests/FrameworkTest/tests/src/com/android/frameworktest/gridview/GridInHorizontalTest.java
rename to core/tests/coretests/src/android/widget/gridview/GridInHorizontalTest.java
index 8af6214..21ca655 100644
--- a/tests/FrameworkTest/tests/src/com/android/frameworktest/gridview/GridInHorizontalTest.java
+++ b/core/tests/coretests/src/android/widget/gridview/GridInHorizontalTest.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.gridview;
+package android.widget.gridview;
 
 import android.test.ActivityInstrumentationTestCase;
 import android.test.suitebuilder.annotation.MediumTest;
 import android.widget.GridView;
 
-import com.android.frameworktest.gridview.GridInHorizontal;
+import android.widget.gridview.GridInHorizontal;
 
 public class GridInHorizontalTest extends ActivityInstrumentationTestCase<GridInHorizontal> {
 
@@ -28,7 +28,7 @@
     private GridView mGridView;
     
     public GridInHorizontalTest() {
-        super("com.android.frameworktest", GridInHorizontal.class);
+        super("com.android.frameworks.coretests", GridInHorizontal.class);
     }
 
     @Override

core/tests/coretests/src/android/widget/gridview/GridInVertical.java

diff --git a/tests/FrameworkTest/src/com/android/frameworktest/gridview/GridInVertical.java b/core/tests/coretests/src/android/widget/gridview/GridInVertical.java
similarity index 94%
rename from tests/FrameworkTest/src/com/android/frameworktest/gridview/GridInVertical.java
rename to core/tests/coretests/src/android/widget/gridview/GridInVertical.java
index acde73e..aeceb23 100644
--- a/tests/FrameworkTest/src/com/android/frameworktest/gridview/GridInVertical.java
+++ b/core/tests/coretests/src/android/widget/gridview/GridInVertical.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.gridview;
+package android.widget.gridview;
 
 import android.app.Activity;
 import android.os.Bundle;
@@ -23,7 +23,7 @@
 import android.widget.GridView;
 import android.widget.TextView;
 
-import com.android.frameworktest.R;
+import com.android.frameworks.coretests.R;
 
 /**
  * Exercises a grid in a vertical linear layout

core/tests/coretests/src/android/widget/gridview/GridInVerticalTest.java

diff --git a/tests/FrameworkTest/tests/src/com/android/frameworktest/gridview/GridInVerticalTest.java b/core/tests/coretests/src/android/widget/gridview/GridInVerticalTest.java
similarity index 89%
rename from tests/FrameworkTest/tests/src/com/android/frameworktest/gridview/GridInVerticalTest.java
rename to core/tests/coretests/src/android/widget/gridview/GridInVerticalTest.java
index 61e1c8b..a674db2 100644
--- a/tests/FrameworkTest/tests/src/com/android/frameworktest/gridview/GridInVerticalTest.java
+++ b/core/tests/coretests/src/android/widget/gridview/GridInVerticalTest.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.gridview;
+package android.widget.gridview;
 
 import android.test.ActivityInstrumentationTestCase;
 import android.test.suitebuilder.annotation.MediumTest;
 import android.widget.GridView;
 
-import com.android.frameworktest.gridview.GridInVertical;
+import android.widget.gridview.GridInVertical;
 
 public class GridInVerticalTest extends ActivityInstrumentationTestCase<GridInVertical> {
 
@@ -28,7 +28,7 @@
     private GridView mGridView;
     
     public GridInVerticalTest() {
-        super("com.android.frameworktest", GridInVertical.class);
+        super("com.android.frameworks.coretests", GridInVertical.class);
     }
 
     @Override

core/tests/coretests/src/android/widget/gridview/GridPadding.java

diff --git a/tests/FrameworkTest/src/com/android/frameworktest/gridview/GridPadding.java b/core/tests/coretests/src/android/widget/gridview/GridPadding.java
similarity index 94%
rename from tests/FrameworkTest/src/com/android/frameworktest/gridview/GridPadding.java
rename to core/tests/coretests/src/android/widget/gridview/GridPadding.java
index 41909ac2..0b9e4c5 100644
--- a/tests/FrameworkTest/src/com/android/frameworktest/gridview/GridPadding.java
+++ b/core/tests/coretests/src/android/widget/gridview/GridPadding.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.gridview;
+package android.widget.gridview;
 
 import android.app.Activity;
 import android.os.Bundle;
 import android.widget.ArrayAdapter;
 import android.widget.GridView;
 
-import com.android.frameworktest.R;
+import com.android.frameworks.coretests.R;
 
 /**
  * Exercises a grid with padding

core/tests/coretests/src/android/widget/gridview/GridPaddingTest.java

diff --git a/tests/FrameworkTest/tests/src/com/android/frameworktest/gridview/GridPaddingTest.java b/core/tests/coretests/src/android/widget/gridview/GridPaddingTest.java
similarity index 92%
rename from tests/FrameworkTest/tests/src/com/android/frameworktest/gridview/GridPaddingTest.java
rename to core/tests/coretests/src/android/widget/gridview/GridPaddingTest.java
index 43581c6..ecd4b1c 100644
--- a/tests/FrameworkTest/tests/src/com/android/frameworktest/gridview/GridPaddingTest.java
+++ b/core/tests/coretests/src/android/widget/gridview/GridPaddingTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.gridview;
+package android.widget.gridview;
 
 import android.test.ActivityInstrumentationTestCase2;
 import android.test.suitebuilder.annotation.MediumTest;
@@ -24,7 +24,7 @@
     private GridView mGridView;
 
     public GridPaddingTest() {
-        super("com.android.frameworktest", GridPadding.class);
+        super("com.android.frameworks.coretests", GridPadding.class);
     }
 
     @Override

core/tests/coretests/src/android/widget/gridview/GridScrollListener.java

diff --git a/tests/FrameworkTest/src/com/android/frameworktest/gridview/GridScrollListener.java b/core/tests/coretests/src/android/widget/gridview/GridScrollListener.java
similarity index 95%
rename from tests/FrameworkTest/src/com/android/frameworktest/gridview/GridScrollListener.java
rename to core/tests/coretests/src/android/widget/gridview/GridScrollListener.java
index 4655230..4290941 100644
--- a/tests/FrameworkTest/src/com/android/frameworktest/gridview/GridScrollListener.java
+++ b/core/tests/coretests/src/android/widget/gridview/GridScrollListener.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.gridview;
+package android.widget.gridview;
 
 import android.app.Activity;
 import android.os.Bundle;
@@ -24,7 +24,7 @@
 import android.widget.GridView;
 import android.widget.TextView;
 
-import com.android.frameworktest.R;
+import com.android.frameworks.coretests.R;
 
 /**
  * Exercises change notification in a list

core/tests/coretests/src/android/widget/gridview/GridScrollListenerTest.java

diff --git a/tests/FrameworkTest/tests/src/com/android/frameworktest/gridview/GridScrollListenerTest.java b/core/tests/coretests/src/android/widget/gridview/GridScrollListenerTest.java
similarity index 95%
rename from tests/FrameworkTest/tests/src/com/android/frameworktest/gridview/GridScrollListenerTest.java
rename to core/tests/coretests/src/android/widget/gridview/GridScrollListenerTest.java
index f939f16..8f62b2c 100644
--- a/tests/FrameworkTest/tests/src/com/android/frameworktest/gridview/GridScrollListenerTest.java
+++ b/core/tests/coretests/src/android/widget/gridview/GridScrollListenerTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.gridview;
+package android.widget.gridview;
 
 import android.app.Instrumentation;
 import android.test.ActivityInstrumentationTestCase;
@@ -25,7 +25,7 @@
 import android.widget.AbsListView;
 import android.widget.GridView;
 
-import com.android.frameworktest.gridview.GridScrollListener;
+import android.widget.gridview.GridScrollListener;
 
 public class GridScrollListenerTest extends ActivityInstrumentationTestCase<GridScrollListener> implements
         AbsListView.OnScrollListener {
@@ -36,7 +36,7 @@
     private int mTotalItemCount = -1;
 
     public GridScrollListenerTest() {
-        super("com.android.frameworktest", GridScrollListener.class);
+        super("com.android.frameworks.coretests", GridScrollListener.class);
     }
 
     @Override

core/tests/coretests/src/android/widget/gridview/GridSetSelection.java

diff --git a/tests/FrameworkTest/src/com/android/frameworktest/gridview/GridSetSelection.java b/core/tests/coretests/src/android/widget/gridview/GridSetSelection.java
similarity index 91%
rename from tests/FrameworkTest/src/com/android/frameworktest/gridview/GridSetSelection.java
rename to core/tests/coretests/src/android/widget/gridview/GridSetSelection.java
index 38f629d..a3cda3b 100644
--- a/tests/FrameworkTest/src/com/android/frameworktest/gridview/GridSetSelection.java
+++ b/core/tests/coretests/src/android/widget/gridview/GridSetSelection.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.gridview;
+package android.widget.gridview;
 
-import com.android.frameworktest.util.GridScenario;
+import android.util.GridScenario;
 
 /**
  * Basic stacking from top scenario, nothing fancy. Items do not

core/tests/coretests/src/android/widget/gridview/GridSetSelectionBaseTest.java

diff --git a/tests/FrameworkTest/tests/src/com/android/frameworktest/gridview/GridSetSelectionBaseTest.java b/core/tests/coretests/src/android/widget/gridview/GridSetSelectionBaseTest.java
similarity index 95%
rename from tests/FrameworkTest/tests/src/com/android/frameworktest/gridview/GridSetSelectionBaseTest.java
rename to core/tests/coretests/src/android/widget/gridview/GridSetSelectionBaseTest.java
index 3ca9b09..0e362b6 100644
--- a/tests/FrameworkTest/tests/src/com/android/frameworktest/gridview/GridSetSelectionBaseTest.java
+++ b/core/tests/coretests/src/android/widget/gridview/GridSetSelectionBaseTest.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.gridview;
+package android.widget.gridview;
 
-import com.android.frameworktest.util.GridScenario;
+import android.util.GridScenario;
 
 import android.test.ActivityInstrumentationTestCase;
 import android.test.suitebuilder.annotation.MediumTest;
@@ -28,7 +28,7 @@
     private GridView mGridView;
 
     protected GridSetSelectionBaseTest(Class<T> klass) {
-        super("com.android.frameworktest", klass);
+        super("com.android.frameworks.coretests", klass);
     }
 
     @Override

core/tests/coretests/src/android/widget/gridview/GridSetSelectionMany.java

diff --git a/tests/FrameworkTest/src/com/android/frameworktest/gridview/GridSetSelectionMany.java b/core/tests/coretests/src/android/widget/gridview/GridSetSelectionMany.java
similarity index 91%
rename from tests/FrameworkTest/src/com/android/frameworktest/gridview/GridSetSelectionMany.java
rename to core/tests/coretests/src/android/widget/gridview/GridSetSelectionMany.java
index 34aeb75..a6d481f 100644
--- a/tests/FrameworkTest/src/com/android/frameworktest/gridview/GridSetSelectionMany.java
+++ b/core/tests/coretests/src/android/widget/gridview/GridSetSelectionMany.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.gridview;
+package android.widget.gridview;
 
-import com.android.frameworktest.util.GridScenario;
+import android.util.GridScenario;
 
 /**
  * Basic stacking from top scenario, nothing fancy. Items do

core/tests/coretests/src/android/widget/gridview/GridSetSelectionManyTest.java

diff --git a/tests/FrameworkTest/tests/src/com/android/frameworktest/gridview/GridSetSelectionManyTest.java b/core/tests/coretests/src/android/widget/gridview/GridSetSelectionManyTest.java
similarity index 87%
rename from tests/FrameworkTest/tests/src/com/android/frameworktest/gridview/GridSetSelectionManyTest.java
rename to core/tests/coretests/src/android/widget/gridview/GridSetSelectionManyTest.java
index aadc185..6739645 100644
--- a/tests/FrameworkTest/tests/src/com/android/frameworktest/gridview/GridSetSelectionManyTest.java
+++ b/core/tests/coretests/src/android/widget/gridview/GridSetSelectionManyTest.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.gridview;
+package android.widget.gridview;
 
-import com.android.frameworktest.gridview.GridSetSelectionMany;
+import android.widget.gridview.GridSetSelectionMany;
 
 public class GridSetSelectionManyTest extends GridSetSelectionBaseTest<GridSetSelectionMany> {
     public GridSetSelectionManyTest() {

core/tests/coretests/src/android/widget/gridview/GridSetSelectionStackFromBottom.java

diff --git a/tests/FrameworkTest/src/com/android/frameworktest/gridview/GridSetSelectionStackFromBottom.java b/core/tests/coretests/src/android/widget/gridview/GridSetSelectionStackFromBottom.java
similarity index 91%
rename from tests/FrameworkTest/src/com/android/frameworktest/gridview/GridSetSelectionStackFromBottom.java
rename to core/tests/coretests/src/android/widget/gridview/GridSetSelectionStackFromBottom.java
index 6a2445f..dfcd5fc 100644
--- a/tests/FrameworkTest/src/com/android/frameworktest/gridview/GridSetSelectionStackFromBottom.java
+++ b/core/tests/coretests/src/android/widget/gridview/GridSetSelectionStackFromBottom.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.gridview;
+package android.widget.gridview;
 
-import com.android.frameworktest.util.GridScenario;
+import android.util.GridScenario;
 
 /**
  * Basic stacking from bottom scenario, nothing fancy. Items do not

core/tests/coretests/src/android/widget/gridview/GridSetSelectionStackFromBottomMany.java

diff --git a/tests/FrameworkTest/src/com/android/frameworktest/gridview/GridSetSelectionStackFromBottomMany.java b/core/tests/coretests/src/android/widget/gridview/GridSetSelectionStackFromBottomMany.java
similarity index 91%
rename from tests/FrameworkTest/src/com/android/frameworktest/gridview/GridSetSelectionStackFromBottomMany.java
rename to core/tests/coretests/src/android/widget/gridview/GridSetSelectionStackFromBottomMany.java
index 838c431..26a567e 100644
--- a/tests/FrameworkTest/src/com/android/frameworktest/gridview/GridSetSelectionStackFromBottomMany.java
+++ b/core/tests/coretests/src/android/widget/gridview/GridSetSelectionStackFromBottomMany.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.gridview;
+package android.widget.gridview;
 
-import com.android.frameworktest.util.GridScenario;
+import android.util.GridScenario;
 
 /**
  * Basic stacking from bottom scenario, nothing fancy. Items do

core/tests/coretests/src/android/widget/gridview/GridSetSelectionStackFromBottomManyTest.java

diff --git a/tests/FrameworkTest/tests/src/com/android/frameworktest/gridview/GridSetSelectionStackFromBottomManyTest.java b/core/tests/coretests/src/android/widget/gridview/GridSetSelectionStackFromBottomManyTest.java
similarity index 87%
rename from tests/FrameworkTest/tests/src/com/android/frameworktest/gridview/GridSetSelectionStackFromBottomManyTest.java
rename to core/tests/coretests/src/android/widget/gridview/GridSetSelectionStackFromBottomManyTest.java
index 831ba85..46922b97 100644
--- a/tests/FrameworkTest/tests/src/com/android/frameworktest/gridview/GridSetSelectionStackFromBottomManyTest.java
+++ b/core/tests/coretests/src/android/widget/gridview/GridSetSelectionStackFromBottomManyTest.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.gridview;
+package android.widget.gridview;
 
-import com.android.frameworktest.gridview.GridSetSelectionStackFromBottomMany;
+import android.widget.gridview.GridSetSelectionStackFromBottomMany;
 
 public class GridSetSelectionStackFromBottomManyTest extends GridSetSelectionBaseTest<GridSetSelectionStackFromBottomMany> {
     public GridSetSelectionStackFromBottomManyTest() {

core/tests/coretests/src/android/widget/gridview/GridSetSelectionStackFromBottomTest.java

diff --git a/tests/FrameworkTest/tests/src/com/android/frameworktest/gridview/GridSetSelectionStackFromBottomTest.java b/core/tests/coretests/src/android/widget/gridview/GridSetSelectionStackFromBottomTest.java
similarity index 87%
rename from tests/FrameworkTest/tests/src/com/android/frameworktest/gridview/GridSetSelectionStackFromBottomTest.java
rename to core/tests/coretests/src/android/widget/gridview/GridSetSelectionStackFromBottomTest.java
index c4d0513..67dd6f1 100644
--- a/tests/FrameworkTest/tests/src/com/android/frameworktest/gridview/GridSetSelectionStackFromBottomTest.java
+++ b/core/tests/coretests/src/android/widget/gridview/GridSetSelectionStackFromBottomTest.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.gridview;
+package android.widget.gridview;
 
-import com.android.frameworktest.gridview.GridSetSelectionStackFromBottom;
+import android.widget.gridview.GridSetSelectionStackFromBottom;
 
 public class GridSetSelectionStackFromBottomTest extends GridSetSelectionBaseTest<GridSetSelectionStackFromBottom> {
     public GridSetSelectionStackFromBottomTest() {

core/tests/coretests/src/android/widget/gridview/GridSetSelectionTest.java

diff --git a/tests/FrameworkTest/tests/src/com/android/frameworktest/gridview/GridSetSelectionTest.java b/core/tests/coretests/src/android/widget/gridview/GridSetSelectionTest.java
similarity index 88%
rename from tests/FrameworkTest/tests/src/com/android/frameworktest/gridview/GridSetSelectionTest.java
rename to core/tests/coretests/src/android/widget/gridview/GridSetSelectionTest.java
index 5a584a5..2127b3c 100644
--- a/tests/FrameworkTest/tests/src/com/android/frameworktest/gridview/GridSetSelectionTest.java
+++ b/core/tests/coretests/src/android/widget/gridview/GridSetSelectionTest.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.gridview;
+package android.widget.gridview;
 
-import com.android.frameworktest.gridview.GridSetSelection;
+import android.widget.gridview.GridSetSelection;
 
 public class GridSetSelectionTest extends GridSetSelectionBaseTest<GridSetSelection> {
     public GridSetSelectionTest() {

core/tests/coretests/src/android/widget/gridview/GridSimple.java

diff --git a/tests/FrameworkTest/src/com/android/frameworktest/gridview/GridSimple.java b/core/tests/coretests/src/android/widget/gridview/GridSimple.java
similarity index 94%
rename from tests/FrameworkTest/src/com/android/frameworktest/gridview/GridSimple.java
rename to core/tests/coretests/src/android/widget/gridview/GridSimple.java
index f7f68f5..7c2c696 100644
--- a/tests/FrameworkTest/src/com/android/frameworktest/gridview/GridSimple.java
+++ b/core/tests/coretests/src/android/widget/gridview/GridSimple.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.gridview;
+package android.widget.gridview;
 
 import android.graphics.drawable.PaintDrawable;
 import android.os.Bundle;
@@ -22,7 +22,7 @@
 import android.view.ViewGroup;
 import android.widget.TextView;
 
-import com.android.frameworktest.util.GridScenario;
+import android.util.GridScenario;
 
 public class GridSimple extends GridScenario {
     @Override

core/tests/coretests/src/android/widget/gridview/GridSingleColumn.java

diff --git a/tests/FrameworkTest/src/com/android/frameworktest/gridview/GridSingleColumn.java b/core/tests/coretests/src/android/widget/gridview/GridSingleColumn.java
similarity index 91%
rename from tests/FrameworkTest/src/com/android/frameworktest/gridview/GridSingleColumn.java
rename to core/tests/coretests/src/android/widget/gridview/GridSingleColumn.java
index a909bd8..566e71b 100644
--- a/tests/FrameworkTest/src/com/android/frameworktest/gridview/GridSingleColumn.java
+++ b/core/tests/coretests/src/android/widget/gridview/GridSingleColumn.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.gridview;
+package android.widget.gridview;
 
-import com.android.frameworktest.util.GridScenario;
+import android.util.GridScenario;
 import android.widget.GridView;
 
 /**

core/tests/coretests/src/android/widget/gridview/GridSingleColumnTest.java

diff --git a/tests/FrameworkTest/tests/src/com/android/frameworktest/gridview/GridSingleColumnTest.java b/core/tests/coretests/src/android/widget/gridview/GridSingleColumnTest.java
similarity index 88%
rename from tests/FrameworkTest/tests/src/com/android/frameworktest/gridview/GridSingleColumnTest.java
rename to core/tests/coretests/src/android/widget/gridview/GridSingleColumnTest.java
index b72a2e0..3b2504e 100644
--- a/tests/FrameworkTest/tests/src/com/android/frameworktest/gridview/GridSingleColumnTest.java
+++ b/core/tests/coretests/src/android/widget/gridview/GridSingleColumnTest.java
@@ -14,20 +14,20 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.gridview;
+package android.widget.gridview;
 
 import android.test.ActivityInstrumentationTestCase;
 import android.test.suitebuilder.annotation.MediumTest;
 import android.widget.GridView;
 
-import com.android.frameworktest.gridview.GridSingleColumn;
+import android.widget.gridview.GridSingleColumn;
 
 public class GridSingleColumnTest extends ActivityInstrumentationTestCase<GridSingleColumn> {
     private GridSingleColumn mActivity;
     private GridView mGridView;
 
     public GridSingleColumnTest() {
-        super("com.android.frameworktest", GridSingleColumn.class);
+        super("com.android.frameworks.coretests", GridSingleColumn.class);
     }
 
     @Override

core/tests/coretests/src/android/widget/gridview/GridStackFromBottom.java

diff --git a/tests/FrameworkTest/src/com/android/frameworktest/gridview/GridStackFromBottom.java b/core/tests/coretests/src/android/widget/gridview/GridStackFromBottom.java
similarity index 91%
rename from tests/FrameworkTest/src/com/android/frameworktest/gridview/GridStackFromBottom.java
rename to core/tests/coretests/src/android/widget/gridview/GridStackFromBottom.java
index 304110e..2f0a88f 100644
--- a/tests/FrameworkTest/src/com/android/frameworktest/gridview/GridStackFromBottom.java
+++ b/core/tests/coretests/src/android/widget/gridview/GridStackFromBottom.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.gridview;
+package android.widget.gridview;
 
-import com.android.frameworktest.util.GridScenario;
+import android.util.GridScenario;
 
 /**
  * Basic bottom stacking from bottom scenario, nothing fancy. Items do not

core/tests/coretests/src/android/widget/gridview/GridStackFromBottomMany.java

diff --git a/tests/FrameworkTest/src/com/android/frameworktest/gridview/GridStackFromBottomMany.java b/core/tests/coretests/src/android/widget/gridview/GridStackFromBottomMany.java
similarity index 91%
rename from tests/FrameworkTest/src/com/android/frameworktest/gridview/GridStackFromBottomMany.java
rename to core/tests/coretests/src/android/widget/gridview/GridStackFromBottomMany.java
index 94d801e..33a9592 100644
--- a/tests/FrameworkTest/src/com/android/frameworktest/gridview/GridStackFromBottomMany.java
+++ b/core/tests/coretests/src/android/widget/gridview/GridStackFromBottomMany.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.gridview;
+package android.widget.gridview;
 
-import com.android.frameworktest.util.GridScenario;
+import android.util.GridScenario;
 
 /**
  * Basic bottom stacking from bottom scenario, nothing fancy. The grid items do not fit on the

core/tests/coretests/src/android/widget/gridview/GridStackFromBottomManyTest.java

diff --git a/tests/FrameworkTest/tests/src/com/android/frameworktest/gridview/GridStackFromBottomManyTest.java b/core/tests/coretests/src/android/widget/gridview/GridStackFromBottomManyTest.java
similarity index 88%
rename from tests/FrameworkTest/tests/src/com/android/frameworktest/gridview/GridStackFromBottomManyTest.java
rename to core/tests/coretests/src/android/widget/gridview/GridStackFromBottomManyTest.java
index a0b819e..640737e 100644
--- a/tests/FrameworkTest/tests/src/com/android/frameworktest/gridview/GridStackFromBottomManyTest.java
+++ b/core/tests/coretests/src/android/widget/gridview/GridStackFromBottomManyTest.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.gridview;
+package android.widget.gridview;
 
-import com.android.frameworktest.gridview.GridStackFromBottomMany;
+import android.widget.gridview.GridStackFromBottomMany;
 
 import android.test.suitebuilder.annotation.MediumTest;
 import android.widget.GridView;
@@ -27,7 +27,7 @@
     private GridView mGridView;
 
     public GridStackFromBottomManyTest() {
-        super("com.android.frameworktest", GridStackFromBottomMany.class);
+        super("com.android.frameworks.coretests", GridStackFromBottomMany.class);
     }
 
     @Override

core/tests/coretests/src/android/widget/gridview/GridStackFromBottomTest.java

diff --git a/tests/FrameworkTest/tests/src/com/android/frameworktest/gridview/GridStackFromBottomTest.java b/core/tests/coretests/src/android/widget/gridview/GridStackFromBottomTest.java
similarity index 88%
rename from tests/FrameworkTest/tests/src/com/android/frameworktest/gridview/GridStackFromBottomTest.java
rename to core/tests/coretests/src/android/widget/gridview/GridStackFromBottomTest.java
index 821c7a5..8fec241 100644
--- a/tests/FrameworkTest/tests/src/com/android/frameworktest/gridview/GridStackFromBottomTest.java
+++ b/core/tests/coretests/src/android/widget/gridview/GridStackFromBottomTest.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.gridview;
+package android.widget.gridview;
 
-import com.android.frameworktest.gridview.GridStackFromBottom;
+import android.widget.gridview.GridStackFromBottom;
 
 import android.test.ActivityInstrumentationTestCase;
 import android.test.suitebuilder.annotation.MediumTest;
@@ -27,7 +27,7 @@
     private GridView mGridView;
 
     public GridStackFromBottomTest() {
-        super("com.android.frameworktest", GridStackFromBottom.class);
+        super("com.android.frameworks.coretests", GridStackFromBottom.class);
     }
 
     @Override

core/tests/coretests/src/android/widget/gridview/GridThrasher.java

diff --git a/tests/FrameworkTest/src/com/android/frameworktest/gridview/GridThrasher.java b/core/tests/coretests/src/android/widget/gridview/GridThrasher.java
similarity index 97%
rename from tests/FrameworkTest/src/com/android/frameworktest/gridview/GridThrasher.java
rename to core/tests/coretests/src/android/widget/gridview/GridThrasher.java
index d628f2d..0ef5db9 100644
--- a/tests/FrameworkTest/src/com/android/frameworktest/gridview/GridThrasher.java
+++ b/core/tests/coretests/src/android/widget/gridview/GridThrasher.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.gridview;
+package android.widget.gridview;
 
-import com.android.frameworktest.R;
+import com.android.frameworks.coretests.R;
 
 import android.app.Activity;
 import android.content.Context;

core/tests/coretests/src/android/widget/gridview/GridVerticalSpacing.java

diff --git a/tests/FrameworkTest/src/com/android/frameworktest/gridview/GridVerticalSpacing.java b/core/tests/coretests/src/android/widget/gridview/GridVerticalSpacing.java
similarity index 91%
rename from tests/FrameworkTest/src/com/android/frameworktest/gridview/GridVerticalSpacing.java
rename to core/tests/coretests/src/android/widget/gridview/GridVerticalSpacing.java
index 3f6b8d6..0d01d30 100644
--- a/tests/FrameworkTest/src/com/android/frameworktest/gridview/GridVerticalSpacing.java
+++ b/core/tests/coretests/src/android/widget/gridview/GridVerticalSpacing.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.gridview;
+package android.widget.gridview;
 
-import com.android.frameworktest.util.GridScenario;
+import android.util.GridScenario;
 
 /**
  * A grid with vertical spacing between rows

core/tests/coretests/src/android/widget/gridview/GridVerticalSpacingStackFromBottom.java

diff --git a/tests/FrameworkTest/src/com/android/frameworktest/gridview/GridVerticalSpacingStackFromBottom.java b/core/tests/coretests/src/android/widget/gridview/GridVerticalSpacingStackFromBottom.java
similarity index 91%
rename from tests/FrameworkTest/src/com/android/frameworktest/gridview/GridVerticalSpacingStackFromBottom.java
rename to core/tests/coretests/src/android/widget/gridview/GridVerticalSpacingStackFromBottom.java
index 1a39ffb..bd68680 100644
--- a/tests/FrameworkTest/src/com/android/frameworktest/gridview/GridVerticalSpacingStackFromBottom.java
+++ b/core/tests/coretests/src/android/widget/gridview/GridVerticalSpacingStackFromBottom.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.gridview;
+package android.widget.gridview;
 
-import com.android.frameworktest.util.GridScenario;
+import android.util.GridScenario;
 
 /**
  * A grid with vertical spacing between rows that stacks from the bottom

core/tests/coretests/src/android/widget/gridview/touch/GridTouchSetSelectionTest.java

diff --git a/tests/FrameworkTest/tests/src/com/android/frameworktest/gridview/touch/GridTouchSetSelectionTest.java b/core/tests/coretests/src/android/widget/gridview/touch/GridTouchSetSelectionTest.java
similarity index 93%
rename from tests/FrameworkTest/tests/src/com/android/frameworktest/gridview/touch/GridTouchSetSelectionTest.java
rename to core/tests/coretests/src/android/widget/gridview/touch/GridTouchSetSelectionTest.java
index 926d662..ca789af 100644
--- a/tests/FrameworkTest/tests/src/com/android/frameworktest/gridview/touch/GridTouchSetSelectionTest.java
+++ b/core/tests/coretests/src/android/widget/gridview/touch/GridTouchSetSelectionTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.gridview.touch;
+package android.widget.gridview.touch;
 
 import android.test.ActivityInstrumentationTestCase;
 import android.test.suitebuilder.annotation.LargeTest;
@@ -23,7 +23,7 @@
 import android.view.View;
 import android.widget.GridView;
 
-import com.android.frameworktest.gridview.GridSimple;
+import android.widget.gridview.GridSimple;
 
 /**
  * Tests setting the selection in touch mode
@@ -33,7 +33,7 @@
     private GridView mGridView;
 
     public GridTouchSetSelectionTest() {
-        super("com.android.frameworktest", GridSimple.class);
+        super("com.android.frameworks.coretests", GridSimple.class);
     }
 
     @Override

core/tests/coretests/src/android/widget/gridview/touch/GridTouchStackFromBottomManyTest.java

diff --git a/tests/FrameworkTest/tests/src/com/android/frameworktest/gridview/touch/GridTouchStackFromBottomManyTest.java b/core/tests/coretests/src/android/widget/gridview/touch/GridTouchStackFromBottomManyTest.java
similarity index 93%
rename from tests/FrameworkTest/tests/src/com/android/frameworktest/gridview/touch/GridTouchStackFromBottomManyTest.java
rename to core/tests/coretests/src/android/widget/gridview/touch/GridTouchStackFromBottomManyTest.java
index 710617e..f8e6ae7 100644
--- a/tests/FrameworkTest/tests/src/com/android/frameworktest/gridview/touch/GridTouchStackFromBottomManyTest.java
+++ b/core/tests/coretests/src/android/widget/gridview/touch/GridTouchStackFromBottomManyTest.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.gridview.touch;
+package android.widget.gridview.touch;
 
 import android.test.suitebuilder.annotation.LargeTest;
 import android.test.suitebuilder.annotation.MediumTest;
 import android.test.TouchUtils;
-import com.android.frameworktest.gridview.GridStackFromBottomMany;
+import android.widget.gridview.GridStackFromBottomMany;
 
 import android.widget.GridView;
 import android.view.View;
@@ -30,7 +30,7 @@
     private GridView mGridView;
 
     public GridTouchStackFromBottomManyTest() {
-        super("com.android.frameworktest", GridStackFromBottomMany.class);
+        super("com.android.frameworks.coretests", GridStackFromBottomMany.class);
     }
 
     @Override

core/tests/coretests/src/android/widget/gridview/touch/GridTouchStackFromBottomTest.java

diff --git a/tests/FrameworkTest/tests/src/com/android/frameworktest/gridview/touch/GridTouchStackFromBottomTest.java b/core/tests/coretests/src/android/widget/gridview/touch/GridTouchStackFromBottomTest.java
similarity index 95%
rename from tests/FrameworkTest/tests/src/com/android/frameworktest/gridview/touch/GridTouchStackFromBottomTest.java
rename to core/tests/coretests/src/android/widget/gridview/touch/GridTouchStackFromBottomTest.java
index e085105..d8d4e43 100644
--- a/tests/FrameworkTest/tests/src/com/android/frameworktest/gridview/touch/GridTouchStackFromBottomTest.java
+++ b/core/tests/coretests/src/android/widget/gridview/touch/GridTouchStackFromBottomTest.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.gridview.touch;
+package android.widget.gridview.touch;
 
-import com.android.frameworktest.gridview.GridStackFromBottom;
+import android.widget.gridview.GridStackFromBottom;
 import android.test.TouchUtils;
 import android.test.suitebuilder.annotation.MediumTest;
 
@@ -29,7 +29,7 @@
     private GridView mGridView;
 
     public GridTouchStackFromBottomTest() {
-        super("com.android.frameworktest", GridStackFromBottom.class);
+        super("com.android.frameworks.coretests", GridStackFromBottom.class);
     }
 
     @Override

core/tests/coretests/src/android/widget/gridview/touch/GridTouchVerticalSpacingStackFromBottomTest.java

diff --git a/tests/FrameworkTest/tests/src/com/android/frameworktest/gridview/touch/GridTouchVerticalSpacingStackFromBottomTest.java b/core/tests/coretests/src/android/widget/gridview/touch/GridTouchVerticalSpacingStackFromBottomTest.java
similarity index 96%
rename from tests/FrameworkTest/tests/src/com/android/frameworktest/gridview/touch/GridTouchVerticalSpacingStackFromBottomTest.java
rename to core/tests/coretests/src/android/widget/gridview/touch/GridTouchVerticalSpacingStackFromBottomTest.java
index d11a39ba..55a66d9 100644
--- a/tests/FrameworkTest/tests/src/com/android/frameworktest/gridview/touch/GridTouchVerticalSpacingStackFromBottomTest.java
+++ b/core/tests/coretests/src/android/widget/gridview/touch/GridTouchVerticalSpacingStackFromBottomTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.gridview.touch;
+package android.widget.gridview.touch;
 
 import android.content.Context;
 import android.test.ActivityInstrumentationTestCase;
@@ -26,7 +26,7 @@
 import android.view.ViewConfiguration;
 import android.widget.GridView;
 
-import com.android.frameworktest.gridview.GridVerticalSpacingStackFromBottom;
+import android.widget.gridview.GridVerticalSpacingStackFromBottom;
 
 public class GridTouchVerticalSpacingStackFromBottomTest extends ActivityInstrumentationTestCase<GridVerticalSpacingStackFromBottom> {
     private GridVerticalSpacingStackFromBottom mActivity;
@@ -34,7 +34,7 @@
     private ViewConfiguration mViewConfig;
 
     public GridTouchVerticalSpacingStackFromBottomTest() {
-        super("com.android.frameworktest", GridVerticalSpacingStackFromBottom.class);
+        super("com.android.frameworks.coretests", GridVerticalSpacingStackFromBottom.class);
     }
 
     @Override

core/tests/coretests/src/android/widget/gridview/touch/GridTouchVerticalSpacingTest.java

diff --git a/tests/FrameworkTest/tests/src/com/android/frameworktest/gridview/touch/GridTouchVerticalSpacingTest.java b/core/tests/coretests/src/android/widget/gridview/touch/GridTouchVerticalSpacingTest.java
similarity index 96%
rename from tests/FrameworkTest/tests/src/com/android/frameworktest/gridview/touch/GridTouchVerticalSpacingTest.java
rename to core/tests/coretests/src/android/widget/gridview/touch/GridTouchVerticalSpacingTest.java
index 355c5a4..bae4ee7 100644
--- a/tests/FrameworkTest/tests/src/com/android/frameworktest/gridview/touch/GridTouchVerticalSpacingTest.java
+++ b/core/tests/coretests/src/android/widget/gridview/touch/GridTouchVerticalSpacingTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.gridview.touch;
+package android.widget.gridview.touch;
 
 import android.test.ActivityInstrumentationTestCase;
 import android.test.suitebuilder.annotation.LargeTest;
@@ -25,14 +25,14 @@
 import android.view.ViewConfiguration;
 import android.widget.GridView;
 
-import com.android.frameworktest.gridview.GridVerticalSpacing;
+import android.widget.gridview.GridVerticalSpacing;
 
 public class GridTouchVerticalSpacingTest extends ActivityInstrumentationTestCase<GridVerticalSpacing> {
     private GridVerticalSpacing mActivity;
     private GridView mGridView;
 
     public GridTouchVerticalSpacingTest() {
-        super("com.android.frameworktest", GridVerticalSpacing.class);
+        super("com.android.frameworks.coretests", GridVerticalSpacing.class);
     }
 
     @Override

core/tests/coretests/src/android/widget/layout/frame/FrameLayoutGravity.java

diff --git a/tests/FrameworkTest/src/com/android/frameworktest/layout/frame/FrameLayoutGravity.java b/core/tests/coretests/src/android/widget/layout/frame/FrameLayoutGravity.java
similarity index 91%
rename from tests/FrameworkTest/src/com/android/frameworktest/layout/frame/FrameLayoutGravity.java
rename to core/tests/coretests/src/android/widget/layout/frame/FrameLayoutGravity.java
index 1383dae..9791e36 100644
--- a/tests/FrameworkTest/src/com/android/frameworktest/layout/frame/FrameLayoutGravity.java
+++ b/core/tests/coretests/src/android/widget/layout/frame/FrameLayoutGravity.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.layout.frame;
+package android.widget.layout.frame;
 
-import com.android.frameworktest.R;
+import com.android.frameworks.coretests.R;
 
 import android.app.Activity;
 import android.os.Bundle;

core/tests/coretests/src/android/widget/layout/frame/FrameLayoutGravityTest.java

diff --git a/tests/FrameworkTest/tests/src/com/android/frameworktest/layout/frame/FrameLayoutGravityTest.java b/core/tests/coretests/src/android/widget/layout/frame/FrameLayoutGravityTest.java
similarity index 95%
rename from tests/FrameworkTest/tests/src/com/android/frameworktest/layout/frame/FrameLayoutGravityTest.java
rename to core/tests/coretests/src/android/widget/layout/frame/FrameLayoutGravityTest.java
index 239bd7d..fe4e932 100644
--- a/tests/FrameworkTest/tests/src/com/android/frameworktest/layout/frame/FrameLayoutGravityTest.java
+++ b/core/tests/coretests/src/android/widget/layout/frame/FrameLayoutGravityTest.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.layout.frame;
+package android.widget.layout.frame;
 
 import android.test.ActivityInstrumentationTestCase;
 import android.test.suitebuilder.annotation.MediumTest;
 import android.test.ViewAsserts;
 import android.app.Activity;
 import android.view.View;
-import com.android.frameworktest.layout.frame.FrameLayoutGravity;
-import com.android.frameworktest.R;
+import android.widget.layout.frame.FrameLayoutGravity;
+import com.android.frameworks.coretests.R;
 
 public class FrameLayoutGravityTest extends ActivityInstrumentationTestCase<FrameLayoutGravity> {
     private View mLeftView;
@@ -37,7 +37,7 @@
     private View mParent;
 
     public FrameLayoutGravityTest() {
-        super("com.android.frameworktest", FrameLayoutGravity.class);
+        super("com.android.frameworks.coretests", FrameLayoutGravity.class);
     }
 
     @Override

core/tests/coretests/src/android/widget/layout/frame/FrameLayoutMargin.java

diff --git a/tests/FrameworkTest/src/com/android/frameworktest/layout/frame/FrameLayoutMargin.java b/core/tests/coretests/src/android/widget/layout/frame/FrameLayoutMargin.java
similarity index 91%
rename from tests/FrameworkTest/src/com/android/frameworktest/layout/frame/FrameLayoutMargin.java
rename to core/tests/coretests/src/android/widget/layout/frame/FrameLayoutMargin.java
index 0434726..81b3ea1 100644
--- a/tests/FrameworkTest/src/com/android/frameworktest/layout/frame/FrameLayoutMargin.java
+++ b/core/tests/coretests/src/android/widget/layout/frame/FrameLayoutMargin.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.layout.frame;
+package android.widget.layout.frame;
 
-import com.android.frameworktest.R;
+import com.android.frameworks.coretests.R;
 
 import android.app.Activity;
 import android.os.Bundle;

core/tests/coretests/src/android/widget/layout/frame/FrameLayoutMarginTest.java

diff --git a/tests/FrameworkTest/tests/src/com/android/frameworktest/layout/frame/FrameLayoutMarginTest.java b/core/tests/coretests/src/android/widget/layout/frame/FrameLayoutMarginTest.java
similarity index 92%
rename from tests/FrameworkTest/tests/src/com/android/frameworktest/layout/frame/FrameLayoutMarginTest.java
rename to core/tests/coretests/src/android/widget/layout/frame/FrameLayoutMarginTest.java
index 4df4805..c052d65 100644
--- a/tests/FrameworkTest/tests/src/com/android/frameworktest/layout/frame/FrameLayoutMarginTest.java
+++ b/core/tests/coretests/src/android/widget/layout/frame/FrameLayoutMarginTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.layout.frame;
+package android.widget.layout.frame;
 
 import android.test.ActivityInstrumentationTestCase;
 import android.test.suitebuilder.annotation.MediumTest;
@@ -22,8 +22,8 @@
 import android.app.Activity;
 import android.view.View;
 import android.view.ViewGroup;
-import com.android.frameworktest.layout.frame.FrameLayoutMargin;
-import com.android.frameworktest.R;
+import android.widget.layout.frame.FrameLayoutMargin;
+import com.android.frameworks.coretests.R;
 
 public class FrameLayoutMarginTest extends ActivityInstrumentationTestCase<FrameLayoutMargin> {
     private View mLeftView;
@@ -33,7 +33,7 @@
     private View mParent;
 
     public FrameLayoutMarginTest() {
-        super("com.android.frameworktest", FrameLayoutMargin.class);
+        super("com.android.frameworks.coretests", FrameLayoutMargin.class);
     }
 
     @Override

core/tests/coretests/src/android/widget/layout/linear/BaselineAlignmentCenterGravity.java

diff --git a/tests/FrameworkTest/src/com/android/frameworktest/layout/linear/BaselineAlignmentCenterGravity.java b/core/tests/coretests/src/android/widget/layout/linear/BaselineAlignmentCenterGravity.java
similarity index 91%
rename from tests/FrameworkTest/src/com/android/frameworktest/layout/linear/BaselineAlignmentCenterGravity.java
rename to core/tests/coretests/src/android/widget/layout/linear/BaselineAlignmentCenterGravity.java
index 5087c62..766dd0a 100644
--- a/tests/FrameworkTest/src/com/android/frameworktest/layout/linear/BaselineAlignmentCenterGravity.java
+++ b/core/tests/coretests/src/android/widget/layout/linear/BaselineAlignmentCenterGravity.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.layout.linear;
+package android.widget.layout.linear;
 
-import com.android.frameworktest.R;
+import com.android.frameworks.coretests.R;
 
 import android.app.Activity;
 import android.os.Bundle;

core/tests/coretests/src/android/widget/layout/linear/BaselineAlignmentCenterGravityTest.java

diff --git a/tests/FrameworkTest/tests/src/com/android/frameworktest/layout/linear/BaselineAlignmentCenterGravityTest.java b/core/tests/coretests/src/android/widget/layout/linear/BaselineAlignmentCenterGravityTest.java
similarity index 90%
rename from tests/FrameworkTest/tests/src/com/android/frameworktest/layout/linear/BaselineAlignmentCenterGravityTest.java
rename to core/tests/coretests/src/android/widget/layout/linear/BaselineAlignmentCenterGravityTest.java
index 0b6360e..079e9d0 100644
--- a/tests/FrameworkTest/tests/src/com/android/frameworktest/layout/linear/BaselineAlignmentCenterGravityTest.java
+++ b/core/tests/coretests/src/android/widget/layout/linear/BaselineAlignmentCenterGravityTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.layout.linear;
+package android.widget.layout.linear;
 
 import android.app.Activity;
 import android.test.ActivityInstrumentationTestCase;
@@ -23,8 +23,8 @@
 import android.view.View;
 import android.widget.Button;
 
-import com.android.frameworktest.R;
-import com.android.frameworktest.layout.linear.BaselineAlignmentCenterGravity;
+import com.android.frameworks.coretests.R;
+import android.widget.layout.linear.BaselineAlignmentCenterGravity;
 
 public class BaselineAlignmentCenterGravityTest extends ActivityInstrumentationTestCase<BaselineAlignmentCenterGravity> {
     private Button mButton1;
@@ -32,7 +32,7 @@
     private Button mButton3;
 
     public BaselineAlignmentCenterGravityTest() {
-        super("com.android.frameworktest", BaselineAlignmentCenterGravity.class);
+        super("com.android.frameworks.coretests", BaselineAlignmentCenterGravity.class);
     }
 
     @Override

core/tests/coretests/src/android/widget/layout/linear/BaselineAlignmentSpinnerButton.java

diff --git a/tests/FrameworkTest/tests/src/com/android/frameworktest/layout/linear/BaselineAlignmentSpinnerButton.java b/core/tests/coretests/src/android/widget/layout/linear/BaselineAlignmentSpinnerButton.java
similarity index 85%
rename from tests/FrameworkTest/tests/src/com/android/frameworktest/layout/linear/BaselineAlignmentSpinnerButton.java
rename to core/tests/coretests/src/android/widget/layout/linear/BaselineAlignmentSpinnerButton.java
index 050e053..c3bfe3a 100644
--- a/tests/FrameworkTest/tests/src/com/android/frameworktest/layout/linear/BaselineAlignmentSpinnerButton.java
+++ b/core/tests/coretests/src/android/widget/layout/linear/BaselineAlignmentSpinnerButton.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.layout.linear;
+package android.widget.layout.linear;
 
 import android.app.Activity;
 import android.test.ActivityInstrumentationTestCase;
@@ -22,15 +22,15 @@
 import android.test.ViewAsserts;
 import android.view.View;
 
-import com.android.frameworktest.R;
-import com.android.frameworktest.layout.linear.HorizontalOrientationVerticalAlignment;
+import com.android.frameworks.coretests.R;
+import android.widget.layout.linear.HorizontalOrientationVerticalAlignment;
 
 public class BaselineAlignmentSpinnerButton extends ActivityInstrumentationTestCase<HorizontalOrientationVerticalAlignment> {
     private View mSpinner;
     private View mButton;
 
     public BaselineAlignmentSpinnerButton() {
-        super("com.android.frameworktest", HorizontalOrientationVerticalAlignment.class);
+        super("com.android.frameworks.coretests", HorizontalOrientationVerticalAlignment.class);
     }
 
     @Override

core/tests/coretests/src/android/widget/layout/linear/BaselineAlignmentZeroWidthAndWeight.java

diff --git a/tests/FrameworkTest/src/com/android/frameworktest/layout/linear/BaselineAlignmentZeroWidthAndWeight.java b/core/tests/coretests/src/android/widget/layout/linear/BaselineAlignmentZeroWidthAndWeight.java
similarity index 92%
rename from tests/FrameworkTest/src/com/android/frameworktest/layout/linear/BaselineAlignmentZeroWidthAndWeight.java
rename to core/tests/coretests/src/android/widget/layout/linear/BaselineAlignmentZeroWidthAndWeight.java
index 3c1d7fd..5ed5e71 100644
--- a/tests/FrameworkTest/src/com/android/frameworktest/layout/linear/BaselineAlignmentZeroWidthAndWeight.java
+++ b/core/tests/coretests/src/android/widget/layout/linear/BaselineAlignmentZeroWidthAndWeight.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.layout.linear;
+package android.widget.layout.linear;
 
-import com.android.frameworktest.R;
+import com.android.frameworks.coretests.R;
 
 import android.app.Activity;
 import android.os.Bundle;

core/tests/coretests/src/android/widget/layout/linear/BaselineAlignmentZeroWidthAndWeightTest.java

diff --git a/tests/FrameworkTest/tests/src/com/android/frameworktest/layout/linear/BaselineAlignmentZeroWidthAndWeightTest.java b/core/tests/coretests/src/android/widget/layout/linear/BaselineAlignmentZeroWidthAndWeightTest.java
similarity index 85%
rename from tests/FrameworkTest/tests/src/com/android/frameworktest/layout/linear/BaselineAlignmentZeroWidthAndWeightTest.java
rename to core/tests/coretests/src/android/widget/layout/linear/BaselineAlignmentZeroWidthAndWeightTest.java
index a315d81..2dd2bb8 100644
--- a/tests/FrameworkTest/tests/src/com/android/frameworktest/layout/linear/BaselineAlignmentZeroWidthAndWeightTest.java
+++ b/core/tests/coretests/src/android/widget/layout/linear/BaselineAlignmentZeroWidthAndWeightTest.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.layout.linear;
+package android.widget.layout.linear;
 
-import com.android.frameworktest.R;
-import com.android.frameworktest.layout.linear.BaselineAlignmentZeroWidthAndWeight;
-import com.android.frameworktest.layout.linear.ExceptionTextView;
+import com.android.frameworks.coretests.R;
+import android.widget.layout.linear.BaselineAlignmentZeroWidthAndWeight;
+import android.widget.layout.linear.ExceptionTextView;
 
 import android.app.Activity;
 import android.test.ActivityInstrumentationTestCase;
@@ -30,7 +30,7 @@
     private Button mShowButton;
 
     public BaselineAlignmentZeroWidthAndWeightTest() {
-        super("com.android.frameworktest", BaselineAlignmentZeroWidthAndWeight.class);
+        super("com.android.frameworks.coretests", BaselineAlignmentZeroWidthAndWeight.class);
     }
 
     @Override

core/tests/coretests/src/android/widget/layout/linear/BaselineButtons.java

diff --git a/tests/FrameworkTest/src/com/android/frameworktest/layout/linear/BaselineButtons.java b/core/tests/coretests/src/android/widget/layout/linear/BaselineButtons.java
similarity index 91%
rename from tests/FrameworkTest/src/com/android/frameworktest/layout/linear/BaselineButtons.java
rename to core/tests/coretests/src/android/widget/layout/linear/BaselineButtons.java
index 9bb9bff..c9ad831 100644
--- a/tests/FrameworkTest/src/com/android/frameworktest/layout/linear/BaselineButtons.java
+++ b/core/tests/coretests/src/android/widget/layout/linear/BaselineButtons.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.layout.linear;
+package android.widget.layout.linear;
 
-import com.android.frameworktest.R;
+import com.android.frameworks.coretests.R;
 
 import android.app.Activity;
 import android.os.Bundle;

core/tests/coretests/src/android/widget/layout/linear/BaselineButtonsTest.java

diff --git a/tests/FrameworkTest/tests/src/com/android/frameworktest/layout/linear/BaselineButtonsTest.java b/core/tests/coretests/src/android/widget/layout/linear/BaselineButtonsTest.java
similarity index 93%
rename from tests/FrameworkTest/tests/src/com/android/frameworktest/layout/linear/BaselineButtonsTest.java
rename to core/tests/coretests/src/android/widget/layout/linear/BaselineButtonsTest.java
index 9f2e138..6f1fc90 100644
--- a/tests/FrameworkTest/tests/src/com/android/frameworktest/layout/linear/BaselineButtonsTest.java
+++ b/core/tests/coretests/src/android/widget/layout/linear/BaselineButtonsTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.layout.linear;
+package android.widget.layout.linear;
 
 import android.app.Activity;
 import android.test.ActivityInstrumentationTestCase;
@@ -22,8 +22,8 @@
 import android.view.View;
 import android.widget.ImageButton;
 
-import com.android.frameworktest.R;
-import com.android.frameworktest.layout.linear.BaselineButtons;
+import com.android.frameworks.coretests.R;
+import android.widget.layout.linear.BaselineButtons;
 
 public class BaselineButtonsTest extends ActivityInstrumentationTestCase<BaselineButtons> {
     private View mCurrentTime;
@@ -34,7 +34,7 @@
     private View mLayout;
 
     public BaselineButtonsTest() {
-        super("com.android.frameworktest", BaselineButtons.class);
+        super("com.android.frameworks.coretests", BaselineButtons.class);
     }
 
     @Override

core/tests/coretests/src/android/widget/layout/linear/ExceptionTextView.java

diff --git a/tests/FrameworkTest/src/com/android/frameworktest/layout/linear/ExceptionTextView.java b/core/tests/coretests/src/android/widget/layout/linear/ExceptionTextView.java
similarity index 97%
rename from tests/FrameworkTest/src/com/android/frameworktest/layout/linear/ExceptionTextView.java
rename to core/tests/coretests/src/android/widget/layout/linear/ExceptionTextView.java
index 54f6b98..9fa9be9 100644
--- a/tests/FrameworkTest/src/com/android/frameworktest/layout/linear/ExceptionTextView.java
+++ b/core/tests/coretests/src/android/widget/layout/linear/ExceptionTextView.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.layout.linear;
+package android.widget.layout.linear;
 
 import junit.framework.Assert;
 

core/tests/coretests/src/android/widget/layout/linear/FillInWrap.java

diff --git a/tests/FrameworkTest/src/com/android/frameworktest/layout/linear/FillInWrap.java b/core/tests/coretests/src/android/widget/layout/linear/FillInWrap.java
similarity index 91%
rename from tests/FrameworkTest/src/com/android/frameworktest/layout/linear/FillInWrap.java
rename to core/tests/coretests/src/android/widget/layout/linear/FillInWrap.java
index a95cf17..50aa5b7 100644
--- a/tests/FrameworkTest/src/com/android/frameworktest/layout/linear/FillInWrap.java
+++ b/core/tests/coretests/src/android/widget/layout/linear/FillInWrap.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.layout.linear;
+package android.widget.layout.linear;
 
-import com.android.frameworktest.R;
+import com.android.frameworks.coretests.R;
 
 import android.app.Activity;
 import android.os.Bundle;

core/tests/coretests/src/android/widget/layout/linear/FillInWrapTest.java

diff --git a/tests/FrameworkTest/tests/src/com/android/frameworktest/layout/linear/FillInWrapTest.java b/core/tests/coretests/src/android/widget/layout/linear/FillInWrapTest.java
similarity index 90%
rename from tests/FrameworkTest/tests/src/com/android/frameworktest/layout/linear/FillInWrapTest.java
rename to core/tests/coretests/src/android/widget/layout/linear/FillInWrapTest.java
index 0e7a4a0..f161802 100644
--- a/tests/FrameworkTest/tests/src/com/android/frameworktest/layout/linear/FillInWrapTest.java
+++ b/core/tests/coretests/src/android/widget/layout/linear/FillInWrapTest.java
@@ -14,21 +14,21 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.layout.linear;
+package android.widget.layout.linear;
 
 import android.app.Activity;
 import android.test.ActivityInstrumentationTestCase;
 import android.test.suitebuilder.annotation.MediumTest;
 import android.view.View;
 
-import com.android.frameworktest.R;
+import com.android.frameworks.coretests.R;
 
 public class FillInWrapTest extends ActivityInstrumentationTestCase<FillInWrap> {
     private View mChild;
     private View mContainer;
 
     public FillInWrapTest() {
-        super("com.android.frameworktest", FillInWrap.class);
+        super("com.android.frameworks.coretests", FillInWrap.class);
     }
 
     @Override

core/tests/coretests/src/android/widget/layout/linear/HorizontalOrientationVerticalAlignment.java

diff --git a/tests/FrameworkTest/src/com/android/frameworktest/layout/linear/HorizontalOrientationVerticalAlignment.java b/core/tests/coretests/src/android/widget/layout/linear/HorizontalOrientationVerticalAlignment.java
similarity index 91%
rename from tests/FrameworkTest/src/com/android/frameworktest/layout/linear/HorizontalOrientationVerticalAlignment.java
rename to core/tests/coretests/src/android/widget/layout/linear/HorizontalOrientationVerticalAlignment.java
index 1308b8b..9f937a9 100644
--- a/tests/FrameworkTest/src/com/android/frameworktest/layout/linear/HorizontalOrientationVerticalAlignment.java
+++ b/core/tests/coretests/src/android/widget/layout/linear/HorizontalOrientationVerticalAlignment.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.layout.linear;
+package android.widget.layout.linear;
 
-import com.android.frameworktest.R;
+import com.android.frameworks.coretests.R;
 
 import android.app.Activity;
 import android.os.Bundle;

core/tests/coretests/src/android/widget/layout/linear/LLEditTextThenButton.java

diff --git a/tests/FrameworkTest/src/com/android/frameworktest/layout/linear/LLEditTextThenButton.java b/core/tests/coretests/src/android/widget/layout/linear/LLEditTextThenButton.java
similarity index 94%
rename from tests/FrameworkTest/src/com/android/frameworktest/layout/linear/LLEditTextThenButton.java
rename to core/tests/coretests/src/android/widget/layout/linear/LLEditTextThenButton.java
index db868cb..fe2525f 100644
--- a/tests/FrameworkTest/src/com/android/frameworktest/layout/linear/LLEditTextThenButton.java
+++ b/core/tests/coretests/src/android/widget/layout/linear/LLEditTextThenButton.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.layout.linear;
+package android.widget.layout.linear;
 
-import com.android.frameworktest.R;
+import com.android.frameworks.coretests.R;
 
 import android.app.Activity;
 import android.os.Bundle;

core/tests/coretests/src/android/widget/layout/linear/LLOfButtons1.java

diff --git a/tests/FrameworkTest/src/com/android/frameworktest/layout/linear/LLOfButtons1.java b/core/tests/coretests/src/android/widget/layout/linear/LLOfButtons1.java
similarity index 95%
rename from tests/FrameworkTest/src/com/android/frameworktest/layout/linear/LLOfButtons1.java
rename to core/tests/coretests/src/android/widget/layout/linear/LLOfButtons1.java
index 33189e5..3d0144f 100644
--- a/tests/FrameworkTest/src/com/android/frameworktest/layout/linear/LLOfButtons1.java
+++ b/core/tests/coretests/src/android/widget/layout/linear/LLOfButtons1.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.layout.linear;
+package android.widget.layout.linear;
 
 import android.app.Activity;
 import android.os.Bundle;
@@ -22,7 +22,7 @@
 import android.view.View;
 import android.widget.Button;
 import android.widget.LinearLayout;
-import com.android.frameworktest.R;
+import com.android.frameworks.coretests.R;
 
 /**
  * One of two simple vertical linear layouts of buttons used to test out

core/tests/coretests/src/android/widget/layout/linear/LLOfButtons2.java

diff --git a/tests/FrameworkTest/src/com/android/frameworktest/layout/linear/LLOfButtons2.java b/core/tests/coretests/src/android/widget/layout/linear/LLOfButtons2.java
similarity index 93%
rename from tests/FrameworkTest/src/com/android/frameworktest/layout/linear/LLOfButtons2.java
rename to core/tests/coretests/src/android/widget/layout/linear/LLOfButtons2.java
index 1e0c97a..77f564d 100644
--- a/tests/FrameworkTest/src/com/android/frameworktest/layout/linear/LLOfButtons2.java
+++ b/core/tests/coretests/src/android/widget/layout/linear/LLOfButtons2.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.layout.linear;
+package android.widget.layout.linear;
 
 /**
  * One of two simple vertical linear layouts of buttons used to test out

core/tests/coretests/src/android/widget/layout/linear/LLOfTwoFocusableInTouchMode.java

diff --git a/tests/FrameworkTest/src/com/android/frameworktest/layout/linear/LLOfTwoFocusableInTouchMode.java b/core/tests/coretests/src/android/widget/layout/linear/LLOfTwoFocusableInTouchMode.java
similarity index 96%
rename from tests/FrameworkTest/src/com/android/frameworktest/layout/linear/LLOfTwoFocusableInTouchMode.java
rename to core/tests/coretests/src/android/widget/layout/linear/LLOfTwoFocusableInTouchMode.java
index 201c8f9..1ba56ba 100644
--- a/tests/FrameworkTest/src/com/android/frameworktest/layout/linear/LLOfTwoFocusableInTouchMode.java
+++ b/core/tests/coretests/src/android/widget/layout/linear/LLOfTwoFocusableInTouchMode.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.layout.linear;
+package android.widget.layout.linear;
 
-import com.android.frameworktest.R;
+import com.android.frameworks.coretests.R;
 
 import android.app.Activity;
 import android.os.Bundle;

core/tests/coretests/src/android/widget/layout/linear/LinearLayoutEditTexts.java

diff --git a/tests/FrameworkTest/src/com/android/frameworktest/layout/linear/LinearLayoutEditTexts.java b/core/tests/coretests/src/android/widget/layout/linear/LinearLayoutEditTexts.java
similarity index 91%
rename from tests/FrameworkTest/src/com/android/frameworktest/layout/linear/LinearLayoutEditTexts.java
rename to core/tests/coretests/src/android/widget/layout/linear/LinearLayoutEditTexts.java
index 4877a63..90db788 100644
--- a/tests/FrameworkTest/src/com/android/frameworktest/layout/linear/LinearLayoutEditTexts.java
+++ b/core/tests/coretests/src/android/widget/layout/linear/LinearLayoutEditTexts.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.layout.linear;
+package android.widget.layout.linear;
 
-import com.android.frameworktest.R;
+import com.android.frameworks.coretests.R;
 
 import android.app.Activity;
 import android.os.Bundle;

core/tests/coretests/src/android/widget/layout/linear/LinearLayoutEditTextsTest.java

diff --git a/tests/FrameworkTest/tests/src/com/android/frameworktest/layout/linear/LinearLayoutEditTextsTest.java b/core/tests/coretests/src/android/widget/layout/linear/LinearLayoutEditTextsTest.java
similarity index 87%
rename from tests/FrameworkTest/tests/src/com/android/frameworktest/layout/linear/LinearLayoutEditTextsTest.java
rename to core/tests/coretests/src/android/widget/layout/linear/LinearLayoutEditTextsTest.java
index 9dde62c..d5998b7 100644
--- a/tests/FrameworkTest/tests/src/com/android/frameworktest/layout/linear/LinearLayoutEditTextsTest.java
+++ b/core/tests/coretests/src/android/widget/layout/linear/LinearLayoutEditTextsTest.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.layout.linear;
+package android.widget.layout.linear;
 
-import com.android.frameworktest.layout.linear.LinearLayoutEditTexts;
-import com.android.frameworktest.R;
+import android.widget.layout.linear.LinearLayoutEditTexts;
+import com.android.frameworks.coretests.R;
 
 import android.test.ActivityInstrumentationTestCase;
 import android.test.suitebuilder.annotation.MediumTest;
@@ -29,7 +29,7 @@
     private View mContainer;
 
     public LinearLayoutEditTextsTest() {
-        super("com.android.frameworktest", LinearLayoutEditTexts.class);
+        super("com.android.frameworks.coretests", LinearLayoutEditTexts.class);
     }
 
     @Override

core/tests/coretests/src/android/widget/layout/linear/Weight.java

diff --git a/tests/FrameworkTest/src/com/android/frameworktest/layout/linear/Weight.java b/core/tests/coretests/src/android/widget/layout/linear/Weight.java
similarity index 90%
rename from tests/FrameworkTest/src/com/android/frameworktest/layout/linear/Weight.java
rename to core/tests/coretests/src/android/widget/layout/linear/Weight.java
index 0535f00..20edd7c 100644
--- a/tests/FrameworkTest/src/com/android/frameworktest/layout/linear/Weight.java
+++ b/core/tests/coretests/src/android/widget/layout/linear/Weight.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.layout.linear;
+package android.widget.layout.linear;
 
-import com.android.frameworktest.R;
+import com.android.frameworks.coretests.R;
 
 import android.app.Activity;
 import android.os.Bundle;

core/tests/coretests/src/android/widget/layout/linear/WeightSum.java

diff --git a/tests/FrameworkTest/src/com/android/frameworktest/layout/linear/WeightSum.java b/core/tests/coretests/src/android/widget/layout/linear/WeightSum.java
similarity index 90%
rename from tests/FrameworkTest/src/com/android/frameworktest/layout/linear/WeightSum.java
rename to core/tests/coretests/src/android/widget/layout/linear/WeightSum.java
index 8b9a497..2e421da 100644
--- a/tests/FrameworkTest/src/com/android/frameworktest/layout/linear/WeightSum.java
+++ b/core/tests/coretests/src/android/widget/layout/linear/WeightSum.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.layout.linear;
+package android.widget.layout.linear;
 
-import com.android.frameworktest.R;
+import com.android.frameworks.coretests.R;
 
 import android.app.Activity;
 import android.os.Bundle;

core/tests/coretests/src/android/widget/layout/linear/WeightSumTest.java

diff --git a/tests/FrameworkTest/tests/src/com/android/frameworktest/layout/linear/WeightSumTest.java b/core/tests/coretests/src/android/widget/layout/linear/WeightSumTest.java
similarity index 88%
rename from tests/FrameworkTest/tests/src/com/android/frameworktest/layout/linear/WeightSumTest.java
rename to core/tests/coretests/src/android/widget/layout/linear/WeightSumTest.java
index a51743b..f9a94ce 100644
--- a/tests/FrameworkTest/tests/src/com/android/frameworktest/layout/linear/WeightSumTest.java
+++ b/core/tests/coretests/src/android/widget/layout/linear/WeightSumTest.java
@@ -14,22 +14,22 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.layout.linear;
+package android.widget.layout.linear;
 
 import android.app.Activity;
 import android.test.ActivityInstrumentationTestCase;
 import android.test.suitebuilder.annotation.MediumTest;
 import android.view.View;
 
-import com.android.frameworktest.R;
-import com.android.frameworktest.layout.linear.WeightSum;
+import com.android.frameworks.coretests.R;
+import android.widget.layout.linear.WeightSum;
 
 public class WeightSumTest extends ActivityInstrumentationTestCase<WeightSum> {
     private View mChild;
     private View mContainer;
 
     public WeightSumTest() {
-        super("com.android.frameworktest", WeightSum.class);
+        super("com.android.frameworks.coretests", WeightSum.class);
     }
 
     @Override

core/tests/coretests/src/android/widget/layout/linear/WeightTest.java

diff --git a/tests/FrameworkTest/tests/src/com/android/frameworktest/layout/linear/WeightTest.java b/core/tests/coretests/src/android/widget/layout/linear/WeightTest.java
similarity index 87%
rename from tests/FrameworkTest/tests/src/com/android/frameworktest/layout/linear/WeightTest.java
rename to core/tests/coretests/src/android/widget/layout/linear/WeightTest.java
index f7fec78..0349d7f 100644
--- a/tests/FrameworkTest/tests/src/com/android/frameworktest/layout/linear/WeightTest.java
+++ b/core/tests/coretests/src/android/widget/layout/linear/WeightTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.layout.linear;
+package android.widget.layout.linear;
 
 import android.app.Activity;
 import android.test.ActivityInstrumentationTestCase;
@@ -22,15 +22,15 @@
 import android.test.ViewAsserts;
 import android.view.View;
 
-import com.android.frameworktest.R;
-import com.android.frameworktest.layout.linear.Weight;
+import com.android.frameworks.coretests.R;
+import android.widget.layout.linear.Weight;
 
 public class WeightTest extends ActivityInstrumentationTestCase<Weight> {
     private View mChild;
     private View mContainer;
 
     public WeightTest() {
-        super("com.android.frameworktest", Weight.class);
+        super("com.android.frameworks.coretests", Weight.class);
     }
 
     @Override

core/tests/coretests/src/android/widget/layout/table/AddColumn.java

diff --git a/tests/FrameworkTest/src/com/android/frameworktest/layout/table/AddColumn.java b/core/tests/coretests/src/android/widget/layout/table/AddColumn.java
similarity index 95%
rename from tests/FrameworkTest/src/com/android/frameworktest/layout/table/AddColumn.java
rename to core/tests/coretests/src/android/widget/layout/table/AddColumn.java
index c490e0f..400c32c 100644
--- a/tests/FrameworkTest/src/com/android/frameworktest/layout/table/AddColumn.java
+++ b/core/tests/coretests/src/android/widget/layout/table/AddColumn.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.layout.table;
+package android.widget.layout.table;
 
-import com.android.frameworktest.R;
+import com.android.frameworks.coretests.R;
 
 import android.app.Activity;
 import android.os.Bundle;

core/tests/coretests/src/android/widget/layout/table/AddColumnTest.java

diff --git a/tests/FrameworkTest/tests/src/com/android/frameworktest/layout/table/AddColumnTest.java b/core/tests/coretests/src/android/widget/layout/table/AddColumnTest.java
similarity index 88%
rename from tests/FrameworkTest/tests/src/com/android/frameworktest/layout/table/AddColumnTest.java
rename to core/tests/coretests/src/android/widget/layout/table/AddColumnTest.java
index 9d713c8..bfb4d17 100644
--- a/tests/FrameworkTest/tests/src/com/android/frameworktest/layout/table/AddColumnTest.java
+++ b/core/tests/coretests/src/android/widget/layout/table/AddColumnTest.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.layout.table;
+package android.widget.layout.table;
 
-import com.android.frameworktest.layout.table.AddColumn;
-import com.android.frameworktest.R;
+import android.widget.layout.table.AddColumn;
+import com.android.frameworks.coretests.R;
 
 import android.test.ActivityInstrumentationTestCase;
 import android.test.suitebuilder.annotation.MediumTest;
@@ -27,7 +27,7 @@
 import android.widget.TableRow;
 
 /**
- * {@link com.android.frameworktest.layout.table.AddColumn} is
+ * {@link android.widget.layout.table.AddColumn} is
  * setup to exercise the case of adding row programmatically in a table.
  */
 public class AddColumnTest extends ActivityInstrumentationTestCase<AddColumn> {
@@ -35,7 +35,7 @@
     private TableLayout mTable;
 
     public AddColumnTest() {
-        super("com.android.frameworktest", AddColumn.class);
+        super("com.android.frameworks.coretests", AddColumn.class);
     }
 
     @Override

core/tests/coretests/src/android/widget/layout/table/CellSpan.java

diff --git a/tests/FrameworkTest/src/com/android/frameworktest/layout/table/CellSpan.java b/core/tests/coretests/src/android/widget/layout/table/CellSpan.java
similarity index 91%
rename from tests/FrameworkTest/src/com/android/frameworktest/layout/table/CellSpan.java
rename to core/tests/coretests/src/android/widget/layout/table/CellSpan.java
index 243efc7..d91cf56 100644
--- a/tests/FrameworkTest/src/com/android/frameworktest/layout/table/CellSpan.java
+++ b/core/tests/coretests/src/android/widget/layout/table/CellSpan.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.layout.table;
+package android.widget.layout.table;
 
-import com.android.frameworktest.R;
+import com.android.frameworks.coretests.R;
 
 import android.app.Activity;
 import android.os.Bundle;

core/tests/coretests/src/android/widget/layout/table/CellSpanTest.java

diff --git a/tests/FrameworkTest/tests/src/com/android/frameworktest/layout/table/CellSpanTest.java b/core/tests/coretests/src/android/widget/layout/table/CellSpanTest.java
similarity index 90%
rename from tests/FrameworkTest/tests/src/com/android/frameworktest/layout/table/CellSpanTest.java
rename to core/tests/coretests/src/android/widget/layout/table/CellSpanTest.java
index 85f9c2c..331ec45 100644
--- a/tests/FrameworkTest/tests/src/com/android/frameworktest/layout/table/CellSpanTest.java
+++ b/core/tests/coretests/src/android/widget/layout/table/CellSpanTest.java
@@ -14,17 +14,17 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.layout.table;
+package android.widget.layout.table;
 
-import com.android.frameworktest.layout.table.CellSpan;
-import com.android.frameworktest.R;
+import android.widget.layout.table.CellSpan;
+import com.android.frameworks.coretests.R;
 
 import android.test.ActivityInstrumentationTestCase;
 import android.test.suitebuilder.annotation.MediumTest;
 import android.view.View;
 
 /**
- * {@link com.android.frameworktest.layout.table.CellSpan} is
+ * {@link android.widget.layout.table.CellSpan} is
  * setup to exercise tables in which cells use spanning.
  */
 public class CellSpanTest extends ActivityInstrumentationTestCase<CellSpan> {
@@ -36,7 +36,7 @@
     private View mSpan;
 
     public CellSpanTest() {
-        super("com.android.frameworktest", CellSpan.class);
+        super("com.android.frameworks.coretests", CellSpan.class);
     }
 
     @Override

core/tests/coretests/src/android/widget/layout/table/FixedWidth.java

diff --git a/tests/FrameworkTest/src/com/android/frameworktest/layout/table/FixedWidth.java b/core/tests/coretests/src/android/widget/layout/table/FixedWidth.java
similarity index 91%
rename from tests/FrameworkTest/src/com/android/frameworktest/layout/table/FixedWidth.java
rename to core/tests/coretests/src/android/widget/layout/table/FixedWidth.java
index 2e2defc..435815a4 100644
--- a/tests/FrameworkTest/src/com/android/frameworktest/layout/table/FixedWidth.java
+++ b/core/tests/coretests/src/android/widget/layout/table/FixedWidth.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.layout.table;
+package android.widget.layout.table;
 
-import com.android.frameworktest.R;
+import com.android.frameworks.coretests.R;
 
 import android.app.Activity;
 import android.os.Bundle;

core/tests/coretests/src/android/widget/layout/table/FixedWidthTest.java

diff --git a/tests/FrameworkTest/tests/src/com/android/frameworktest/layout/table/FixedWidthTest.java b/core/tests/coretests/src/android/widget/layout/table/FixedWidthTest.java
similarity index 88%
rename from tests/FrameworkTest/tests/src/com/android/frameworktest/layout/table/FixedWidthTest.java
rename to core/tests/coretests/src/android/widget/layout/table/FixedWidthTest.java
index 3ca03b7..b20ec84 100644
--- a/tests/FrameworkTest/tests/src/com/android/frameworktest/layout/table/FixedWidthTest.java
+++ b/core/tests/coretests/src/android/widget/layout/table/FixedWidthTest.java
@@ -14,17 +14,17 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.layout.table;
+package android.widget.layout.table;
 
-import com.android.frameworktest.layout.table.FixedWidth;
-import com.android.frameworktest.R;
+import android.widget.layout.table.FixedWidth;
+import com.android.frameworks.coretests.R;
 
 import android.test.ActivityInstrumentationTestCase;
 import android.test.suitebuilder.annotation.MediumTest;
 import android.view.View;
 
 /**
- * {@link com.android.frameworktest.layout.table.FixedWidth} is
+ * {@link android.widget.layout.table.FixedWidth} is
  * setup to exercise tables in which cells use fixed width and height.
  */
 public class FixedWidthTest extends ActivityInstrumentationTestCase<FixedWidth> {
@@ -33,7 +33,7 @@
     private View mNonFixedWidth;
 
     public FixedWidthTest() {
-        super("com.android.frameworktest", FixedWidth.class);
+        super("com.android.frameworks.coretests", FixedWidth.class);
     }
 
     @Override

core/tests/coretests/src/android/widget/layout/table/HorizontalGravity.java

diff --git a/tests/FrameworkTest/src/com/android/frameworktest/layout/table/HorizontalGravity.java b/core/tests/coretests/src/android/widget/layout/table/HorizontalGravity.java
similarity index 91%
rename from tests/FrameworkTest/src/com/android/frameworktest/layout/table/HorizontalGravity.java
rename to core/tests/coretests/src/android/widget/layout/table/HorizontalGravity.java
index fdafa12..1444f60f 100644
--- a/tests/FrameworkTest/src/com/android/frameworktest/layout/table/HorizontalGravity.java
+++ b/core/tests/coretests/src/android/widget/layout/table/HorizontalGravity.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.layout.table;
+package android.widget.layout.table;
 
-import com.android.frameworktest.R;
+import com.android.frameworks.coretests.R;
 
 import android.app.Activity;
 import android.os.Bundle;

core/tests/coretests/src/android/widget/layout/table/HorizontalGravityTest.java

diff --git a/tests/FrameworkTest/tests/src/com/android/frameworktest/layout/table/HorizontalGravityTest.java b/core/tests/coretests/src/android/widget/layout/table/HorizontalGravityTest.java
similarity index 87%
rename from tests/FrameworkTest/tests/src/com/android/frameworktest/layout/table/HorizontalGravityTest.java
rename to core/tests/coretests/src/android/widget/layout/table/HorizontalGravityTest.java
index 1355cb3..964df82 100644
--- a/tests/FrameworkTest/tests/src/com/android/frameworktest/layout/table/HorizontalGravityTest.java
+++ b/core/tests/coretests/src/android/widget/layout/table/HorizontalGravityTest.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.layout.table;
+package android.widget.layout.table;
 
-import com.android.frameworktest.layout.table.HorizontalGravity;
-import com.android.frameworktest.R;
+import android.widget.layout.table.HorizontalGravity;
+import com.android.frameworks.coretests.R;
 
 import android.test.ActivityInstrumentationTestCase;
 import android.test.suitebuilder.annotation.MediumTest;
@@ -25,7 +25,7 @@
 import android.view.View;
 
 /**
- * {@link com.android.frameworktest.layout.table.HorizontalGravity} is
+ * {@link android.widget.layout.table.HorizontalGravity} is
  * setup to exercise tables in which cells use horizontal gravity.
  */
 public class HorizontalGravityTest extends ActivityInstrumentationTestCase<HorizontalGravity> {
@@ -35,7 +35,7 @@
     private View mLeft;
 
     public HorizontalGravityTest() {
-        super("com.android.frameworktest", HorizontalGravity.class);
+        super("com.android.frameworks.coretests", HorizontalGravity.class);
     }
 
     @Override

core/tests/coretests/src/android/widget/layout/table/VerticalGravity.java

diff --git a/tests/FrameworkTest/src/com/android/frameworktest/layout/table/VerticalGravity.java b/core/tests/coretests/src/android/widget/layout/table/VerticalGravity.java
similarity index 91%
rename from tests/FrameworkTest/src/com/android/frameworktest/layout/table/VerticalGravity.java
rename to core/tests/coretests/src/android/widget/layout/table/VerticalGravity.java
index 1f161d9..4fdb378 100644
--- a/tests/FrameworkTest/src/com/android/frameworktest/layout/table/VerticalGravity.java
+++ b/core/tests/coretests/src/android/widget/layout/table/VerticalGravity.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.layout.table;
+package android.widget.layout.table;
 
-import com.android.frameworktest.R;
+import com.android.frameworks.coretests.R;
 
 import android.app.Activity;
 import android.os.Bundle;

core/tests/coretests/src/android/widget/layout/table/VerticalGravityTest.java

diff --git a/tests/FrameworkTest/tests/src/com/android/frameworktest/layout/table/VerticalGravityTest.java b/core/tests/coretests/src/android/widget/layout/table/VerticalGravityTest.java
similarity index 89%
rename from tests/FrameworkTest/tests/src/com/android/frameworktest/layout/table/VerticalGravityTest.java
rename to core/tests/coretests/src/android/widget/layout/table/VerticalGravityTest.java
index d731243..1d6be3f 100644
--- a/tests/FrameworkTest/tests/src/com/android/frameworktest/layout/table/VerticalGravityTest.java
+++ b/core/tests/coretests/src/android/widget/layout/table/VerticalGravityTest.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.layout.table;
+package android.widget.layout.table;
 
-import com.android.frameworktest.layout.table.VerticalGravity;
-import com.android.frameworktest.R;
+import android.widget.layout.table.VerticalGravity;
+import com.android.frameworks.coretests.R;
 
 import android.test.ActivityInstrumentationTestCase;
 import android.test.suitebuilder.annotation.MediumTest;
@@ -26,7 +26,7 @@
 import android.view.View;
 
 /**
- * {@link com.android.frameworktest.layout.table.VerticalGravity} is
+ * {@link android.widget.layout.table.VerticalGravity} is
  * setup to exercise tables in which cells use vertical gravity.
  */
 public class VerticalGravityTest extends ActivityInstrumentationTestCase<VerticalGravity> {
@@ -38,7 +38,7 @@
     private View mBottom;
 
     public VerticalGravityTest() {
-        super("com.android.frameworktest", VerticalGravity.class);
+        super("com.android.frameworks.coretests", VerticalGravity.class);
     }
 
     @Override

core/tests/coretests/src/android/widget/layout/table/Weight.java

diff --git a/tests/FrameworkTest/src/com/android/frameworktest/layout/table/Weight.java b/core/tests/coretests/src/android/widget/layout/table/Weight.java
similarity index 91%
rename from tests/FrameworkTest/src/com/android/frameworktest/layout/table/Weight.java
rename to core/tests/coretests/src/android/widget/layout/table/Weight.java
index 4c3835f..6d4d51d 100644
--- a/tests/FrameworkTest/src/com/android/frameworktest/layout/table/Weight.java
+++ b/core/tests/coretests/src/android/widget/layout/table/Weight.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.layout.table;
+package android.widget.layout.table;
 
-import com.android.frameworktest.R;
+import com.android.frameworks.coretests.R;
 
 import android.app.Activity;
 import android.os.Bundle;

core/tests/coretests/src/android/widget/layout/table/WeightTest.java

diff --git a/tests/FrameworkTest/tests/src/com/android/frameworktest/layout/table/WeightTest.java b/core/tests/coretests/src/android/widget/layout/table/WeightTest.java
similarity index 86%
rename from tests/FrameworkTest/tests/src/com/android/frameworktest/layout/table/WeightTest.java
rename to core/tests/coretests/src/android/widget/layout/table/WeightTest.java
index 9e20686..b665573 100644
--- a/tests/FrameworkTest/tests/src/com/android/frameworktest/layout/table/WeightTest.java
+++ b/core/tests/coretests/src/android/widget/layout/table/WeightTest.java
@@ -14,17 +14,17 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.layout.table;
+package android.widget.layout.table;
 
-import com.android.frameworktest.layout.table.Weight;
-import com.android.frameworktest.R;
+import android.widget.layout.table.Weight;
+import com.android.frameworks.coretests.R;
 
 import android.test.ActivityInstrumentationTestCase;
 import android.test.suitebuilder.annotation.MediumTest;
 import android.view.View;
 
 /**
- * {@link com.android.frameworktest.layout.table.Weight} is
+ * {@link android.widget.layout.table.Weight} is
  * setup to exercise tables in which cells use a weight.
  */
 public class WeightTest extends ActivityInstrumentationTestCase<Weight> {
@@ -34,7 +34,7 @@
     private View mRow;
 
     public WeightTest() {
-        super("com.android.frameworktest", Weight.class);
+        super("com.android.frameworks.coretests", Weight.class);
     }
 
     @Override

core/tests/coretests/src/android/widget/listview/AdjacentListsWithAdjacentISVsInside.java

diff --git a/tests/FrameworkTest/src/com/android/frameworktest/listview/AdjacentListsWithAdjacentISVsInside.java b/core/tests/coretests/src/android/widget/listview/AdjacentListsWithAdjacentISVsInside.java
similarity index 97%
rename from tests/FrameworkTest/src/com/android/frameworktest/listview/AdjacentListsWithAdjacentISVsInside.java
rename to core/tests/coretests/src/android/widget/listview/AdjacentListsWithAdjacentISVsInside.java
index 5c38ef0..98fbed3 100644
--- a/tests/FrameworkTest/src/com/android/frameworktest/listview/AdjacentListsWithAdjacentISVsInside.java
+++ b/core/tests/coretests/src/android/widget/listview/AdjacentListsWithAdjacentISVsInside.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.listview;
+package android.widget.listview;
 
-import com.android.frameworktest.util.InternalSelectionView;
+import android.util.InternalSelectionView;
 
 import android.app.Activity;
 import android.os.Bundle;

core/tests/coretests/src/android/widget/listview/ListBottomGravity.java

diff --git a/tests/FrameworkTest/src/com/android/frameworktest/listview/ListBottomGravity.java b/core/tests/coretests/src/android/widget/listview/ListBottomGravity.java
similarity index 91%
rename from tests/FrameworkTest/src/com/android/frameworktest/listview/ListBottomGravity.java
rename to core/tests/coretests/src/android/widget/listview/ListBottomGravity.java
index e729d52..a386ebd 100644
--- a/tests/FrameworkTest/src/com/android/frameworktest/listview/ListBottomGravity.java
+++ b/core/tests/coretests/src/android/widget/listview/ListBottomGravity.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.listview;
+package android.widget.listview;
 
 import android.view.Gravity;
 
-import com.android.frameworktest.util.ListScenario;
+import android.util.ListScenario;
 
 /**
  * Basic bottom gravity scenario, nothing fancy. Items do not

core/tests/coretests/src/android/widget/listview/ListBottomGravityMany.java

diff --git a/tests/FrameworkTest/src/com/android/frameworktest/listview/ListBottomGravityMany.java b/core/tests/coretests/src/android/widget/listview/ListBottomGravityMany.java
similarity index 91%
rename from tests/FrameworkTest/src/com/android/frameworktest/listview/ListBottomGravityMany.java
rename to core/tests/coretests/src/android/widget/listview/ListBottomGravityMany.java
index 1225b9a..519816c 100644
--- a/tests/FrameworkTest/src/com/android/frameworktest/listview/ListBottomGravityMany.java
+++ b/core/tests/coretests/src/android/widget/listview/ListBottomGravityMany.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.listview;
+package android.widget.listview;
 
 import android.view.Gravity;
 
-import com.android.frameworktest.util.ListScenario;
+import android.util.ListScenario;
 
 /**
  * Basic bottom gravity scenario, nothing fancy. There are

core/tests/coretests/src/android/widget/listview/ListBottomGravityManyTest.java

diff --git a/tests/FrameworkTest/tests/src/com/android/frameworktest/listview/ListBottomGravityManyTest.java b/core/tests/coretests/src/android/widget/listview/ListBottomGravityManyTest.java
similarity index 88%
rename from tests/FrameworkTest/tests/src/com/android/frameworktest/listview/ListBottomGravityManyTest.java
rename to core/tests/coretests/src/android/widget/listview/ListBottomGravityManyTest.java
index d36e343..e1171eb 100644
--- a/tests/FrameworkTest/tests/src/com/android/frameworktest/listview/ListBottomGravityManyTest.java
+++ b/core/tests/coretests/src/android/widget/listview/ListBottomGravityManyTest.java
@@ -14,20 +14,20 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.listview;
+package android.widget.listview;
 
 import android.test.ActivityInstrumentationTestCase;
 import android.test.suitebuilder.annotation.MediumTest;
 import android.widget.ListView;
 
-import com.android.frameworktest.listview.ListBottomGravityMany;
+import android.widget.listview.ListBottomGravityMany;
 
 public class ListBottomGravityManyTest extends ActivityInstrumentationTestCase<ListBottomGravityMany> {
     private ListBottomGravityMany mActivity;
     private ListView mListView;
 
     public ListBottomGravityManyTest() {
-        super("com.android.frameworktest", ListBottomGravityMany.class);
+        super("com.android.frameworks.coretests", ListBottomGravityMany.class);
     }
 
     @Override

core/tests/coretests/src/android/widget/listview/ListBottomGravityTest.java

diff --git a/tests/FrameworkTest/tests/src/com/android/frameworktest/listview/ListBottomGravityTest.java b/core/tests/coretests/src/android/widget/listview/ListBottomGravityTest.java
similarity index 88%
rename from tests/FrameworkTest/tests/src/com/android/frameworktest/listview/ListBottomGravityTest.java
rename to core/tests/coretests/src/android/widget/listview/ListBottomGravityTest.java
index 79556cf..c595f62 100644
--- a/tests/FrameworkTest/tests/src/com/android/frameworktest/listview/ListBottomGravityTest.java
+++ b/core/tests/coretests/src/android/widget/listview/ListBottomGravityTest.java
@@ -14,20 +14,20 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.listview;
+package android.widget.listview;
 
 import android.test.ActivityInstrumentationTestCase;
 import android.test.suitebuilder.annotation.MediumTest;
 import android.widget.ListView;
 
-import com.android.frameworktest.listview.ListBottomGravity;
+import android.widget.listview.ListBottomGravity;
 
 public class ListBottomGravityTest extends ActivityInstrumentationTestCase<ListBottomGravity> {
     private ListBottomGravity mActivity;
     private ListView mListView;
 
     public ListBottomGravityTest() {
-        super("com.android.frameworktest", ListBottomGravity.class);
+        super("com.android.frameworks.coretests", ListBottomGravity.class);
     }
 
     @Override

core/tests/coretests/src/android/widget/listview/ListButtonsDiagonalAcrossItems.java

diff --git a/tests/FrameworkTest/src/com/android/frameworktest/listview/ListButtonsDiagonalAcrossItems.java b/core/tests/coretests/src/android/widget/listview/ListButtonsDiagonalAcrossItems.java
similarity index 88%
rename from tests/FrameworkTest/src/com/android/frameworktest/listview/ListButtonsDiagonalAcrossItems.java
rename to core/tests/coretests/src/android/widget/listview/ListButtonsDiagonalAcrossItems.java
index bda2cd1..bbed73c 100644
--- a/tests/FrameworkTest/src/com/android/frameworktest/listview/ListButtonsDiagonalAcrossItems.java
+++ b/core/tests/coretests/src/android/widget/listview/ListButtonsDiagonalAcrossItems.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.listview;
+package android.widget.listview;
 
-import com.android.frameworktest.util.ListItemFactory;
-import static com.android.frameworktest.util.ListItemFactory.Slot;
-import com.android.frameworktest.util.ListScenario;
+import android.util.ListItemFactory;
+import static android.util.ListItemFactory.Slot;
+import android.util.ListScenario;
 
 import android.view.View;
 import android.view.ViewGroup;

core/tests/coretests/src/android/widget/listview/ListDividers.java

diff --git a/tests/FrameworkTest/src/com/android/frameworktest/listview/ListDividers.java b/core/tests/coretests/src/android/widget/listview/ListDividers.java
similarity index 94%
rename from tests/FrameworkTest/src/com/android/frameworktest/listview/ListDividers.java
rename to core/tests/coretests/src/android/widget/listview/ListDividers.java
index 62045d8..3928c03 100644
--- a/tests/FrameworkTest/src/com/android/frameworktest/listview/ListDividers.java
+++ b/core/tests/coretests/src/android/widget/listview/ListDividers.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.listview;
+package android.widget.listview;
 
 import android.app.Activity;
 import android.os.Bundle;
 import android.widget.ArrayAdapter;
 import android.widget.ListView;
 
-import com.android.frameworktest.R;
+import com.android.frameworks.coretests.R;
 
 /**
  * Exercises a list width dividers and padding.

core/tests/coretests/src/android/widget/listview/ListEmptyViewTest.java

diff --git a/tests/FrameworkTest/tests/src/com/android/frameworktest/listview/ListEmptyViewTest.java b/core/tests/coretests/src/android/widget/listview/ListEmptyViewTest.java
similarity index 97%
rename from tests/FrameworkTest/tests/src/com/android/frameworktest/listview/ListEmptyViewTest.java
rename to core/tests/coretests/src/android/widget/listview/ListEmptyViewTest.java
index ca12154..258d3ef 100644
--- a/tests/FrameworkTest/tests/src/com/android/frameworktest/listview/ListEmptyViewTest.java
+++ b/core/tests/coretests/src/android/widget/listview/ListEmptyViewTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.listview;
+package android.widget.listview;
 
 import android.app.Instrumentation;
 import android.content.Intent;
@@ -31,7 +31,7 @@
 
 
     public ListEmptyViewTest() {
-        super("com.android.frameworktest", ListWithEmptyView.class);
+        super("com.android.frameworks.coretests", ListWithEmptyView.class);
     }
 
     @Override

core/tests/coretests/src/android/widget/listview/ListEndingWithMultipleSeparators.java

diff --git a/tests/FrameworkTest/src/com/android/frameworktest/listview/ListEndingWithMultipleSeparators.java b/core/tests/coretests/src/android/widget/listview/ListEndingWithMultipleSeparators.java
similarity index 90%
rename from tests/FrameworkTest/src/com/android/frameworktest/listview/ListEndingWithMultipleSeparators.java
rename to core/tests/coretests/src/android/widget/listview/ListEndingWithMultipleSeparators.java
index 4ab1eef6..85f9924 100644
--- a/tests/FrameworkTest/src/com/android/frameworktest/listview/ListEndingWithMultipleSeparators.java
+++ b/core/tests/coretests/src/android/widget/listview/ListEndingWithMultipleSeparators.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.listview;
+package android.widget.listview;
 
-import com.android.frameworktest.util.ListScenario;
+import android.util.ListScenario;
 
 public class ListEndingWithMultipleSeparators extends ListScenario {
 

core/tests/coretests/src/android/widget/listview/ListFilter.java

diff --git a/tests/FrameworkTest/src/com/android/frameworktest/listview/ListFilter.java b/core/tests/coretests/src/android/widget/listview/ListFilter.java
similarity index 98%
rename from tests/FrameworkTest/src/com/android/frameworktest/listview/ListFilter.java
rename to core/tests/coretests/src/android/widget/listview/ListFilter.java
index b164d86..9e9d1b0 100644
--- a/tests/FrameworkTest/src/com/android/frameworktest/listview/ListFilter.java
+++ b/core/tests/coretests/src/android/widget/listview/ListFilter.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.listview;
+package android.widget.listview;
 
 import android.app.ListActivity;
 import android.os.Bundle;
@@ -23,7 +23,7 @@
 import android.widget.ArrayAdapter;
 import android.widget.Button;
 
-import com.android.frameworktest.R;
+import com.android.frameworks.coretests.R;
 
 
 /**

core/tests/coretests/src/android/widget/listview/ListFocusableTest.java

diff --git a/tests/FrameworkTest/tests/src/com/android/frameworktest/listview/ListFocusableTest.java b/core/tests/coretests/src/android/widget/listview/ListFocusableTest.java
similarity index 97%
rename from tests/FrameworkTest/tests/src/com/android/frameworktest/listview/ListFocusableTest.java
rename to core/tests/coretests/src/android/widget/listview/ListFocusableTest.java
index 1bb1f1c..bf18a13 100644
--- a/tests/FrameworkTest/tests/src/com/android/frameworktest/listview/ListFocusableTest.java
+++ b/core/tests/coretests/src/android/widget/listview/ListFocusableTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.listview;
+package android.widget.listview;
 
 import android.test.ActivityInstrumentationTestCase;
 import android.test.suitebuilder.annotation.MediumTest;
@@ -27,7 +27,7 @@
     private ListView mListView;
 
     public ListFocusableTest() {
-        super("com.android.frameworktest", ListTopGravity.class);
+        super("com.android.frameworks.coretests", ListTopGravity.class);
     }
 
     @Override

core/tests/coretests/src/android/widget/listview/ListGetSelectedView.java

diff --git a/tests/FrameworkTest/src/com/android/frameworktest/listview/ListGetSelectedView.java b/core/tests/coretests/src/android/widget/listview/ListGetSelectedView.java
similarity index 90%
rename from tests/FrameworkTest/src/com/android/frameworktest/listview/ListGetSelectedView.java
rename to core/tests/coretests/src/android/widget/listview/ListGetSelectedView.java
index 28fa21a..5639195 100644
--- a/tests/FrameworkTest/src/com/android/frameworktest/listview/ListGetSelectedView.java
+++ b/core/tests/coretests/src/android/widget/listview/ListGetSelectedView.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.listview;
+package android.widget.listview;
 
-import com.android.frameworktest.util.ListScenario;
+import android.util.ListScenario;
 
 /**
  * Basic top gravity scenario. This test is made to check that getSelectedView() will return

core/tests/coretests/src/android/widget/listview/ListHeterogeneous.java

diff --git a/tests/FrameworkTest/src/com/android/frameworktest/listview/ListHeterogeneous.java b/core/tests/coretests/src/android/widget/listview/ListHeterogeneous.java
similarity index 93%
rename from tests/FrameworkTest/src/com/android/frameworktest/listview/ListHeterogeneous.java
rename to core/tests/coretests/src/android/widget/listview/ListHeterogeneous.java
index 93abd78..1f59c30 100644
--- a/tests/FrameworkTest/src/com/android/frameworktest/listview/ListHeterogeneous.java
+++ b/core/tests/coretests/src/android/widget/listview/ListHeterogeneous.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.listview;
+package android.widget.listview;
 
 import android.view.View;
 import android.view.ViewGroup;
 
-import com.android.frameworktest.util.ListItemFactory;
-import com.android.frameworktest.util.ListScenario;
+import android.util.ListItemFactory;
+import android.util.ListScenario;
 
 /**
  * List that has different view types

core/tests/coretests/src/android/widget/listview/ListHeterogeneousTest.java

diff --git a/tests/FrameworkTest/tests/src/com/android/frameworktest/listview/ListHeterogeneousTest.java b/core/tests/coretests/src/android/widget/listview/ListHeterogeneousTest.java
similarity index 92%
rename from tests/FrameworkTest/tests/src/com/android/frameworktest/listview/ListHeterogeneousTest.java
rename to core/tests/coretests/src/android/widget/listview/ListHeterogeneousTest.java
index 0e48993..01b39db 100644
--- a/tests/FrameworkTest/tests/src/com/android/frameworktest/listview/ListHeterogeneousTest.java
+++ b/core/tests/coretests/src/android/widget/listview/ListHeterogeneousTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.listview;
+package android.widget.listview;
 
 import android.app.Instrumentation;
 import android.test.ActivityInstrumentationTestCase;
@@ -23,7 +23,7 @@
 import android.view.KeyEvent;
 import android.widget.ListView;
 
-import com.android.frameworktest.listview.ListHeterogeneous;
+import android.widget.listview.ListHeterogeneous;
 
 public class ListHeterogeneousTest extends ActivityInstrumentationTestCase<ListHeterogeneous> {
     private ListHeterogeneous mActivity;
@@ -31,7 +31,7 @@
 
 
     public ListHeterogeneousTest() {
-        super("com.android.frameworktest", ListHeterogeneous.class);
+        super("com.android.frameworks.coretests", ListHeterogeneous.class);
     }
 
     @Override

core/tests/coretests/src/android/widget/listview/ListHorizontalFocusWithinItemWins.java

diff --git a/tests/FrameworkTest/src/com/android/frameworktest/listview/ListHorizontalFocusWithinItemWins.java b/core/tests/coretests/src/android/widget/listview/ListHorizontalFocusWithinItemWins.java
similarity index 89%
rename from tests/FrameworkTest/src/com/android/frameworktest/listview/ListHorizontalFocusWithinItemWins.java
rename to core/tests/coretests/src/android/widget/listview/ListHorizontalFocusWithinItemWins.java
index c5e1e97..2ff65de 100644
--- a/tests/FrameworkTest/src/com/android/frameworktest/listview/ListHorizontalFocusWithinItemWins.java
+++ b/core/tests/coretests/src/android/widget/listview/ListHorizontalFocusWithinItemWins.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.listview;
+package android.widget.listview;
 
-import com.android.frameworktest.util.ListItemFactory;
-import static com.android.frameworktest.util.ListItemFactory.Slot;
-import com.android.frameworktest.util.ListScenario;
+import android.util.ListItemFactory;
+import static android.util.ListItemFactory.Slot;
+import android.util.ListScenario;
 
 import android.content.Context;
 import android.view.View;

core/tests/coretests/src/android/widget/listview/ListInHorizontal.java

diff --git a/tests/FrameworkTest/src/com/android/frameworktest/listview/ListInHorizontal.java b/core/tests/coretests/src/android/widget/listview/ListInHorizontal.java
similarity index 94%
rename from tests/FrameworkTest/src/com/android/frameworktest/listview/ListInHorizontal.java
rename to core/tests/coretests/src/android/widget/listview/ListInHorizontal.java
index 2128746..5f09ff6 100644
--- a/tests/FrameworkTest/src/com/android/frameworktest/listview/ListInHorizontal.java
+++ b/core/tests/coretests/src/android/widget/listview/ListInHorizontal.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.listview;
+package android.widget.listview;
 
 import android.app.Activity;
 import android.os.Bundle;
@@ -24,7 +24,7 @@
 import android.widget.TextView;
 import android.widget.ListView;
 
-import com.android.frameworktest.R;
+import com.android.frameworks.coretests.R;
 
 /**
  * Exercises a list in a horizontal linear layout

core/tests/coretests/src/android/widget/listview/ListInHorizontalTest.java

diff --git a/tests/FrameworkTest/tests/src/com/android/frameworktest/listview/ListInHorizontalTest.java b/core/tests/coretests/src/android/widget/listview/ListInHorizontalTest.java
similarity index 88%
rename from tests/FrameworkTest/tests/src/com/android/frameworktest/listview/ListInHorizontalTest.java
rename to core/tests/coretests/src/android/widget/listview/ListInHorizontalTest.java
index 1432576..3643f79 100644
--- a/tests/FrameworkTest/tests/src/com/android/frameworktest/listview/ListInHorizontalTest.java
+++ b/core/tests/coretests/src/android/widget/listview/ListInHorizontalTest.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.listview;
+package android.widget.listview;
 
-import com.android.frameworktest.listview.ListInHorizontal;
+import android.widget.listview.ListInHorizontal;
 
 public class ListInHorizontalTest extends ListUnspecifiedMeasure<ListInHorizontal> {
     public ListInHorizontalTest() {

core/tests/coretests/src/android/widget/listview/ListInVertical.java

diff --git a/tests/FrameworkTest/src/com/android/frameworktest/listview/ListInVertical.java b/core/tests/coretests/src/android/widget/listview/ListInVertical.java
similarity index 94%
rename from tests/FrameworkTest/src/com/android/frameworktest/listview/ListInVertical.java
rename to core/tests/coretests/src/android/widget/listview/ListInVertical.java
index f4c93c8..3b4885a 100644
--- a/tests/FrameworkTest/src/com/android/frameworktest/listview/ListInVertical.java
+++ b/core/tests/coretests/src/android/widget/listview/ListInVertical.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.listview;
+package android.widget.listview;
 
 import android.app.Activity;
 import android.os.Bundle;
@@ -24,7 +24,7 @@
 import android.widget.TextView;
 import android.widget.ListView;
 
-import com.android.frameworktest.R;
+import com.android.frameworks.coretests.R;
 
 /**
  * Exercises a list in a vertical linear layout

core/tests/coretests/src/android/widget/listview/ListInVerticalTest.java

diff --git a/tests/FrameworkTest/tests/src/com/android/frameworktest/listview/ListInVerticalTest.java b/core/tests/coretests/src/android/widget/listview/ListInVerticalTest.java
similarity index 88%
rename from tests/FrameworkTest/tests/src/com/android/frameworktest/listview/ListInVerticalTest.java
rename to core/tests/coretests/src/android/widget/listview/ListInVerticalTest.java
index 73078b9..8586429 100644
--- a/tests/FrameworkTest/tests/src/com/android/frameworktest/listview/ListInVerticalTest.java
+++ b/core/tests/coretests/src/android/widget/listview/ListInVerticalTest.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.listview;
+package android.widget.listview;
 
-import com.android.frameworktest.listview.ListInVertical;
+import android.widget.listview.ListInVertical;
 
 public class ListInVerticalTest extends ListUnspecifiedMeasure<ListInVertical> {
     public ListInVerticalTest() {

core/tests/coretests/src/android/widget/listview/ListInterleaveFocusables.java

diff --git a/tests/FrameworkTest/src/com/android/frameworktest/listview/ListInterleaveFocusables.java b/core/tests/coretests/src/android/widget/listview/ListInterleaveFocusables.java
similarity index 91%
rename from tests/FrameworkTest/src/com/android/frameworktest/listview/ListInterleaveFocusables.java
rename to core/tests/coretests/src/android/widget/listview/ListInterleaveFocusables.java
index e45297e..d5da28e 100644
--- a/tests/FrameworkTest/src/com/android/frameworktest/listview/ListInterleaveFocusables.java
+++ b/core/tests/coretests/src/android/widget/listview/ListInterleaveFocusables.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.listview;
+package android.widget.listview;
 
 import android.view.View;
  import android.view.ViewGroup;
  import com.google.android.collect.Sets;
- import com.android.frameworktest.util.ListScenario;
- import com.android.frameworktest.util.ListItemFactory;
+ import android.util.ListScenario;
+ import android.util.ListItemFactory;
 
  import java.util.Set;
 

core/tests/coretests/src/android/widget/listview/ListItemFocusableAboveUnfocusable.java

diff --git a/tests/FrameworkTest/src/com/android/frameworktest/listview/ListItemFocusableAboveUnfocusable.java b/core/tests/coretests/src/android/widget/listview/ListItemFocusableAboveUnfocusable.java
similarity index 90%
rename from tests/FrameworkTest/src/com/android/frameworktest/listview/ListItemFocusableAboveUnfocusable.java
rename to core/tests/coretests/src/android/widget/listview/ListItemFocusableAboveUnfocusable.java
index e14da5b..f7c01b1 100644
--- a/tests/FrameworkTest/src/com/android/frameworktest/listview/ListItemFocusableAboveUnfocusable.java
+++ b/core/tests/coretests/src/android/widget/listview/ListItemFocusableAboveUnfocusable.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.listview;
+package android.widget.listview;
 
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Button;
 import android.widget.TextView;
-import com.android.frameworktest.util.ListItemFactory;
-import com.android.frameworktest.util.ListScenario;
+import android.util.ListItemFactory;
+import android.util.ListScenario;
 
 /**
  * A list where the items may befocusable, but the second item isn't actually focusabe.

core/tests/coretests/src/android/widget/listview/ListItemFocusablesClose.java

diff --git a/tests/FrameworkTest/src/com/android/frameworktest/listview/ListItemFocusablesClose.java b/core/tests/coretests/src/android/widget/listview/ListItemFocusablesClose.java
similarity index 91%
rename from tests/FrameworkTest/src/com/android/frameworktest/listview/ListItemFocusablesClose.java
rename to core/tests/coretests/src/android/widget/listview/ListItemFocusablesClose.java
index e20f633..b529b2e 100644
--- a/tests/FrameworkTest/src/com/android/frameworktest/listview/ListItemFocusablesClose.java
+++ b/core/tests/coretests/src/android/widget/listview/ListItemFocusablesClose.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.listview;
+package android.widget.listview;
 
-import com.android.frameworktest.util.ListScenario;
-import com.android.frameworktest.util.ListItemFactory;
+import android.util.ListScenario;
+import android.util.ListItemFactory;
 import android.view.View;
 import android.view.ViewGroup;
 

core/tests/coretests/src/android/widget/listview/ListItemFocusablesFarApart.java

diff --git a/tests/FrameworkTest/src/com/android/frameworktest/listview/ListItemFocusablesFarApart.java b/core/tests/coretests/src/android/widget/listview/ListItemFocusablesFarApart.java
similarity index 89%
rename from tests/FrameworkTest/src/com/android/frameworktest/listview/ListItemFocusablesFarApart.java
rename to core/tests/coretests/src/android/widget/listview/ListItemFocusablesFarApart.java
index e974478..59987ec 100644
--- a/tests/FrameworkTest/src/com/android/frameworktest/listview/ListItemFocusablesFarApart.java
+++ b/core/tests/coretests/src/android/widget/listview/ListItemFocusablesFarApart.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.listview;
+package android.widget.listview;
 
 import android.view.View;
 import android.view.ViewGroup;
-import com.android.frameworktest.util.ListItemFactory;
-import com.android.frameworktest.util.ListScenario;
+import android.util.ListItemFactory;
+import android.util.ListScenario;
 
 /**
  * A list where each item is tall with buttons that are farther apart than the screen

core/tests/coretests/src/android/widget/listview/ListItemISVAndButton.java

diff --git a/tests/FrameworkTest/src/com/android/frameworktest/listview/ListItemISVAndButton.java b/core/tests/coretests/src/android/widget/listview/ListItemISVAndButton.java
similarity index 93%
rename from tests/FrameworkTest/src/com/android/frameworktest/listview/ListItemISVAndButton.java
rename to core/tests/coretests/src/android/widget/listview/ListItemISVAndButton.java
index ceb94b7..ea2c5f2 100644
--- a/tests/FrameworkTest/src/com/android/frameworktest/listview/ListItemISVAndButton.java
+++ b/core/tests/coretests/src/android/widget/listview/ListItemISVAndButton.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.listview;
+package android.widget.listview;
 
 import android.content.Context;
 import android.view.View;
@@ -22,8 +22,8 @@
 import android.widget.Button;
 import android.widget.LinearLayout;
 import android.widget.TextView;
-import com.android.frameworktest.util.InternalSelectionView;
-import com.android.frameworktest.util.ListScenario;
+import android.util.InternalSelectionView;
+import android.util.ListScenario;
 
 /**
  * Each item is an internal selection view, a button, and some filler

core/tests/coretests/src/android/widget/listview/ListItemRequestRectAboveThinFirstItemTest.java

diff --git a/tests/FrameworkTest/tests/src/com/android/frameworktest/listview/ListItemRequestRectAboveThinFirstItemTest.java b/core/tests/coretests/src/android/widget/listview/ListItemRequestRectAboveThinFirstItemTest.java
similarity index 95%
rename from tests/FrameworkTest/tests/src/com/android/frameworktest/listview/ListItemRequestRectAboveThinFirstItemTest.java
rename to core/tests/coretests/src/android/widget/listview/ListItemRequestRectAboveThinFirstItemTest.java
index 16c4d39..072ac6c 100644
--- a/tests/FrameworkTest/tests/src/com/android/frameworktest/listview/ListItemRequestRectAboveThinFirstItemTest.java
+++ b/core/tests/coretests/src/android/widget/listview/ListItemRequestRectAboveThinFirstItemTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.listview;
+package android.widget.listview;
 
 import android.graphics.Rect;
 import android.test.ActivityInstrumentationTestCase;
@@ -23,14 +23,14 @@
 import android.view.View;
 import android.view.KeyEvent;
 import android.widget.ListView;
-import com.android.frameworktest.listview.ListOfThinItems;
+import android.widget.listview.ListOfThinItems;
 
 public class ListItemRequestRectAboveThinFirstItemTest
         extends ActivityInstrumentationTestCase<ListOfThinItems> {
     private ListView mListView;
 
     public ListItemRequestRectAboveThinFirstItemTest() {
-        super("com.android.frameworktest", ListOfThinItems.class);
+        super("com.android.frameworks.coretests", ListOfThinItems.class);
     }
 
     protected void setUp() throws Exception {

core/tests/coretests/src/android/widget/listview/ListItemsExpandOnSelection.java

diff --git a/tests/FrameworkTest/src/com/android/frameworktest/listview/ListItemsExpandOnSelection.java b/core/tests/coretests/src/android/widget/listview/ListItemsExpandOnSelection.java
similarity index 95%
rename from tests/FrameworkTest/src/com/android/frameworktest/listview/ListItemsExpandOnSelection.java
rename to core/tests/coretests/src/android/widget/listview/ListItemsExpandOnSelection.java
index b0ad5e9..a5fe17a 100644
--- a/tests/FrameworkTest/src/com/android/frameworktest/listview/ListItemsExpandOnSelection.java
+++ b/core/tests/coretests/src/android/widget/listview/ListItemsExpandOnSelection.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.listview;
+package android.widget.listview;
 
 import android.content.Context;
 import android.view.View;
@@ -22,7 +22,7 @@
 import android.widget.AbsListView;
 import android.widget.TextView;
 
-import com.android.frameworktest.util.ListScenario;
+import android.util.ListScenario;
 
 /**
  * A list where each item expands by 1.5 when selected.

core/tests/coretests/src/android/widget/listview/ListLastItemPartiallyVisible.java

diff --git a/tests/FrameworkTest/src/com/android/frameworktest/listview/ListLastItemPartiallyVisible.java b/core/tests/coretests/src/android/widget/listview/ListLastItemPartiallyVisible.java
similarity index 90%
rename from tests/FrameworkTest/src/com/android/frameworktest/listview/ListLastItemPartiallyVisible.java
rename to core/tests/coretests/src/android/widget/listview/ListLastItemPartiallyVisible.java
index 23b76a9..d733749 100644
--- a/tests/FrameworkTest/src/com/android/frameworktest/listview/ListLastItemPartiallyVisible.java
+++ b/core/tests/coretests/src/android/widget/listview/ListLastItemPartiallyVisible.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.listview;
+package android.widget.listview;
 
-import com.android.frameworktest.util.ListScenario;
+import android.util.ListScenario;
 
 /**
  * A list where the very last item is partially visible, but still requires scrolling

core/tests/coretests/src/android/widget/listview/ListManagedCursor.java

diff --git a/tests/FrameworkTest/src/com/android/frameworktest/listview/ListManagedCursor.java b/core/tests/coretests/src/android/widget/listview/ListManagedCursor.java
similarity index 97%
rename from tests/FrameworkTest/src/com/android/frameworktest/listview/ListManagedCursor.java
rename to core/tests/coretests/src/android/widget/listview/ListManagedCursor.java
index 0cc242f..12b5ef4 100644
--- a/tests/FrameworkTest/src/com/android/frameworktest/listview/ListManagedCursor.java
+++ b/core/tests/coretests/src/android/widget/listview/ListManagedCursor.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.listview;
+package android.widget.listview;
 
 import android.app.ListActivity;
 import android.content.Intent;

core/tests/coretests/src/android/widget/listview/ListManagedCursorTest.java

diff --git a/tests/FrameworkTest/tests/src/com/android/frameworktest/listview/ListManagedCursorTest.java b/core/tests/coretests/src/android/widget/listview/ListManagedCursorTest.java
similarity index 97%
rename from tests/FrameworkTest/tests/src/com/android/frameworktest/listview/ListManagedCursorTest.java
rename to core/tests/coretests/src/android/widget/listview/ListManagedCursorTest.java
index 0251dfb..7938cba 100644
--- a/tests/FrameworkTest/tests/src/com/android/frameworktest/listview/ListManagedCursorTest.java
+++ b/core/tests/coretests/src/android/widget/listview/ListManagedCursorTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.listview;
+package android.widget.listview;
 
 import android.app.Instrumentation;
 import android.test.ActivityInstrumentationTestCase;
@@ -33,7 +33,7 @@
     private ListView mListView;
 
     public ListManagedCursorTest() {
-        super("com.android.frameworktest", ListManagedCursor.class);
+        super("com.android.frameworks.coretests", ListManagedCursor.class);
     }
 
     @Override

core/tests/coretests/src/android/widget/listview/ListOfItemsShorterThanScreen.java

diff --git a/tests/FrameworkTest/src/com/android/frameworktest/listview/ListOfItemsShorterThanScreen.java b/core/tests/coretests/src/android/widget/listview/ListOfItemsShorterThanScreen.java
similarity index 89%
rename from tests/FrameworkTest/src/com/android/frameworktest/listview/ListOfItemsShorterThanScreen.java
rename to core/tests/coretests/src/android/widget/listview/ListOfItemsShorterThanScreen.java
index 475ab31..46decfa 100644
--- a/tests/FrameworkTest/src/com/android/frameworktest/listview/ListOfItemsShorterThanScreen.java
+++ b/core/tests/coretests/src/android/widget/listview/ListOfItemsShorterThanScreen.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.listview;
+package android.widget.listview;
 
-import com.android.frameworktest.util.ListScenario;
+import android.util.ListScenario;
 
 public class ListOfItemsShorterThanScreen extends ListScenario {
 

core/tests/coretests/src/android/widget/listview/ListOfItemsTallerThanScreen.java

diff --git a/tests/FrameworkTest/src/com/android/frameworktest/listview/ListOfItemsTallerThanScreen.java b/core/tests/coretests/src/android/widget/listview/ListOfItemsTallerThanScreen.java
similarity index 89%
rename from tests/FrameworkTest/src/com/android/frameworktest/listview/ListOfItemsTallerThanScreen.java
rename to core/tests/coretests/src/android/widget/listview/ListOfItemsTallerThanScreen.java
index 0d70abf..0d88993 100644
--- a/tests/FrameworkTest/src/com/android/frameworktest/listview/ListOfItemsTallerThanScreen.java
+++ b/core/tests/coretests/src/android/widget/listview/ListOfItemsTallerThanScreen.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.listview;
+package android.widget.listview;
 
-import com.android.frameworktest.util.ListScenario;
+import android.util.ListScenario;
 
 public class ListOfItemsTallerThanScreen extends ListScenario {
 

core/tests/coretests/src/android/widget/listview/ListOfShortShortTallShortShort.java

diff --git a/tests/FrameworkTest/src/com/android/frameworktest/listview/ListOfShortShortTallShortShort.java b/core/tests/coretests/src/android/widget/listview/ListOfShortShortTallShortShort.java
similarity index 90%
rename from tests/FrameworkTest/src/com/android/frameworktest/listview/ListOfShortShortTallShortShort.java
rename to core/tests/coretests/src/android/widget/listview/ListOfShortShortTallShortShort.java
index 62c5aa7..1639aa4 100644
--- a/tests/FrameworkTest/src/com/android/frameworktest/listview/ListOfShortShortTallShortShort.java
+++ b/core/tests/coretests/src/android/widget/listview/ListOfShortShortTallShortShort.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.listview;
+package android.widget.listview;
 
-import com.android.frameworktest.util.ListScenario;
+import android.util.ListScenario;
 
 /**
  * Exposes fading in and out multiple items.

core/tests/coretests/src/android/widget/listview/ListOfShortTallShort.java

diff --git a/tests/FrameworkTest/src/com/android/frameworktest/listview/ListOfShortTallShort.java b/core/tests/coretests/src/android/widget/listview/ListOfShortTallShort.java
similarity index 90%
rename from tests/FrameworkTest/src/com/android/frameworktest/listview/ListOfShortTallShort.java
rename to core/tests/coretests/src/android/widget/listview/ListOfShortTallShort.java
index e60dee7..960e129 100644
--- a/tests/FrameworkTest/src/com/android/frameworktest/listview/ListOfShortTallShort.java
+++ b/core/tests/coretests/src/android/widget/listview/ListOfShortTallShort.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.listview;
+package android.widget.listview;
 
-import com.android.frameworktest.util.ListScenario;
+import android.util.ListScenario;
 
 /**
  * Two short items separated by one that is taller than the screen.

core/tests/coretests/src/android/widget/listview/ListOfThinItems.java

diff --git a/tests/FrameworkTest/src/com/android/frameworktest/listview/ListOfThinItems.java b/core/tests/coretests/src/android/widget/listview/ListOfThinItems.java
similarity index 90%
rename from tests/FrameworkTest/src/com/android/frameworktest/listview/ListOfThinItems.java
rename to core/tests/coretests/src/android/widget/listview/ListOfThinItems.java
index d613c9b..007479f 100644
--- a/tests/FrameworkTest/src/com/android/frameworktest/listview/ListOfThinItems.java
+++ b/core/tests/coretests/src/android/widget/listview/ListOfThinItems.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.listview;
+package android.widget.listview;
 
-import com.android.frameworktest.util.ListScenario;
+import android.util.ListScenario;
 
 public class ListOfThinItems extends ListScenario {
 

core/tests/coretests/src/android/widget/listview/ListOfTouchables.java

diff --git a/tests/FrameworkTest/src/com/android/frameworktest/listview/ListOfTouchables.java b/core/tests/coretests/src/android/widget/listview/ListOfTouchables.java
similarity index 92%
rename from tests/FrameworkTest/src/com/android/frameworktest/listview/ListOfTouchables.java
rename to core/tests/coretests/src/android/widget/listview/ListOfTouchables.java
index 0e09190..919ef69 100644
--- a/tests/FrameworkTest/src/com/android/frameworktest/listview/ListOfTouchables.java
+++ b/core/tests/coretests/src/android/widget/listview/ListOfTouchables.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.listview;
+package android.widget.listview;
 
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Button;
 
-import com.android.frameworktest.util.ListScenario;
+import android.util.ListScenario;
 
 /**
  * Each list item has two focusables that are close enough together that

core/tests/coretests/src/android/widget/listview/ListRecyclerProfiling.java

diff --git a/tests/FrameworkTest/src/com/android/frameworktest/listview/ListRecyclerProfiling.java b/core/tests/coretests/src/android/widget/listview/ListRecyclerProfiling.java
similarity index 95%
rename from tests/FrameworkTest/src/com/android/frameworktest/listview/ListRecyclerProfiling.java
rename to core/tests/coretests/src/android/widget/listview/ListRecyclerProfiling.java
index 3df3b9a..d5d7261 100644
--- a/tests/FrameworkTest/src/com/android/frameworktest/listview/ListRecyclerProfiling.java
+++ b/core/tests/coretests/src/android/widget/listview/ListRecyclerProfiling.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.listview;
+package android.widget.listview;
 
 import android.app.Activity;
 import android.os.Bundle;
@@ -24,7 +24,7 @@
 import android.view.ViewDebug;
 import android.view.View;
 
-import com.android.frameworktest.R;
+import com.android.frameworks.coretests.R;
 
 public class ListRecyclerProfiling extends Activity {
     @Override

core/tests/coretests/src/android/widget/listview/ListRetainsFocusAcrossLayoutsTest.java

diff --git a/tests/FrameworkTest/tests/src/com/android/frameworktest/listview/ListRetainsFocusAcrossLayoutsTest.java b/core/tests/coretests/src/android/widget/listview/ListRetainsFocusAcrossLayoutsTest.java
similarity index 93%
rename from tests/FrameworkTest/tests/src/com/android/frameworktest/listview/ListRetainsFocusAcrossLayoutsTest.java
rename to core/tests/coretests/src/android/widget/listview/ListRetainsFocusAcrossLayoutsTest.java
index 02a8beb..896bd19 100644
--- a/tests/FrameworkTest/tests/src/com/android/frameworktest/listview/ListRetainsFocusAcrossLayoutsTest.java
+++ b/core/tests/coretests/src/android/widget/listview/ListRetainsFocusAcrossLayoutsTest.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.listview;
+package android.widget.listview;
 
-import com.android.frameworktest.listview.ListItemFocusablesClose;
+import android.widget.listview.ListItemFocusablesClose;
 
 import android.test.ActivityInstrumentationTestCase;
 import android.test.suitebuilder.annotation.MediumTest;
@@ -25,7 +25,7 @@
 public class ListRetainsFocusAcrossLayoutsTest extends ActivityInstrumentationTestCase<ListItemFocusablesClose> {
 
     public ListRetainsFocusAcrossLayoutsTest() {
-        super("com.android.frameworktest", ListItemFocusablesClose.class);
+        super("com.android.frameworks.coretests", ListItemFocusablesClose.class);
     }
 
     private void requestLayoutOnList() {

core/tests/coretests/src/android/widget/listview/ListScrollListener.java

diff --git a/tests/FrameworkTest/src/com/android/frameworktest/listview/ListScrollListener.java b/core/tests/coretests/src/android/widget/listview/ListScrollListener.java
similarity index 95%
rename from tests/FrameworkTest/src/com/android/frameworktest/listview/ListScrollListener.java
rename to core/tests/coretests/src/android/widget/listview/ListScrollListener.java
index f5e4faf..58a31dc 100644
--- a/tests/FrameworkTest/src/com/android/frameworktest/listview/ListScrollListener.java
+++ b/core/tests/coretests/src/android/widget/listview/ListScrollListener.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.listview;
+package android.widget.listview;
 
 import android.app.ListActivity;
 import android.os.Bundle;
@@ -25,7 +25,7 @@
 import android.widget.ArrayAdapter;
 import android.widget.TextView;
 
-import com.android.frameworktest.R;
+import com.android.frameworks.coretests.R;
 
 /**
  * Exercises change notification in a list

core/tests/coretests/src/android/widget/listview/ListScrollListenerTest.java

diff --git a/tests/FrameworkTest/tests/src/com/android/frameworktest/listview/ListScrollListenerTest.java b/core/tests/coretests/src/android/widget/listview/ListScrollListenerTest.java
similarity index 96%
rename from tests/FrameworkTest/tests/src/com/android/frameworktest/listview/ListScrollListenerTest.java
rename to core/tests/coretests/src/android/widget/listview/ListScrollListenerTest.java
index 44958d9..2d6e75e 100644
--- a/tests/FrameworkTest/tests/src/com/android/frameworktest/listview/ListScrollListenerTest.java
+++ b/core/tests/coretests/src/android/widget/listview/ListScrollListenerTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.listview;
+package android.widget.listview;
 
 import android.app.Instrumentation;
 import android.test.ActivityInstrumentationTestCase;
@@ -35,7 +35,7 @@
     private int mTotalItemCount = -1;
 
     public ListScrollListenerTest() {
-        super("com.android.frameworktest", ListScrollListener.class);
+        super("com.android.frameworks.coretests", ListScrollListener.class);
     }
 
     @Override

core/tests/coretests/src/android/widget/listview/ListSetSelection.java

diff --git a/tests/FrameworkTest/src/com/android/frameworktest/listview/ListSetSelection.java b/core/tests/coretests/src/android/widget/listview/ListSetSelection.java
similarity index 95%
rename from tests/FrameworkTest/src/com/android/frameworktest/listview/ListSetSelection.java
rename to core/tests/coretests/src/android/widget/listview/ListSetSelection.java
index 45d5892..6c2e264 100644
--- a/tests/FrameworkTest/src/com/android/frameworktest/listview/ListSetSelection.java
+++ b/core/tests/coretests/src/android/widget/listview/ListSetSelection.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.listview;
+package android.widget.listview;
 
-import com.android.frameworktest.util.ListScenario;
+import android.util.ListScenario;
 import android.view.KeyEvent;
 import android.view.View;
 import android.os.Bundle;

core/tests/coretests/src/android/widget/listview/ListSetSelectionTest.java

diff --git a/tests/FrameworkTest/tests/src/com/android/frameworktest/listview/ListSetSelectionTest.java b/core/tests/coretests/src/android/widget/listview/ListSetSelectionTest.java
similarity index 95%
rename from tests/FrameworkTest/tests/src/com/android/frameworktest/listview/ListSetSelectionTest.java
rename to core/tests/coretests/src/android/widget/listview/ListSetSelectionTest.java
index e35d894..4cef164 100644
--- a/tests/FrameworkTest/tests/src/com/android/frameworktest/listview/ListSetSelectionTest.java
+++ b/core/tests/coretests/src/android/widget/listview/ListSetSelectionTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.listview;
+package android.widget.listview;
 
 import android.test.ActivityInstrumentationTestCase2;
 import android.test.UiThreadTest;
@@ -29,7 +29,7 @@
     private ListView mListView;
 
     public ListSetSelectionTest() {
-        super("com.android.frameworktest", ListSimple.class);
+        super("com.android.frameworks.coretests", ListSimple.class);
     }
 
     @Override

core/tests/coretests/src/android/widget/listview/ListSimple.java

diff --git a/tests/FrameworkTest/src/com/android/frameworktest/listview/ListSimple.java b/core/tests/coretests/src/android/widget/listview/ListSimple.java
similarity index 93%
rename from tests/FrameworkTest/src/com/android/frameworktest/listview/ListSimple.java
rename to core/tests/coretests/src/android/widget/listview/ListSimple.java
index e7517d6..6accae1 100644
--- a/tests/FrameworkTest/src/com/android/frameworktest/listview/ListSimple.java
+++ b/core/tests/coretests/src/android/widget/listview/ListSimple.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.listview;
+package android.widget.listview;
 
-import com.android.frameworktest.util.ListScenario;
+import android.util.ListScenario;
 
 import android.view.View;
 import android.view.ViewGroup;

core/tests/coretests/src/android/widget/listview/ListTakeFocusFromSide.java

diff --git a/tests/FrameworkTest/src/com/android/frameworktest/listview/ListTakeFocusFromSide.java b/core/tests/coretests/src/android/widget/listview/ListTakeFocusFromSide.java
similarity index 96%
rename from tests/FrameworkTest/src/com/android/frameworktest/listview/ListTakeFocusFromSide.java
rename to core/tests/coretests/src/android/widget/listview/ListTakeFocusFromSide.java
index e576ea2..95f09f6 100644
--- a/tests/FrameworkTest/src/com/android/frameworktest/listview/ListTakeFocusFromSide.java
+++ b/core/tests/coretests/src/android/widget/listview/ListTakeFocusFromSide.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.listview;
+package android.widget.listview;
 
-import com.android.frameworktest.R;
+import com.android.frameworks.coretests.R;
 
 import android.app.ListActivity;
 import android.content.Context;

core/tests/coretests/src/android/widget/listview/ListThrasher.java

diff --git a/tests/FrameworkTest/src/com/android/frameworktest/listview/ListThrasher.java b/core/tests/coretests/src/android/widget/listview/ListThrasher.java
similarity index 97%
rename from tests/FrameworkTest/src/com/android/frameworktest/listview/ListThrasher.java
rename to core/tests/coretests/src/android/widget/listview/ListThrasher.java
index e0b18a2..ba3d590 100644
--- a/tests/FrameworkTest/src/com/android/frameworktest/listview/ListThrasher.java
+++ b/core/tests/coretests/src/android/widget/listview/ListThrasher.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.listview;
+package android.widget.listview;
 
-import com.android.frameworktest.R;
+import com.android.frameworks.coretests.R;
 
 import android.app.ListActivity;
 import android.content.Context;

core/tests/coretests/src/android/widget/listview/ListTopGravity.java

diff --git a/tests/FrameworkTest/src/com/android/frameworktest/listview/ListTopGravity.java b/core/tests/coretests/src/android/widget/listview/ListTopGravity.java
similarity index 91%
rename from tests/FrameworkTest/src/com/android/frameworktest/listview/ListTopGravity.java
rename to core/tests/coretests/src/android/widget/listview/ListTopGravity.java
index 6eb65a9..986cc57 100644
--- a/tests/FrameworkTest/src/com/android/frameworktest/listview/ListTopGravity.java
+++ b/core/tests/coretests/src/android/widget/listview/ListTopGravity.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.listview;
+package android.widget.listview;
 
 import android.view.Gravity;
 
-import com.android.frameworktest.util.ListScenario;
+import android.util.ListScenario;
 
 /**
  * Basic top gravity scenario, nothing fancy. Items do not

core/tests/coretests/src/android/widget/listview/ListTopGravityMany.java

diff --git a/tests/FrameworkTest/src/com/android/frameworktest/listview/ListTopGravityMany.java b/core/tests/coretests/src/android/widget/listview/ListTopGravityMany.java
similarity index 91%
rename from tests/FrameworkTest/src/com/android/frameworktest/listview/ListTopGravityMany.java
rename to core/tests/coretests/src/android/widget/listview/ListTopGravityMany.java
index 8cff8ca..5592ad9 100644
--- a/tests/FrameworkTest/src/com/android/frameworktest/listview/ListTopGravityMany.java
+++ b/core/tests/coretests/src/android/widget/listview/ListTopGravityMany.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.listview;
+package android.widget.listview;
 
-import com.android.frameworktest.util.ListScenario;
+import android.util.ListScenario;
 
 /**
  * Basic top gravity scenario, nothing fancy. There are

core/tests/coretests/src/android/widget/listview/ListUnspecifiedMeasure.java

diff --git a/tests/FrameworkTest/tests/src/com/android/frameworktest/listview/ListUnspecifiedMeasure.java b/core/tests/coretests/src/android/widget/listview/ListUnspecifiedMeasure.java
similarity index 91%
rename from tests/FrameworkTest/tests/src/com/android/frameworktest/listview/ListUnspecifiedMeasure.java
rename to core/tests/coretests/src/android/widget/listview/ListUnspecifiedMeasure.java
index 55a57ef..199d069 100644
--- a/tests/FrameworkTest/tests/src/com/android/frameworktest/listview/ListUnspecifiedMeasure.java
+++ b/core/tests/coretests/src/android/widget/listview/ListUnspecifiedMeasure.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.listview;
+package android.widget.listview;
 
-import com.android.frameworktest.R;
+import com.android.frameworks.coretests.R;
 
 import android.test.ActivityInstrumentationTestCase;
 import android.app.Activity;
@@ -28,7 +28,7 @@
     private ListView mListView;
 
     protected ListUnspecifiedMeasure(Class<T> klass) {
-        super("com.android.frameworktest", klass);
+        super("com.android.frameworks.coretests", klass);
     }
 
     @Override

core/tests/coretests/src/android/widget/listview/ListViewHeight.java

diff --git a/tests/FrameworkTest/src/com/android/frameworktest/listview/ListViewHeight.java b/core/tests/coretests/src/android/widget/listview/ListViewHeight.java
similarity index 97%
rename from tests/FrameworkTest/src/com/android/frameworktest/listview/ListViewHeight.java
rename to core/tests/coretests/src/android/widget/listview/ListViewHeight.java
index 1d6d598..64f280a 100644
--- a/tests/FrameworkTest/src/com/android/frameworktest/listview/ListViewHeight.java
+++ b/core/tests/coretests/src/android/widget/listview/ListViewHeight.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.listview;
+package android.widget.listview;
 
 import android.app.Activity;
 import android.os.Bundle;
@@ -23,7 +23,7 @@
 import android.widget.ArrayAdapter;
 import android.widget.ListView;
 
-import com.android.frameworktest.R;
+import com.android.frameworks.coretests.R;
 
 public class ListViewHeight extends Activity {
 

core/tests/coretests/src/android/widget/listview/ListViewHeightTest.java

diff --git a/tests/FrameworkTest/tests/src/com/android/frameworktest/listview/ListViewHeightTest.java b/core/tests/coretests/src/android/widget/listview/ListViewHeightTest.java
similarity index 92%
rename from tests/FrameworkTest/tests/src/com/android/frameworktest/listview/ListViewHeightTest.java
rename to core/tests/coretests/src/android/widget/listview/ListViewHeightTest.java
index d5bdf8b..5ab2757 100644
--- a/tests/FrameworkTest/tests/src/com/android/frameworktest/listview/ListViewHeightTest.java
+++ b/core/tests/coretests/src/android/widget/listview/ListViewHeightTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.listview;
+package android.widget.listview;
 
 import android.app.Instrumentation;
 import android.test.ActivityInstrumentationTestCase;
@@ -22,15 +22,15 @@
 import android.widget.Button;
 import android.widget.ListView;
 
-import com.android.frameworktest.R;
-import com.android.frameworktest.listview.ListViewHeight;
+import com.android.frameworks.coretests.R;
+import android.widget.listview.ListViewHeight;
 
 public class ListViewHeightTest extends ActivityInstrumentationTestCase<ListViewHeight> {
     private ListViewHeight mActivity;
 
 
     public ListViewHeightTest() {
-        super("com.android.frameworktest", ListViewHeight.class);
+        super("com.android.frameworks.coretests", ListViewHeight.class);
     }
     
     @Override

core/tests/coretests/src/android/widget/listview/ListWithDisappearingItemBug.java

diff --git a/tests/FrameworkTest/src/com/android/frameworktest/listview/ListWithDisappearingItemBug.java b/core/tests/coretests/src/android/widget/listview/ListWithDisappearingItemBug.java
similarity index 96%
rename from tests/FrameworkTest/src/com/android/frameworktest/listview/ListWithDisappearingItemBug.java
rename to core/tests/coretests/src/android/widget/listview/ListWithDisappearingItemBug.java
index 3a968af..348ea1b 100644
--- a/tests/FrameworkTest/src/com/android/frameworktest/listview/ListWithDisappearingItemBug.java
+++ b/core/tests/coretests/src/android/widget/listview/ListWithDisappearingItemBug.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.listview;
+package android.widget.listview;
 
-import com.android.frameworktest.R;
+import com.android.frameworks.coretests.R;
 
 import android.app.ListActivity;
 import android.database.Cursor;

core/tests/coretests/src/android/widget/listview/ListWithEditTextHeader.java

diff --git a/tests/FrameworkTest/src/com/android/frameworktest/listview/ListWithEditTextHeader.java b/core/tests/coretests/src/android/widget/listview/ListWithEditTextHeader.java
similarity index 90%
rename from tests/FrameworkTest/src/com/android/frameworktest/listview/ListWithEditTextHeader.java
rename to core/tests/coretests/src/android/widget/listview/ListWithEditTextHeader.java
index b5cac2a..5303faf 100644
--- a/tests/FrameworkTest/src/com/android/frameworktest/listview/ListWithEditTextHeader.java
+++ b/core/tests/coretests/src/android/widget/listview/ListWithEditTextHeader.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.listview;
+package android.widget.listview;
 
-import com.android.frameworktest.util.ListScenario;
+import android.util.ListScenario;
 
 /**
  * A list view with a single edit text in a header.

core/tests/coretests/src/android/widget/listview/ListWithEmptyView.java

diff --git a/tests/FrameworkTest/src/com/android/frameworktest/listview/ListWithEmptyView.java b/core/tests/coretests/src/android/widget/listview/ListWithEmptyView.java
similarity index 97%
rename from tests/FrameworkTest/src/com/android/frameworktest/listview/ListWithEmptyView.java
rename to core/tests/coretests/src/android/widget/listview/ListWithEmptyView.java
index 6f43551..74dd06c 100644
--- a/tests/FrameworkTest/src/com/android/frameworktest/listview/ListWithEmptyView.java
+++ b/core/tests/coretests/src/android/widget/listview/ListWithEmptyView.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.listview;
+package android.widget.listview;
 
-import com.android.frameworktest.R;
+import com.android.frameworks.coretests.R;
 
 import android.app.ListActivity;
 import android.content.Context;

core/tests/coretests/src/android/widget/listview/ListWithFirstScreenUnSelectable.java

diff --git a/tests/FrameworkTest/src/com/android/frameworktest/listview/ListWithFirstScreenUnSelectable.java b/core/tests/coretests/src/android/widget/listview/ListWithFirstScreenUnSelectable.java
similarity index 90%
rename from tests/FrameworkTest/src/com/android/frameworktest/listview/ListWithFirstScreenUnSelectable.java
rename to core/tests/coretests/src/android/widget/listview/ListWithFirstScreenUnSelectable.java
index 4ad72fd..5261283 100644
--- a/tests/FrameworkTest/src/com/android/frameworktest/listview/ListWithFirstScreenUnSelectable.java
+++ b/core/tests/coretests/src/android/widget/listview/ListWithFirstScreenUnSelectable.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.listview;
+package android.widget.listview;
 
-import com.android.frameworktest.util.ListScenario;
+import android.util.ListScenario;
 
 /**
  * The first item is unselectable, and takes up the whole screen.

core/tests/coretests/src/android/widget/listview/ListWithHeaders.java

diff --git a/tests/FrameworkTest/src/com/android/frameworktest/listview/ListWithHeaders.java b/core/tests/coretests/src/android/widget/listview/ListWithHeaders.java
similarity index 94%
rename from tests/FrameworkTest/src/com/android/frameworktest/listview/ListWithHeaders.java
rename to core/tests/coretests/src/android/widget/listview/ListWithHeaders.java
index d523094..aea091a 100644
--- a/tests/FrameworkTest/src/com/android/frameworktest/listview/ListWithHeaders.java
+++ b/core/tests/coretests/src/android/widget/listview/ListWithHeaders.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.listview;
+package android.widget.listview;
 
-import com.android.frameworktest.util.ListScenario;
+import android.util.ListScenario;
 
 import android.os.Bundle;
 import android.widget.Button;

core/tests/coretests/src/android/widget/listview/ListWithNoFadingEdge.java

diff --git a/tests/FrameworkTest/src/com/android/frameworktest/listview/ListWithNoFadingEdge.java b/core/tests/coretests/src/android/widget/listview/ListWithNoFadingEdge.java
similarity index 89%
rename from tests/FrameworkTest/src/com/android/frameworktest/listview/ListWithNoFadingEdge.java
rename to core/tests/coretests/src/android/widget/listview/ListWithNoFadingEdge.java
index ecfc793..b870fc8 100644
--- a/tests/FrameworkTest/src/com/android/frameworktest/listview/ListWithNoFadingEdge.java
+++ b/core/tests/coretests/src/android/widget/listview/ListWithNoFadingEdge.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.listview;
+package android.widget.listview;
 
-import com.android.frameworktest.util.ListScenario;
+import android.util.ListScenario;
 
 public class ListWithNoFadingEdge extends ListScenario {
 

core/tests/coretests/src/android/widget/listview/ListWithOffScreenNextSelectable.java

diff --git a/tests/FrameworkTest/src/com/android/frameworktest/listview/ListWithOffScreenNextSelectable.java b/core/tests/coretests/src/android/widget/listview/ListWithOffScreenNextSelectable.java
similarity index 91%
rename from tests/FrameworkTest/src/com/android/frameworktest/listview/ListWithOffScreenNextSelectable.java
rename to core/tests/coretests/src/android/widget/listview/ListWithOffScreenNextSelectable.java
index 71525c0..2e65bd0 100644
--- a/tests/FrameworkTest/src/com/android/frameworktest/listview/ListWithOffScreenNextSelectable.java
+++ b/core/tests/coretests/src/android/widget/listview/ListWithOffScreenNextSelectable.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.listview;
+package android.widget.listview;
 
-import com.android.frameworktest.util.ListScenario;
+import android.util.ListScenario;
 
 /**
  * Pressing down from position 0 requires looking past positions 1, 2 and 3 to

core/tests/coretests/src/android/widget/listview/ListWithOnItemSelectedAction.java

diff --git a/tests/FrameworkTest/src/com/android/frameworktest/listview/ListWithOnItemSelectedAction.java b/core/tests/coretests/src/android/widget/listview/ListWithOnItemSelectedAction.java
similarity index 93%
rename from tests/FrameworkTest/src/com/android/frameworktest/listview/ListWithOnItemSelectedAction.java
rename to core/tests/coretests/src/android/widget/listview/ListWithOnItemSelectedAction.java
index 2683040..26e1d5d 100644
--- a/tests/FrameworkTest/src/com/android/frameworktest/listview/ListWithOnItemSelectedAction.java
+++ b/core/tests/coretests/src/android/widget/listview/ListWithOnItemSelectedAction.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.listview;
+package android.widget.listview;
 
 import android.widget.TextView;
-import com.android.frameworktest.util.ListScenario;
+import android.util.ListScenario;
 
 /**
  * The header text view echos the value of the selected item by using (indirectly)

core/tests/coretests/src/android/widget/listview/ListWithScreenOfNoSelectables.java

diff --git a/tests/FrameworkTest/src/com/android/frameworktest/listview/ListWithScreenOfNoSelectables.java b/core/tests/coretests/src/android/widget/listview/ListWithScreenOfNoSelectables.java
similarity index 89%
rename from tests/FrameworkTest/src/com/android/frameworktest/listview/ListWithScreenOfNoSelectables.java
rename to core/tests/coretests/src/android/widget/listview/ListWithScreenOfNoSelectables.java
index a2f3dc2..108ac4d 100644
--- a/tests/FrameworkTest/src/com/android/frameworktest/listview/ListWithScreenOfNoSelectables.java
+++ b/core/tests/coretests/src/android/widget/listview/ListWithScreenOfNoSelectables.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.listview;
+package android.widget.listview;
 
-import com.android.frameworktest.util.ListScenario;
+import android.util.ListScenario;
 
 public class ListWithScreenOfNoSelectables extends ListScenario {
 

core/tests/coretests/src/android/widget/listview/ListWithSeparators.java

diff --git a/tests/FrameworkTest/src/com/android/frameworktest/listview/ListWithSeparators.java b/core/tests/coretests/src/android/widget/listview/ListWithSeparators.java
similarity index 90%
rename from tests/FrameworkTest/src/com/android/frameworktest/listview/ListWithSeparators.java
rename to core/tests/coretests/src/android/widget/listview/ListWithSeparators.java
index 71ce4e7..0f4f2d8 100644
--- a/tests/FrameworkTest/src/com/android/frameworktest/listview/ListWithSeparators.java
+++ b/core/tests/coretests/src/android/widget/listview/ListWithSeparators.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.listview;
+package android.widget.listview;
 
-import com.android.frameworktest.util.ListScenario;
+import android.util.ListScenario;
 
 /**
  * Basic separator scenario, nothing fancy.

core/tests/coretests/src/android/widget/listview/arrowscroll/ListInterleaveFocusablesTest.java

diff --git a/tests/FrameworkTest/tests/src/com/android/frameworktest/listview/arrowscroll/ListInterleaveFocusablesTest.java b/core/tests/coretests/src/android/widget/listview/arrowscroll/ListInterleaveFocusablesTest.java
similarity index 93%
rename from tests/FrameworkTest/tests/src/com/android/frameworktest/listview/arrowscroll/ListInterleaveFocusablesTest.java
rename to core/tests/coretests/src/android/widget/listview/arrowscroll/ListInterleaveFocusablesTest.java
index 1fe75c4..6238dab 100644
--- a/tests/FrameworkTest/tests/src/com/android/frameworktest/listview/arrowscroll/ListInterleaveFocusablesTest.java
+++ b/core/tests/coretests/src/android/widget/listview/arrowscroll/ListInterleaveFocusablesTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.listview.arrowscroll;
+package android.widget.listview.arrowscroll;
 
 import android.test.ActivityInstrumentationTestCase;
 import android.test.suitebuilder.annotation.LargeTest;
@@ -23,15 +23,15 @@
 import android.view.KeyEvent;
 import android.view.View;
 
-import com.android.frameworktest.listview.ListInterleaveFocusables;
-import com.android.frameworktest.util.ListUtil;
+import android.widget.listview.ListInterleaveFocusables;
+import android.util.ListUtil;
 
 public class ListInterleaveFocusablesTest extends ActivityInstrumentationTestCase<ListInterleaveFocusables> {
     private ListView mListView;
     private ListUtil mListUtil;
 
     public ListInterleaveFocusablesTest() {
-        super("com.android.frameworktest", ListInterleaveFocusables.class);
+        super("com.android.frameworks.coretests", ListInterleaveFocusables.class);
     }
 
     @Override

core/tests/coretests/src/android/widget/listview/arrowscroll/ListItemFocusableAboveUnfocusableTest.java

diff --git a/tests/FrameworkTest/tests/src/com/android/frameworktest/listview/arrowscroll/ListItemFocusableAboveUnfocusableTest.java b/core/tests/coretests/src/android/widget/listview/arrowscroll/ListItemFocusableAboveUnfocusableTest.java
similarity index 88%
rename from tests/FrameworkTest/tests/src/com/android/frameworktest/listview/arrowscroll/ListItemFocusableAboveUnfocusableTest.java
rename to core/tests/coretests/src/android/widget/listview/arrowscroll/ListItemFocusableAboveUnfocusableTest.java
index 6ff9181..82f48801 100644
--- a/tests/FrameworkTest/tests/src/com/android/frameworktest/listview/arrowscroll/ListItemFocusableAboveUnfocusableTest.java
+++ b/core/tests/coretests/src/android/widget/listview/arrowscroll/ListItemFocusableAboveUnfocusableTest.java
@@ -14,19 +14,19 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.listview.arrowscroll;
+package android.widget.listview.arrowscroll;
 
 import android.test.ActivityInstrumentationTestCase;
 import android.test.suitebuilder.annotation.MediumTest;
 import android.widget.ListView;
 import android.view.KeyEvent;
-import com.android.frameworktest.listview.ListItemFocusableAboveUnfocusable;
+import android.widget.listview.ListItemFocusableAboveUnfocusable;
 
 public class ListItemFocusableAboveUnfocusableTest extends ActivityInstrumentationTestCase<ListItemFocusableAboveUnfocusable> {
     private ListView mListView;
 
     public ListItemFocusableAboveUnfocusableTest() {
-        super("com.android.frameworktest", ListItemFocusableAboveUnfocusable.class);
+        super("com.android.frameworks.coretests", ListItemFocusableAboveUnfocusable.class);
     }
 
     protected void setUp() throws Exception {

core/tests/coretests/src/android/widget/listview/arrowscroll/ListItemFocusablesCloseTest.java

diff --git a/tests/FrameworkTest/tests/src/com/android/frameworktest/listview/arrowscroll/ListItemFocusablesCloseTest.java b/core/tests/coretests/src/android/widget/listview/arrowscroll/ListItemFocusablesCloseTest.java
similarity index 95%
rename from tests/FrameworkTest/tests/src/com/android/frameworktest/listview/arrowscroll/ListItemFocusablesCloseTest.java
rename to core/tests/coretests/src/android/widget/listview/arrowscroll/ListItemFocusablesCloseTest.java
index 07356ba..3b30ebe 100644
--- a/tests/FrameworkTest/tests/src/com/android/frameworktest/listview/arrowscroll/ListItemFocusablesCloseTest.java
+++ b/core/tests/coretests/src/android/widget/listview/arrowscroll/ListItemFocusablesCloseTest.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.listview.arrowscroll;
+package android.widget.listview.arrowscroll;
 
 import android.test.ActivityInstrumentationTestCase;
 import android.test.suitebuilder.annotation.MediumTest;
 import android.view.KeyEvent;
 import android.widget.LinearLayout;
 import android.widget.ListView;
-import com.android.frameworktest.listview.ListItemFocusablesClose;
+import android.widget.listview.ListItemFocusablesClose;
 
 public class ListItemFocusablesCloseTest extends ActivityInstrumentationTestCase<ListItemFocusablesClose> {
     private ListView mListView;
@@ -29,7 +29,7 @@
     private int mListBottom;
 
     public ListItemFocusablesCloseTest() {
-        super("com.android.frameworktest", ListItemFocusablesClose.class);
+        super("com.android.frameworks.coretests", ListItemFocusablesClose.class);
     }
 
     @Override

core/tests/coretests/src/android/widget/listview/arrowscroll/ListItemFocusablesFarApartTest.java

diff --git a/tests/FrameworkTest/tests/src/com/android/frameworktest/listview/arrowscroll/ListItemFocusablesFarApartTest.java b/core/tests/coretests/src/android/widget/listview/arrowscroll/ListItemFocusablesFarApartTest.java
similarity index 95%
rename from tests/FrameworkTest/tests/src/com/android/frameworktest/listview/arrowscroll/ListItemFocusablesFarApartTest.java
rename to core/tests/coretests/src/android/widget/listview/arrowscroll/ListItemFocusablesFarApartTest.java
index 951e021..475930d 100644
--- a/tests/FrameworkTest/tests/src/com/android/frameworktest/listview/arrowscroll/ListItemFocusablesFarApartTest.java
+++ b/core/tests/coretests/src/android/widget/listview/arrowscroll/ListItemFocusablesFarApartTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.listview.arrowscroll;
+package android.widget.listview.arrowscroll;
 
 import android.test.ActivityInstrumentationTestCase;
 import android.test.suitebuilder.annotation.MediumTest;
@@ -23,7 +23,7 @@
 import android.view.ViewGroup;
 import android.widget.Button;
 import android.widget.ListView;
-import com.android.frameworktest.listview.ListItemFocusablesFarApart;
+import android.widget.listview.ListItemFocusablesFarApart;
 
 public class ListItemFocusablesFarApartTest extends ActivityInstrumentationTestCase<ListItemFocusablesFarApart> {
     private ListView mListView;
@@ -31,7 +31,7 @@
     private int mListBottom;
 
     public ListItemFocusablesFarApartTest() {
-        super("com.android.frameworktest", ListItemFocusablesFarApart.class);
+        super("com.android.frameworks.coretests", ListItemFocusablesFarApart.class);
     }
 
     @Override

core/tests/coretests/src/android/widget/listview/arrowscroll/ListItemsExpandOnSelectionTest.java

diff --git a/tests/FrameworkTest/tests/src/com/android/frameworktest/listview/arrowscroll/ListItemsExpandOnSelectionTest.java b/core/tests/coretests/src/android/widget/listview/arrowscroll/ListItemsExpandOnSelectionTest.java
similarity index 95%
rename from tests/FrameworkTest/tests/src/com/android/frameworktest/listview/arrowscroll/ListItemsExpandOnSelectionTest.java
rename to core/tests/coretests/src/android/widget/listview/arrowscroll/ListItemsExpandOnSelectionTest.java
index f61ce7b..e4b5c18 100644
--- a/tests/FrameworkTest/tests/src/com/android/frameworktest/listview/arrowscroll/ListItemsExpandOnSelectionTest.java
+++ b/core/tests/coretests/src/android/widget/listview/arrowscroll/ListItemsExpandOnSelectionTest.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.listview.arrowscroll;
+package android.widget.listview.arrowscroll;
 
 import android.test.ActivityInstrumentationTestCase;
 import android.test.suitebuilder.annotation.LargeTest;
 import android.test.suitebuilder.annotation.MediumTest;
 import android.widget.ListView;
 import android.view.KeyEvent;
-import com.android.frameworktest.listview.ListItemsExpandOnSelection;
+import android.widget.listview.ListItemsExpandOnSelection;
 
 public class ListItemsExpandOnSelectionTest extends ActivityInstrumentationTestCase<ListItemsExpandOnSelection> {
     private ListView mListView;
@@ -31,7 +31,7 @@
     private int mNormalHeight;
 
     public ListItemsExpandOnSelectionTest() {
-        super("com.android.frameworktest",
+        super("com.android.frameworks.coretests",
                 ListItemsExpandOnSelection.class);
     }
 

core/tests/coretests/src/android/widget/listview/arrowscroll/ListLastItemPartiallyVisibleTest.java

diff --git a/tests/FrameworkTest/tests/src/com/android/frameworktest/listview/arrowscroll/ListLastItemPartiallyVisibleTest.java b/core/tests/coretests/src/android/widget/listview/arrowscroll/ListLastItemPartiallyVisibleTest.java
similarity index 92%
rename from tests/FrameworkTest/tests/src/com/android/frameworktest/listview/arrowscroll/ListLastItemPartiallyVisibleTest.java
rename to core/tests/coretests/src/android/widget/listview/arrowscroll/ListLastItemPartiallyVisibleTest.java
index 38f4b0e..5bc121a 100644
--- a/tests/FrameworkTest/tests/src/com/android/frameworktest/listview/arrowscroll/ListLastItemPartiallyVisibleTest.java
+++ b/core/tests/coretests/src/android/widget/listview/arrowscroll/ListLastItemPartiallyVisibleTest.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.listview.arrowscroll;
+package android.widget.listview.arrowscroll;
 
 import android.test.ActivityInstrumentationTestCase;
 import android.test.suitebuilder.annotation.MediumTest;
 import android.widget.ListView;
 import android.view.View;
 import android.view.KeyEvent;
-import com.android.frameworktest.listview.ListLastItemPartiallyVisible;
+import android.widget.listview.ListLastItemPartiallyVisible;
 
 public class ListLastItemPartiallyVisibleTest extends ActivityInstrumentationTestCase<ListLastItemPartiallyVisible> {
     private ListView mListView;
@@ -29,7 +29,7 @@
 
 
     public ListLastItemPartiallyVisibleTest() {
-        super("com.android.frameworktest", ListLastItemPartiallyVisible.class);
+        super("com.android.frameworks.coretests", ListLastItemPartiallyVisible.class);
     }
 
     @Override

core/tests/coretests/src/android/widget/listview/arrowscroll/ListOfItemsShorterThanScreenTest.java

diff --git a/tests/FrameworkTest/tests/src/com/android/frameworktest/listview/arrowscroll/ListOfItemsShorterThanScreenTest.java b/core/tests/coretests/src/android/widget/listview/arrowscroll/ListOfItemsShorterThanScreenTest.java
similarity index 96%
rename from tests/FrameworkTest/tests/src/com/android/frameworktest/listview/arrowscroll/ListOfItemsShorterThanScreenTest.java
rename to core/tests/coretests/src/android/widget/listview/arrowscroll/ListOfItemsShorterThanScreenTest.java
index 126eea2..eacde5b 100644
--- a/tests/FrameworkTest/tests/src/com/android/frameworktest/listview/arrowscroll/ListOfItemsShorterThanScreenTest.java
+++ b/core/tests/coretests/src/android/widget/listview/arrowscroll/ListOfItemsShorterThanScreenTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.listview.arrowscroll;
+package android.widget.listview.arrowscroll;
 
 import android.test.ActivityInstrumentationTestCase;
 import android.test.suitebuilder.annotation.MediumTest;
@@ -22,7 +22,7 @@
 import android.view.View;
 import android.widget.ListView;
 import android.widget.TextView;
-import com.android.frameworktest.listview.ListOfItemsShorterThanScreen;
+import android.widget.listview.ListOfItemsShorterThanScreen;
 
 public class ListOfItemsShorterThanScreenTest
         extends ActivityInstrumentationTestCase<ListOfItemsShorterThanScreen> {
@@ -31,7 +31,7 @@
 
 
     public ListOfItemsShorterThanScreenTest() {
-        super("com.android.frameworktest", ListOfItemsShorterThanScreen.class);
+        super("com.android.frameworks.coretests", ListOfItemsShorterThanScreen.class);
     }
 
     protected void setUp() throws Exception {

core/tests/coretests/src/android/widget/listview/arrowscroll/ListOfItemsTallerThanScreenTest.java

diff --git a/tests/FrameworkTest/tests/src/com/android/frameworktest/listview/arrowscroll/ListOfItemsTallerThanScreenTest.java b/core/tests/coretests/src/android/widget/listview/arrowscroll/ListOfItemsTallerThanScreenTest.java
similarity index 96%
rename from tests/FrameworkTest/tests/src/com/android/frameworktest/listview/arrowscroll/ListOfItemsTallerThanScreenTest.java
rename to core/tests/coretests/src/android/widget/listview/arrowscroll/ListOfItemsTallerThanScreenTest.java
index ec3a15c..59609422 100644
--- a/tests/FrameworkTest/tests/src/com/android/frameworktest/listview/arrowscroll/ListOfItemsTallerThanScreenTest.java
+++ b/core/tests/coretests/src/android/widget/listview/arrowscroll/ListOfItemsTallerThanScreenTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.listview.arrowscroll;
+package android.widget.listview.arrowscroll;
 
 import android.test.ActivityInstrumentationTestCase;
 import android.test.suitebuilder.annotation.LargeTest;
@@ -22,7 +22,7 @@
 import android.widget.ListView;
 import android.view.View;
 import android.view.KeyEvent;
-import com.android.frameworktest.listview.ListOfItemsTallerThanScreen;
+import android.widget.listview.ListOfItemsTallerThanScreen;
 
 public class ListOfItemsTallerThanScreenTest
         extends ActivityInstrumentationTestCase<ListOfItemsTallerThanScreen> {
@@ -38,7 +38,7 @@
     }
 
     public ListOfItemsTallerThanScreenTest() {
-        super("com.android.frameworktest", ListOfItemsTallerThanScreen.class);
+        super("com.android.frameworks.coretests", ListOfItemsTallerThanScreen.class);
     }
 
     @MediumTest

core/tests/coretests/src/android/widget/listview/arrowscroll/ListOfShortShortTallShortShortTest.java

diff --git a/tests/FrameworkTest/tests/src/com/android/frameworktest/listview/arrowscroll/ListOfShortShortTallShortShortTest.java b/core/tests/coretests/src/android/widget/listview/arrowscroll/ListOfShortShortTallShortShortTest.java
similarity index 95%
rename from tests/FrameworkTest/tests/src/com/android/frameworktest/listview/arrowscroll/ListOfShortShortTallShortShortTest.java
rename to core/tests/coretests/src/android/widget/listview/arrowscroll/ListOfShortShortTallShortShortTest.java
index e218099..a5d4906 100644
--- a/tests/FrameworkTest/tests/src/com/android/frameworktest/listview/arrowscroll/ListOfShortShortTallShortShortTest.java
+++ b/core/tests/coretests/src/android/widget/listview/arrowscroll/ListOfShortShortTallShortShortTest.java
@@ -14,22 +14,22 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.listview.arrowscroll;
+package android.widget.listview.arrowscroll;
 
 import android.test.ActivityInstrumentationTestCase;
 import android.test.suitebuilder.annotation.LargeTest;
 import android.test.suitebuilder.annotation.MediumTest;
 import android.view.KeyEvent;
 import android.widget.ListView;
-import com.android.frameworktest.listview.ListOfShortShortTallShortShort;
-import com.android.frameworktest.util.ListUtil;
+import android.widget.listview.ListOfShortShortTallShortShort;
+import android.util.ListUtil;
 
 public class ListOfShortShortTallShortShortTest extends ActivityInstrumentationTestCase<ListOfShortShortTallShortShort> {
     private ListView mListView;
     private ListUtil mListUtil;
 
     public ListOfShortShortTallShortShortTest() {
-        super("com.android.frameworktest", ListOfShortShortTallShortShort.class);
+        super("com.android.frameworks.coretests", ListOfShortShortTallShortShort.class);
     }
 
     @Override

core/tests/coretests/src/android/widget/listview/arrowscroll/ListOfShortTallShortTest.java

diff --git a/tests/FrameworkTest/tests/src/com/android/frameworktest/listview/arrowscroll/ListOfShortTallShortTest.java b/core/tests/coretests/src/android/widget/listview/arrowscroll/ListOfShortTallShortTest.java
similarity index 93%
rename from tests/FrameworkTest/tests/src/com/android/frameworktest/listview/arrowscroll/ListOfShortTallShortTest.java
rename to core/tests/coretests/src/android/widget/listview/arrowscroll/ListOfShortTallShortTest.java
index 6a83ada..c958591 100644
--- a/tests/FrameworkTest/tests/src/com/android/frameworktest/listview/arrowscroll/ListOfShortTallShortTest.java
+++ b/core/tests/coretests/src/android/widget/listview/arrowscroll/ListOfShortTallShortTest.java
@@ -14,19 +14,19 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.listview.arrowscroll;
+package android.widget.listview.arrowscroll;
 
 import android.test.ActivityInstrumentationTestCase;
 import android.test.suitebuilder.annotation.MediumTest;
 import android.widget.ListView;
 import android.view.KeyEvent;
-import com.android.frameworktest.listview.ListOfShortTallShort;
+import android.widget.listview.ListOfShortTallShort;
 
 public class ListOfShortTallShortTest extends ActivityInstrumentationTestCase<ListOfShortTallShort> {
     private ListView mListView;
 
     public ListOfShortTallShortTest() {
-        super("com.android.frameworktest", ListOfShortTallShort.class);
+        super("com.android.frameworks.coretests", ListOfShortTallShort.class);
     }
 
     @Override

core/tests/coretests/src/android/widget/listview/arrowscroll/ListOfThinItemsTest.java

diff --git a/tests/FrameworkTest/tests/src/com/android/frameworktest/listview/arrowscroll/ListOfThinItemsTest.java b/core/tests/coretests/src/android/widget/listview/arrowscroll/ListOfThinItemsTest.java
similarity index 95%
rename from tests/FrameworkTest/tests/src/com/android/frameworktest/listview/arrowscroll/ListOfThinItemsTest.java
rename to core/tests/coretests/src/android/widget/listview/arrowscroll/ListOfThinItemsTest.java
index e8dbbec..17c1e03 100644
--- a/tests/FrameworkTest/tests/src/com/android/frameworktest/listview/arrowscroll/ListOfThinItemsTest.java
+++ b/core/tests/coretests/src/android/widget/listview/arrowscroll/ListOfThinItemsTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.listview.arrowscroll;
+package android.widget.listview.arrowscroll;
 
 import android.test.ActivityInstrumentationTestCase;
 import android.test.suitebuilder.annotation.LargeTest;
@@ -22,13 +22,13 @@
 import android.view.KeyEvent;
 import android.view.View;
 import android.widget.ListView;
-import com.android.frameworktest.listview.ListOfThinItems;
+import android.widget.listview.ListOfThinItems;
 
 public class ListOfThinItemsTest extends ActivityInstrumentationTestCase<ListOfThinItems> {
     private ListView mListView;
 
     public ListOfThinItemsTest() {
-        super("com.android.frameworktest", ListOfThinItems.class);
+        super("com.android.frameworks.coretests", ListOfThinItems.class);
     }
 
     @Override

core/tests/coretests/src/android/widget/listview/arrowscroll/ListWithFirstScreenUnSelectableTest.java

diff --git a/tests/FrameworkTest/tests/src/com/android/frameworktest/listview/arrowscroll/ListWithFirstScreenUnSelectableTest.java b/core/tests/coretests/src/android/widget/listview/arrowscroll/ListWithFirstScreenUnSelectableTest.java
similarity index 90%
rename from tests/FrameworkTest/tests/src/com/android/frameworktest/listview/arrowscroll/ListWithFirstScreenUnSelectableTest.java
rename to core/tests/coretests/src/android/widget/listview/arrowscroll/ListWithFirstScreenUnSelectableTest.java
index 307c39d..400fd7d 100644
--- a/tests/FrameworkTest/tests/src/com/android/frameworktest/listview/arrowscroll/ListWithFirstScreenUnSelectableTest.java
+++ b/core/tests/coretests/src/android/widget/listview/arrowscroll/ListWithFirstScreenUnSelectableTest.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.listview.arrowscroll;
+package android.widget.listview.arrowscroll;
 
-import com.android.frameworktest.listview.ListWithFirstScreenUnSelectable;
+import android.widget.listview.ListWithFirstScreenUnSelectable;
 import android.test.ActivityInstrumentationTestCase2;
 import android.view.KeyEvent;
 import android.widget.ListView;
@@ -27,7 +27,7 @@
     private ListView mListView;
 
     public ListWithFirstScreenUnSelectableTest() {
-        super("com.android.frameworktest", ListWithFirstScreenUnSelectable.class);
+        super("com.android.frameworks.coretests", ListWithFirstScreenUnSelectable.class);
     }
 
     protected void setUp() throws Exception {

core/tests/coretests/src/android/widget/listview/arrowscroll/ListWithNoFadingEdgeTest.java

diff --git a/tests/FrameworkTest/tests/src/com/android/frameworktest/listview/arrowscroll/ListWithNoFadingEdgeTest.java b/core/tests/coretests/src/android/widget/listview/arrowscroll/ListWithNoFadingEdgeTest.java
similarity index 92%
rename from tests/FrameworkTest/tests/src/com/android/frameworktest/listview/arrowscroll/ListWithNoFadingEdgeTest.java
rename to core/tests/coretests/src/android/widget/listview/arrowscroll/ListWithNoFadingEdgeTest.java
index 449e048..957be01 100644
--- a/tests/FrameworkTest/tests/src/com/android/frameworktest/listview/arrowscroll/ListWithNoFadingEdgeTest.java
+++ b/core/tests/coretests/src/android/widget/listview/arrowscroll/ListWithNoFadingEdgeTest.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.listview.arrowscroll;
+package android.widget.listview.arrowscroll;
 
-import com.android.frameworktest.listview.ListWithNoFadingEdge;
+import android.widget.listview.ListWithNoFadingEdge;
 
 import android.test.ActivityInstrumentationTestCase;
 import android.test.suitebuilder.annotation.LargeTest;
@@ -29,7 +29,7 @@
     private ListView mListView;
 
     public ListWithNoFadingEdgeTest() {
-        super("com.android.frameworktest", ListWithNoFadingEdge.class);
+        super("com.android.frameworks.coretests", ListWithNoFadingEdge.class);
     }
 
     @Override

core/tests/coretests/src/android/widget/listview/arrowscroll/ListWithOffScreenNextSelectableTest.java

diff --git a/tests/FrameworkTest/tests/src/com/android/frameworktest/listview/arrowscroll/ListWithOffScreenNextSelectableTest.java b/core/tests/coretests/src/android/widget/listview/arrowscroll/ListWithOffScreenNextSelectableTest.java
similarity index 94%
rename from tests/FrameworkTest/tests/src/com/android/frameworktest/listview/arrowscroll/ListWithOffScreenNextSelectableTest.java
rename to core/tests/coretests/src/android/widget/listview/arrowscroll/ListWithOffScreenNextSelectableTest.java
index 6e62ccb..610b890 100644
--- a/tests/FrameworkTest/tests/src/com/android/frameworktest/listview/arrowscroll/ListWithOffScreenNextSelectableTest.java
+++ b/core/tests/coretests/src/android/widget/listview/arrowscroll/ListWithOffScreenNextSelectableTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.listview.arrowscroll;
+package android.widget.listview.arrowscroll;
 
 import android.test.ActivityInstrumentationTestCase;
 import android.test.suitebuilder.annotation.MediumTest;
@@ -22,14 +22,14 @@
 import android.view.View;
 import android.widget.ListView;
 import android.widget.TextView;
-import com.android.frameworktest.listview.ListWithOffScreenNextSelectable;
+import android.widget.listview.ListWithOffScreenNextSelectable;
 
 public class ListWithOffScreenNextSelectableTest
         extends ActivityInstrumentationTestCase<ListWithOffScreenNextSelectable> {
     private ListView mListView;
 
     public ListWithOffScreenNextSelectableTest() {
-        super("com.android.frameworktest", ListWithOffScreenNextSelectable.class);
+        super("com.android.frameworks.coretests", ListWithOffScreenNextSelectable.class);
     }
 
     @Override

core/tests/coretests/src/android/widget/listview/arrowscroll/ListWithOnItemSelectedActionTest.java

diff --git a/tests/FrameworkTest/tests/src/com/android/frameworktest/listview/arrowscroll/ListWithOnItemSelectedActionTest.java b/core/tests/coretests/src/android/widget/listview/arrowscroll/ListWithOnItemSelectedActionTest.java
similarity index 90%
rename from tests/FrameworkTest/tests/src/com/android/frameworktest/listview/arrowscroll/ListWithOnItemSelectedActionTest.java
rename to core/tests/coretests/src/android/widget/listview/arrowscroll/ListWithOnItemSelectedActionTest.java
index 0a8af45..feea9b2 100644
--- a/tests/FrameworkTest/tests/src/com/android/frameworktest/listview/arrowscroll/ListWithOnItemSelectedActionTest.java
+++ b/core/tests/coretests/src/android/widget/listview/arrowscroll/ListWithOnItemSelectedActionTest.java
@@ -14,20 +14,20 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.listview.arrowscroll;
+package android.widget.listview.arrowscroll;
 
 import android.test.ActivityInstrumentationTestCase;
 import android.test.suitebuilder.annotation.MediumTest;
 import android.widget.ListView;
 import android.widget.TextView;
 import android.view.KeyEvent;
-import com.android.frameworktest.listview.ListWithOnItemSelectedAction;
+import android.widget.listview.ListWithOnItemSelectedAction;
 
 public class ListWithOnItemSelectedActionTest extends ActivityInstrumentationTestCase<ListWithOnItemSelectedAction> {
     private ListView mListView;
 
     public ListWithOnItemSelectedActionTest() {
-        super("com.android.frameworktest", ListWithOnItemSelectedAction.class);
+        super("com.android.frameworks.coretests", ListWithOnItemSelectedAction.class);
     }
 
     @Override

core/tests/coretests/src/android/widget/listview/arrowscroll/ListWithScreenOfNoSelectablesTest.java

diff --git a/tests/FrameworkTest/tests/src/com/android/frameworktest/listview/arrowscroll/ListWithScreenOfNoSelectablesTest.java b/core/tests/coretests/src/android/widget/listview/arrowscroll/ListWithScreenOfNoSelectablesTest.java
similarity index 94%
rename from tests/FrameworkTest/tests/src/com/android/frameworktest/listview/arrowscroll/ListWithScreenOfNoSelectablesTest.java
rename to core/tests/coretests/src/android/widget/listview/arrowscroll/ListWithScreenOfNoSelectablesTest.java
index 0c0084e..8071650 100644
--- a/tests/FrameworkTest/tests/src/com/android/frameworktest/listview/arrowscroll/ListWithScreenOfNoSelectablesTest.java
+++ b/core/tests/coretests/src/android/widget/listview/arrowscroll/ListWithScreenOfNoSelectablesTest.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.listview.arrowscroll;
+package android.widget.listview.arrowscroll;
 
-import com.android.frameworktest.listview.ListWithScreenOfNoSelectables;
+import android.widget.listview.ListWithScreenOfNoSelectables;
 
 import android.test.ActivityInstrumentationTestCase;
 import android.test.suitebuilder.annotation.LargeTest;
@@ -30,7 +30,7 @@
     private ListView mListView;
 
     public ListWithScreenOfNoSelectablesTest() {
-        super("com.android.frameworktest", ListWithScreenOfNoSelectables.class);
+        super("com.android.frameworks.coretests", ListWithScreenOfNoSelectables.class);
     }
 
     @Override

core/tests/coretests/src/android/widget/listview/arrowscroll/ListWithSeparatorsTest.java

diff --git a/tests/FrameworkTest/tests/src/com/android/frameworktest/listview/arrowscroll/ListWithSeparatorsTest.java b/core/tests/coretests/src/android/widget/listview/arrowscroll/ListWithSeparatorsTest.java
similarity index 92%
rename from tests/FrameworkTest/tests/src/com/android/frameworktest/listview/arrowscroll/ListWithSeparatorsTest.java
rename to core/tests/coretests/src/android/widget/listview/arrowscroll/ListWithSeparatorsTest.java
index fdeaa4a..42058f0 100644
--- a/tests/FrameworkTest/tests/src/com/android/frameworktest/listview/arrowscroll/ListWithSeparatorsTest.java
+++ b/core/tests/coretests/src/android/widget/listview/arrowscroll/ListWithSeparatorsTest.java
@@ -14,20 +14,20 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.listview.arrowscroll;
+package android.widget.listview.arrowscroll;
 
 import android.test.ActivityInstrumentationTestCase;
 import android.test.suitebuilder.annotation.MediumTest;
 import android.widget.ListView;
 import android.view.KeyEvent;
-import com.android.frameworktest.listview.ListWithSeparators;
+import android.widget.listview.ListWithSeparators;
 
 public class ListWithSeparatorsTest extends ActivityInstrumentationTestCase<ListWithSeparators> {
     private ListWithSeparators mActivity;
     private ListView mListView;
 
     public ListWithSeparatorsTest() {
-        super("com.android.frameworktest", ListWithSeparators.class);
+        super("com.android.frameworks.coretests", ListWithSeparators.class);
     }
 
     @Override

core/tests/coretests/src/android/widget/listview/focus/AdjacentListsWithAdjacentISVsInsideTest.java

diff --git a/tests/FrameworkTest/tests/src/com/android/frameworktest/listview/focus/AdjacentListsWithAdjacentISVsInsideTest.java b/core/tests/coretests/src/android/widget/listview/focus/AdjacentListsWithAdjacentISVsInsideTest.java
similarity index 91%
rename from tests/FrameworkTest/tests/src/com/android/frameworktest/listview/focus/AdjacentListsWithAdjacentISVsInsideTest.java
rename to core/tests/coretests/src/android/widget/listview/focus/AdjacentListsWithAdjacentISVsInsideTest.java
index 2c0c2d8..461f83d 100644
--- a/tests/FrameworkTest/tests/src/com/android/frameworktest/listview/focus/AdjacentListsWithAdjacentISVsInsideTest.java
+++ b/core/tests/coretests/src/android/widget/listview/focus/AdjacentListsWithAdjacentISVsInsideTest.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.listview.focus;
+package android.widget.listview.focus;
 
-import com.android.frameworktest.listview.AdjacentListsWithAdjacentISVsInside;
-import com.android.frameworktest.util.InternalSelectionView;
+import android.widget.listview.AdjacentListsWithAdjacentISVsInside;
+import android.util.InternalSelectionView;
 
 import android.test.ActivityInstrumentationTestCase;
 import android.test.suitebuilder.annotation.MediumTest;
@@ -34,7 +34,7 @@
     private InternalSelectionView mRightIsv;
 
     public AdjacentListsWithAdjacentISVsInsideTest() {
-        super("com.android.frameworktest", AdjacentListsWithAdjacentISVsInside.class);
+        super("com.android.frameworks.coretests", AdjacentListsWithAdjacentISVsInside.class);
     }
 
     @Override

core/tests/coretests/src/android/widget/listview/focus/ListButtonsDiagonalAcrossItemsTest.java

diff --git a/tests/FrameworkTest/tests/src/com/android/frameworktest/listview/focus/ListButtonsDiagonalAcrossItemsTest.java b/core/tests/coretests/src/android/widget/listview/focus/ListButtonsDiagonalAcrossItemsTest.java
similarity index 94%
rename from tests/FrameworkTest/tests/src/com/android/frameworktest/listview/focus/ListButtonsDiagonalAcrossItemsTest.java
rename to core/tests/coretests/src/android/widget/listview/focus/ListButtonsDiagonalAcrossItemsTest.java
index c54add3..5540d65 100644
--- a/tests/FrameworkTest/tests/src/com/android/frameworktest/listview/focus/ListButtonsDiagonalAcrossItemsTest.java
+++ b/core/tests/coretests/src/android/widget/listview/focus/ListButtonsDiagonalAcrossItemsTest.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.listview.focus;
+package android.widget.listview.focus;
 
-import com.android.frameworktest.listview.ListButtonsDiagonalAcrossItems;
+import android.widget.listview.ListButtonsDiagonalAcrossItems;
 
 import android.test.ActivityInstrumentationTestCase;
 import android.test.suitebuilder.annotation.MediumTest;
@@ -38,7 +38,7 @@
     private ListView mListView;
 
     public ListButtonsDiagonalAcrossItemsTest() {
-        super("com.android.frameworktest", ListButtonsDiagonalAcrossItems.class);
+        super("com.android.frameworks.coretests", ListButtonsDiagonalAcrossItems.class);
     }
 
     @Override

core/tests/coretests/src/android/widget/listview/focus/ListHorizontalFocusWithinItemWinsTest.java

diff --git a/tests/FrameworkTest/tests/src/com/android/frameworktest/listview/focus/ListHorizontalFocusWithinItemWinsTest.java b/core/tests/coretests/src/android/widget/listview/focus/ListHorizontalFocusWithinItemWinsTest.java
similarity index 92%
rename from tests/FrameworkTest/tests/src/com/android/frameworktest/listview/focus/ListHorizontalFocusWithinItemWinsTest.java
rename to core/tests/coretests/src/android/widget/listview/focus/ListHorizontalFocusWithinItemWinsTest.java
index 35f9b06..8f971bb 100644
--- a/tests/FrameworkTest/tests/src/com/android/frameworktest/listview/focus/ListHorizontalFocusWithinItemWinsTest.java
+++ b/core/tests/coretests/src/android/widget/listview/focus/ListHorizontalFocusWithinItemWinsTest.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.listview.focus;
+package android.widget.listview.focus;
 
-import com.android.frameworktest.listview.ListHorizontalFocusWithinItemWins;
+import android.widget.listview.ListHorizontalFocusWithinItemWins;
 
 import android.test.ActivityInstrumentationTestCase;
 import android.test.suitebuilder.annotation.MediumTest;
@@ -34,7 +34,7 @@
     private Button mBottomMiddleButton;
 
     public ListHorizontalFocusWithinItemWinsTest() {
-        super("com.android.frameworktest", ListHorizontalFocusWithinItemWins.class);
+        super("com.android.frameworks.coretests", ListHorizontalFocusWithinItemWins.class);
     }
 
     @Override

core/tests/coretests/src/android/widget/listview/focus/ListWithEditTextHeaderTest.java

diff --git a/tests/FrameworkTest/tests/src/com/android/frameworktest/listview/focus/ListWithEditTextHeaderTest.java b/core/tests/coretests/src/android/widget/listview/focus/ListWithEditTextHeaderTest.java
similarity index 92%
rename from tests/FrameworkTest/tests/src/com/android/frameworktest/listview/focus/ListWithEditTextHeaderTest.java
rename to core/tests/coretests/src/android/widget/listview/focus/ListWithEditTextHeaderTest.java
index dea689f..93bddb0 100644
--- a/tests/FrameworkTest/tests/src/com/android/frameworktest/listview/focus/ListWithEditTextHeaderTest.java
+++ b/core/tests/coretests/src/android/widget/listview/focus/ListWithEditTextHeaderTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.listview.focus;
+package android.widget.listview.focus;
 
 import android.test.ActivityInstrumentationTestCase;
 import android.test.FlakyTest;
@@ -24,13 +24,13 @@
 import android.view.KeyEvent;
 import android.widget.AbsListView;
 import android.widget.ListView;
-import com.android.frameworktest.listview.ListWithEditTextHeader;
+import android.widget.listview.ListWithEditTextHeader;
 
 public class ListWithEditTextHeaderTest extends ActivityInstrumentationTestCase<ListWithEditTextHeader> {
     private ListView mListView;
 
     public ListWithEditTextHeaderTest() {
-        super("com.android.frameworktest", ListWithEditTextHeader.class);
+        super("com.android.frameworks.coretests", ListWithEditTextHeader.class);
     }
 
     @Override

core/tests/coretests/src/android/widget/listview/touch/ListGetSelectedViewTest.java

diff --git a/tests/FrameworkTest/tests/src/com/android/frameworktest/listview/touch/ListGetSelectedViewTest.java b/core/tests/coretests/src/android/widget/listview/touch/ListGetSelectedViewTest.java
similarity index 90%
rename from tests/FrameworkTest/tests/src/com/android/frameworktest/listview/touch/ListGetSelectedViewTest.java
rename to core/tests/coretests/src/android/widget/listview/touch/ListGetSelectedViewTest.java
index 3a75f93..28f899e 100644
--- a/tests/FrameworkTest/tests/src/com/android/frameworktest/listview/touch/ListGetSelectedViewTest.java
+++ b/core/tests/coretests/src/android/widget/listview/touch/ListGetSelectedViewTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.listview.touch;
+package android.widget.listview.touch;
 
 import android.test.ActivityInstrumentationTestCase;
 import android.test.suitebuilder.annotation.LargeTest;
@@ -23,7 +23,7 @@
 import android.widget.ListView;
 import android.view.View;
 
-import com.android.frameworktest.listview.ListGetSelectedView;
+import android.widget.listview.ListGetSelectedView;
 
 /**
  * This test is made to check that getSelectedView() will return
@@ -34,7 +34,7 @@
     private ListView mListView;
 
     public ListGetSelectedViewTest() {
-        super("com.android.frameworktest", ListGetSelectedView.class);
+        super("com.android.frameworks.coretests", ListGetSelectedView.class);
     }
 
     @Override

core/tests/coretests/src/android/widget/listview/touch/ListOfTouchablesTest.java

diff --git a/tests/FrameworkTest/tests/src/com/android/frameworktest/listview/touch/ListOfTouchablesTest.java b/core/tests/coretests/src/android/widget/listview/touch/ListOfTouchablesTest.java
similarity index 93%
rename from tests/FrameworkTest/tests/src/com/android/frameworktest/listview/touch/ListOfTouchablesTest.java
rename to core/tests/coretests/src/android/widget/listview/touch/ListOfTouchablesTest.java
index 39c0e45..ffa9a5e 100644
--- a/tests/FrameworkTest/tests/src/com/android/frameworktest/listview/touch/ListOfTouchablesTest.java
+++ b/core/tests/coretests/src/android/widget/listview/touch/ListOfTouchablesTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.listview.touch;
+package android.widget.listview.touch;
 
 import android.test.ActivityInstrumentationTestCase;
 import android.test.suitebuilder.annotation.LargeTest;
@@ -24,7 +24,7 @@
 import android.view.ViewConfiguration;
 import android.widget.ListView;
 
-import com.android.frameworktest.listview.ListOfTouchables;
+import android.widget.listview.ListOfTouchables;
 import android.test.TouchUtils;
 
 /**
@@ -35,7 +35,7 @@
     private ListView mListView;
 
     public ListOfTouchablesTest() {
-        super("com.android.frameworktest", ListOfTouchables.class);
+        super("com.android.frameworks.coretests", ListOfTouchables.class);
     }
 
     @Override

core/tests/coretests/src/android/widget/listview/touch/ListSetSelectionTest.java

diff --git a/tests/FrameworkTest/tests/src/com/android/frameworktest/listview/touch/ListSetSelectionTest.java b/core/tests/coretests/src/android/widget/listview/touch/ListSetSelectionTest.java
similarity index 96%
rename from tests/FrameworkTest/tests/src/com/android/frameworktest/listview/touch/ListSetSelectionTest.java
rename to core/tests/coretests/src/android/widget/listview/touch/ListSetSelectionTest.java
index c3d7264..b7733d1 100644
--- a/tests/FrameworkTest/tests/src/com/android/frameworktest/listview/touch/ListSetSelectionTest.java
+++ b/core/tests/coretests/src/android/widget/listview/touch/ListSetSelectionTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.listview.touch;
+package android.widget.listview.touch;
 
 import android.test.ActivityInstrumentationTestCase;
 import android.test.suitebuilder.annotation.LargeTest;
@@ -23,7 +23,7 @@
 import android.view.View;
 import android.widget.ListView;
 
-import com.android.frameworktest.listview.ListSimple;
+import android.widget.listview.ListSimple;
 
 /**
  * Tests setting the selection in touch mode
@@ -33,7 +33,7 @@
     private ListView mListView;
 
     public ListSetSelectionTest() {
-        super("com.android.frameworktest", ListSimple.class);
+        super("com.android.frameworks.coretests", ListSimple.class);
     }
 
     @Override

core/tests/coretests/src/android/widget/listview/touch/ListTouchBottomGravityManyTest.java

diff --git a/tests/FrameworkTest/tests/src/com/android/frameworktest/listview/touch/ListTouchBottomGravityManyTest.java b/core/tests/coretests/src/android/widget/listview/touch/ListTouchBottomGravityManyTest.java
similarity index 96%
rename from tests/FrameworkTest/tests/src/com/android/frameworktest/listview/touch/ListTouchBottomGravityManyTest.java
rename to core/tests/coretests/src/android/widget/listview/touch/ListTouchBottomGravityManyTest.java
index 4e62a4d..7daf64e 100644
--- a/tests/FrameworkTest/tests/src/com/android/frameworktest/listview/touch/ListTouchBottomGravityManyTest.java
+++ b/core/tests/coretests/src/android/widget/listview/touch/ListTouchBottomGravityManyTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.listview.touch;
+package android.widget.listview.touch;
 
 import android.test.ActivityInstrumentationTestCase;
 import android.test.suitebuilder.annotation.LargeTest;
@@ -25,7 +25,7 @@
 import android.view.ViewConfiguration;
 import android.widget.ListView;
 
-import com.android.frameworktest.listview.ListBottomGravityMany;
+import android.widget.listview.ListBottomGravityMany;
 
 /**
  * Touch tests for a list where all of the items do not fit on the screen, and the list 
@@ -36,7 +36,7 @@
     private ListView mListView;
 
     public ListTouchBottomGravityManyTest() {
-        super("com.android.frameworktest", ListBottomGravityMany.class);
+        super("com.android.frameworks.coretests", ListBottomGravityMany.class);
     }
 
     @Override

core/tests/coretests/src/android/widget/listview/touch/ListTouchBottomGravityTest.java

diff --git a/tests/FrameworkTest/tests/src/com/android/frameworktest/listview/touch/ListTouchBottomGravityTest.java b/core/tests/coretests/src/android/widget/listview/touch/ListTouchBottomGravityTest.java
similarity index 94%
rename from tests/FrameworkTest/tests/src/com/android/frameworktest/listview/touch/ListTouchBottomGravityTest.java
rename to core/tests/coretests/src/android/widget/listview/touch/ListTouchBottomGravityTest.java
index 78d39fb..4086cf0 100644
--- a/tests/FrameworkTest/tests/src/com/android/frameworktest/listview/touch/ListTouchBottomGravityTest.java
+++ b/core/tests/coretests/src/android/widget/listview/touch/ListTouchBottomGravityTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.listview.touch;
+package android.widget.listview.touch;
 
 import android.test.ActivityInstrumentationTestCase;
 import android.test.suitebuilder.annotation.MediumTest;
@@ -22,7 +22,7 @@
 import android.view.View;
 import android.widget.ListView;
 
-import com.android.frameworktest.listview.ListBottomGravity;
+import android.widget.listview.ListBottomGravity;
 
 /**
  * Touch tests for a list where all of the items fit on the screen, and the list 
@@ -33,7 +33,7 @@
     private ListView mListView;
 
     public ListTouchBottomGravityTest() {
-        super("com.android.frameworktest", ListBottomGravity.class);
+        super("com.android.frameworks.coretests", ListBottomGravity.class);
     }
 
     @Override

core/tests/coretests/src/android/widget/listview/touch/ListTouchManyTest.java

diff --git a/tests/FrameworkTest/tests/src/com/android/frameworktest/listview/touch/ListTouchManyTest.java b/core/tests/coretests/src/android/widget/listview/touch/ListTouchManyTest.java
similarity index 97%
rename from tests/FrameworkTest/tests/src/com/android/frameworktest/listview/touch/ListTouchManyTest.java
rename to core/tests/coretests/src/android/widget/listview/touch/ListTouchManyTest.java
index 3066d8d..30d56ca 100644
--- a/tests/FrameworkTest/tests/src/com/android/frameworktest/listview/touch/ListTouchManyTest.java
+++ b/core/tests/coretests/src/android/widget/listview/touch/ListTouchManyTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.listview.touch;
+package android.widget.listview.touch;
 
 import android.test.ActivityInstrumentationTestCase;
 import android.test.suitebuilder.annotation.LargeTest;
@@ -25,7 +25,7 @@
 import android.view.ViewConfiguration;
 import android.widget.ListView;
 
-import com.android.frameworktest.listview.ListTopGravityMany;
+import android.widget.listview.ListTopGravityMany;
 
 /**
  * Touch tests for a list where all of the items do not fit on the screen.
@@ -35,7 +35,7 @@
     private ListView mListView;
 
     public ListTouchManyTest() {
-        super("com.android.frameworktest", ListTopGravityMany.class);
+        super("com.android.frameworks.coretests", ListTopGravityMany.class);
     }
 
     @Override

core/tests/coretests/src/android/widget/listview/touch/ListTouchTest.java

diff --git a/tests/FrameworkTest/tests/src/com/android/frameworktest/listview/touch/ListTouchTest.java b/core/tests/coretests/src/android/widget/listview/touch/ListTouchTest.java
similarity index 93%
rename from tests/FrameworkTest/tests/src/com/android/frameworktest/listview/touch/ListTouchTest.java
rename to core/tests/coretests/src/android/widget/listview/touch/ListTouchTest.java
index 4e5c423..5b064b3 100644
--- a/tests/FrameworkTest/tests/src/com/android/frameworktest/listview/touch/ListTouchTest.java
+++ b/core/tests/coretests/src/android/widget/listview/touch/ListTouchTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.listview.touch;
+package android.widget.listview.touch;
 
 import android.test.ActivityInstrumentationTestCase;
 import android.test.suitebuilder.annotation.MediumTest;
@@ -22,7 +22,7 @@
 import android.view.View;
 import android.widget.ListView;
 
-import com.android.frameworktest.listview.ListTopGravity;
+import android.widget.listview.ListTopGravity;
 
 /**
  * Touch tests for a list where all of the items fit on the screen.
@@ -32,7 +32,7 @@
     private ListView mListView;
 
     public ListTouchTest() {
-        super("com.android.frameworktest", ListTopGravity.class);
+        super("com.android.frameworks.coretests", ListTopGravity.class);
     }
 
     @Override

core/tests/coretests/src/android/widget/scroll/ButtonAboveTallInternalSelectionView.java

diff --git a/tests/FrameworkTest/src/com/android/frameworktest/scroll/ButtonAboveTallInternalSelectionView.java b/core/tests/coretests/src/android/widget/scroll/ButtonAboveTallInternalSelectionView.java
similarity index 88%
rename from tests/FrameworkTest/src/com/android/frameworktest/scroll/ButtonAboveTallInternalSelectionView.java
rename to core/tests/coretests/src/android/widget/scroll/ButtonAboveTallInternalSelectionView.java
index 986b800..a7f5c05 100644
--- a/tests/FrameworkTest/src/com/android/frameworktest/scroll/ButtonAboveTallInternalSelectionView.java
+++ b/core/tests/coretests/src/android/widget/scroll/ButtonAboveTallInternalSelectionView.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.scroll;
+package android.widget.scroll;
 
-import com.android.frameworktest.util.InternalSelectionView;
-import com.android.frameworktest.util.ScrollViewScenario;
+import android.util.InternalSelectionView;
+import android.util.ScrollViewScenario;
 
 import android.widget.Button;
 

core/tests/coretests/src/android/widget/scroll/ButtonAboveTallInternalSelectionViewTest.java

diff --git a/tests/FrameworkTest/tests/src/com/android/frameworktest/scroll/ButtonAboveTallInternalSelectionViewTest.java b/core/tests/coretests/src/android/widget/scroll/ButtonAboveTallInternalSelectionViewTest.java
similarity index 88%
rename from tests/FrameworkTest/tests/src/com/android/frameworktest/scroll/ButtonAboveTallInternalSelectionViewTest.java
rename to core/tests/coretests/src/android/widget/scroll/ButtonAboveTallInternalSelectionViewTest.java
index e4dd2b8..41123280 100644
--- a/tests/FrameworkTest/tests/src/com/android/frameworktest/scroll/ButtonAboveTallInternalSelectionViewTest.java
+++ b/core/tests/coretests/src/android/widget/scroll/ButtonAboveTallInternalSelectionViewTest.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.scroll;
+package android.widget.scroll;
 
-import com.android.frameworktest.scroll.ButtonAboveTallInternalSelectionView;
-import com.android.frameworktest.util.InternalSelectionView;
+import android.widget.scroll.ButtonAboveTallInternalSelectionView;
+import android.util.InternalSelectionView;
 
 import android.test.ActivityInstrumentationTestCase;
 import android.test.suitebuilder.annotation.MediumTest;
@@ -27,7 +27,7 @@
         ActivityInstrumentationTestCase<ButtonAboveTallInternalSelectionView> {
 
     public ButtonAboveTallInternalSelectionViewTest() {
-        super("com.android.frameworktest", ButtonAboveTallInternalSelectionView.class);
+        super("com.android.frameworks.coretests", ButtonAboveTallInternalSelectionView.class);
     }
 
     @MediumTest

core/tests/coretests/src/android/widget/scroll/ButtonsWithTallTextViewInBetween.java

diff --git a/tests/FrameworkTest/src/com/android/frameworktest/scroll/ButtonsWithTallTextViewInBetween.java b/core/tests/coretests/src/android/widget/scroll/ButtonsWithTallTextViewInBetween.java
similarity index 93%
rename from tests/FrameworkTest/src/com/android/frameworktest/scroll/ButtonsWithTallTextViewInBetween.java
rename to core/tests/coretests/src/android/widget/scroll/ButtonsWithTallTextViewInBetween.java
index ed098aa..3d5f86d 100644
--- a/tests/FrameworkTest/src/com/android/frameworktest/scroll/ButtonsWithTallTextViewInBetween.java
+++ b/core/tests/coretests/src/android/widget/scroll/ButtonsWithTallTextViewInBetween.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.scroll;
+package android.widget.scroll;
 
-import com.android.frameworktest.util.ScrollViewScenario;
+import android.util.ScrollViewScenario;
 
 import android.widget.Button;
 import android.widget.LinearLayout;

core/tests/coretests/src/android/widget/scroll/RequestRectangleVisible.java

diff --git a/tests/FrameworkTest/src/com/android/frameworktest/scroll/RequestRectangleVisible.java b/core/tests/coretests/src/android/widget/scroll/RequestRectangleVisible.java
similarity index 97%
rename from tests/FrameworkTest/src/com/android/frameworktest/scroll/RequestRectangleVisible.java
rename to core/tests/coretests/src/android/widget/scroll/RequestRectangleVisible.java
index affd3c7..9cc8544 100644
--- a/tests/FrameworkTest/src/com/android/frameworktest/scroll/RequestRectangleVisible.java
+++ b/core/tests/coretests/src/android/widget/scroll/RequestRectangleVisible.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.scroll;
+package android.widget.scroll;
 
-import com.android.frameworktest.R;
+import com.android.frameworks.coretests.R;
 
 import android.app.Activity;
 import android.os.Bundle;

core/tests/coretests/src/android/widget/scroll/RequestRectangleVisibleTest.java

diff --git a/tests/FrameworkTest/tests/src/com/android/frameworktest/scroll/RequestRectangleVisibleTest.java b/core/tests/coretests/src/android/widget/scroll/RequestRectangleVisibleTest.java
similarity index 96%
rename from tests/FrameworkTest/tests/src/com/android/frameworktest/scroll/RequestRectangleVisibleTest.java
rename to core/tests/coretests/src/android/widget/scroll/RequestRectangleVisibleTest.java
index 3eec37b..95fb00b 100644
--- a/tests/FrameworkTest/tests/src/com/android/frameworktest/scroll/RequestRectangleVisibleTest.java
+++ b/core/tests/coretests/src/android/widget/scroll/RequestRectangleVisibleTest.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.scroll;
+package android.widget.scroll;
 
-import com.android.frameworktest.scroll.RequestRectangleVisible;
-import com.android.frameworktest.R;
+import android.widget.scroll.RequestRectangleVisible;
+import com.android.frameworks.coretests.R;
 
 import android.test.ActivityInstrumentationTestCase;
 import android.test.suitebuilder.annotation.LargeTest;
@@ -48,7 +48,7 @@
     private Button mClickToScrollFromBelow;
 
     public RequestRectangleVisibleTest() {
-        super("com.android.frameworktest", RequestRectangleVisible.class);
+        super("com.android.frameworks.coretests", RequestRectangleVisible.class);
     }
 
     @Override

core/tests/coretests/src/android/widget/scroll/RequestRectangleVisibleWithInternalScroll.java

diff --git a/tests/FrameworkTest/src/com/android/frameworktest/scroll/RequestRectangleVisibleWithInternalScroll.java b/core/tests/coretests/src/android/widget/scroll/RequestRectangleVisibleWithInternalScroll.java
similarity index 95%
rename from tests/FrameworkTest/src/com/android/frameworktest/scroll/RequestRectangleVisibleWithInternalScroll.java
rename to core/tests/coretests/src/android/widget/scroll/RequestRectangleVisibleWithInternalScroll.java
index 0a8dc30..0e2586d 100644
--- a/tests/FrameworkTest/src/com/android/frameworktest/scroll/RequestRectangleVisibleWithInternalScroll.java
+++ b/core/tests/coretests/src/android/widget/scroll/RequestRectangleVisibleWithInternalScroll.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.scroll;
+package android.widget.scroll;
 
-import com.android.frameworktest.R;
+import com.android.frameworks.coretests.R;
 
 import android.app.Activity;
 import android.os.Bundle;

core/tests/coretests/src/android/widget/scroll/RequestRectangleVisibleWithInternalScrollTest.java

diff --git a/tests/FrameworkTest/tests/src/com/android/frameworktest/scroll/RequestRectangleVisibleWithInternalScrollTest.java b/core/tests/coretests/src/android/widget/scroll/RequestRectangleVisibleWithInternalScrollTest.java
similarity index 95%
rename from tests/FrameworkTest/tests/src/com/android/frameworktest/scroll/RequestRectangleVisibleWithInternalScrollTest.java
rename to core/tests/coretests/src/android/widget/scroll/RequestRectangleVisibleWithInternalScrollTest.java
index 5d71466..5e9b520 100644
--- a/tests/FrameworkTest/tests/src/com/android/frameworktest/scroll/RequestRectangleVisibleWithInternalScrollTest.java
+++ b/core/tests/coretests/src/android/widget/scroll/RequestRectangleVisibleWithInternalScrollTest.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.scroll;
+package android.widget.scroll;
 
-import com.android.frameworktest.R;
+import com.android.frameworks.coretests.R;
 
 import android.test.ActivityInstrumentationTestCase;
 import android.test.ViewAsserts;
@@ -40,7 +40,7 @@
 
 
     public RequestRectangleVisibleWithInternalScrollTest() {
-        super("com.android.frameworktest",
+        super("com.android.frameworks.coretests",
                 RequestRectangleVisibleWithInternalScroll.class);
     }
 

core/tests/coretests/src/android/widget/scroll/ScrollViewButtonsAndLabels.java

diff --git a/tests/FrameworkTest/src/com/android/frameworktest/scroll/ScrollViewButtonsAndLabels.java b/core/tests/coretests/src/android/widget/scroll/ScrollViewButtonsAndLabels.java
similarity index 96%
rename from tests/FrameworkTest/src/com/android/frameworktest/scroll/ScrollViewButtonsAndLabels.java
rename to core/tests/coretests/src/android/widget/scroll/ScrollViewButtonsAndLabels.java
index 2d3be2e..4d0892c 100644
--- a/tests/FrameworkTest/src/com/android/frameworktest/scroll/ScrollViewButtonsAndLabels.java
+++ b/core/tests/coretests/src/android/widget/scroll/ScrollViewButtonsAndLabels.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.scroll;
+package android.widget.scroll;
 
-import com.android.frameworktest.R;
+import com.android.frameworks.coretests.R;
 
 import android.app.Activity;
 import android.os.Bundle;

core/tests/coretests/src/android/widget/scroll/ScrollViewButtonsAndLabelsTest.java

diff --git a/tests/FrameworkTest/tests/src/com/android/frameworktest/scroll/ScrollViewButtonsAndLabelsTest.java b/core/tests/coretests/src/android/widget/scroll/ScrollViewButtonsAndLabelsTest.java
similarity index 97%
rename from tests/FrameworkTest/tests/src/com/android/frameworktest/scroll/ScrollViewButtonsAndLabelsTest.java
rename to core/tests/coretests/src/android/widget/scroll/ScrollViewButtonsAndLabelsTest.java
index b23b567..7efb9aa 100644
--- a/tests/FrameworkTest/tests/src/com/android/frameworktest/scroll/ScrollViewButtonsAndLabelsTest.java
+++ b/core/tests/coretests/src/android/widget/scroll/ScrollViewButtonsAndLabelsTest.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.scroll;
+package android.widget.scroll;
 
-import com.android.frameworktest.scroll.ScrollViewButtonsAndLabels;
+import android.widget.scroll.ScrollViewButtonsAndLabels;
 
 import android.test.ActivityInstrumentationTestCase;
 import android.test.suitebuilder.annotation.LargeTest;
@@ -36,7 +36,7 @@
     private int mScreenTop;
 
     public ScrollViewButtonsAndLabelsTest() {
-        super("com.android.frameworktest",
+        super("com.android.frameworks.coretests",
               ScrollViewButtonsAndLabels.class);
     }
 

core/tests/coretests/src/android/widget/scroll/ShortButtons.java

diff --git a/tests/FrameworkTest/src/com/android/frameworktest/scroll/ShortButtons.java b/core/tests/coretests/src/android/widget/scroll/ShortButtons.java
similarity index 93%
rename from tests/FrameworkTest/src/com/android/frameworktest/scroll/ShortButtons.java
rename to core/tests/coretests/src/android/widget/scroll/ShortButtons.java
index b903382..3a0f29a 100644
--- a/tests/FrameworkTest/src/com/android/frameworktest/scroll/ShortButtons.java
+++ b/core/tests/coretests/src/android/widget/scroll/ShortButtons.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.scroll;
+package android.widget.scroll;
 
-import com.android.frameworktest.util.ScrollViewScenario;
+import android.util.ScrollViewScenario;
 
 import android.widget.Button;
 import android.widget.LinearLayout;

core/tests/coretests/src/android/widget/scroll/TallTextAboveButton.java

diff --git a/tests/FrameworkTest/src/com/android/frameworktest/scroll/TallTextAboveButton.java b/core/tests/coretests/src/android/widget/scroll/TallTextAboveButton.java
similarity index 89%
rename from tests/FrameworkTest/src/com/android/frameworktest/scroll/TallTextAboveButton.java
rename to core/tests/coretests/src/android/widget/scroll/TallTextAboveButton.java
index 8b2e4f9..4096fe9 100644
--- a/tests/FrameworkTest/src/com/android/frameworktest/scroll/TallTextAboveButton.java
+++ b/core/tests/coretests/src/android/widget/scroll/TallTextAboveButton.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.scroll;
+package android.widget.scroll;
 
-import com.android.frameworktest.util.ScrollViewScenario;
+import android.util.ScrollViewScenario;
 
 /**
  * An (unfocusable) text view that takes up more than the height

core/tests/coretests/src/android/widget/scroll/arrowscroll/ButtonsWithTallTextViewInBetweenTest.java

diff --git a/tests/FrameworkTest/tests/src/com/android/frameworktest/scroll/arrowscroll/ButtonsWithTallTextViewInBetweenTest.java b/core/tests/coretests/src/android/widget/scroll/arrowscroll/ButtonsWithTallTextViewInBetweenTest.java
similarity index 95%
rename from tests/FrameworkTest/tests/src/com/android/frameworktest/scroll/arrowscroll/ButtonsWithTallTextViewInBetweenTest.java
rename to core/tests/coretests/src/android/widget/scroll/arrowscroll/ButtonsWithTallTextViewInBetweenTest.java
index 6b78560..56d7ed2 100644
--- a/tests/FrameworkTest/tests/src/com/android/frameworktest/scroll/arrowscroll/ButtonsWithTallTextViewInBetweenTest.java
+++ b/core/tests/coretests/src/android/widget/scroll/arrowscroll/ButtonsWithTallTextViewInBetweenTest.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.scroll.arrowscroll;
+package android.widget.scroll.arrowscroll;
 
-import com.android.frameworktest.scroll.ButtonsWithTallTextViewInBetween;
+import android.widget.scroll.ButtonsWithTallTextViewInBetween;
 
 import android.graphics.Rect;
 import android.test.ActivityInstrumentationTestCase;
@@ -36,7 +36,7 @@
     private TextView mBottomButton;
 
     public ButtonsWithTallTextViewInBetweenTest() {
-        super("com.android.frameworktest", ButtonsWithTallTextViewInBetween.class);
+        super("com.android.frameworks.coretests", ButtonsWithTallTextViewInBetween.class);
     }
 
     @Override

core/tests/coretests/src/android/widget/scroll/arrowscroll/ShortButtonsTest.java

diff --git a/tests/FrameworkTest/tests/src/com/android/frameworktest/scroll/arrowscroll/ShortButtonsTest.java b/core/tests/coretests/src/android/widget/scroll/arrowscroll/ShortButtonsTest.java
similarity index 95%
rename from tests/FrameworkTest/tests/src/com/android/frameworktest/scroll/arrowscroll/ShortButtonsTest.java
rename to core/tests/coretests/src/android/widget/scroll/arrowscroll/ShortButtonsTest.java
index 689eb19..267d8ee 100644
--- a/tests/FrameworkTest/tests/src/com/android/frameworktest/scroll/arrowscroll/ShortButtonsTest.java
+++ b/core/tests/coretests/src/android/widget/scroll/arrowscroll/ShortButtonsTest.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.scroll.arrowscroll;
+package android.widget.scroll.arrowscroll;
 
-import com.android.frameworktest.scroll.ShortButtons;
+import android.widget.scroll.ShortButtons;
 
 import android.graphics.Rect;
 import android.test.ActivityInstrumentationTestCase;
@@ -31,7 +31,7 @@
     private ScrollView mScrollView;
 
     public ShortButtonsTest() {
-        super("com.android.frameworktest", ShortButtons.class);
+        super("com.android.frameworks.coretests", ShortButtons.class);
     }
 
     @Override

core/tests/coretests/src/android/widget/scroll/arrowscroll/TallTextAboveButtonTest.java

diff --git a/tests/FrameworkTest/tests/src/com/android/frameworktest/scroll/arrowscroll/TallTextAboveButtonTest.java b/core/tests/coretests/src/android/widget/scroll/arrowscroll/TallTextAboveButtonTest.java
similarity index 93%
rename from tests/FrameworkTest/tests/src/com/android/frameworktest/scroll/arrowscroll/TallTextAboveButtonTest.java
rename to core/tests/coretests/src/android/widget/scroll/arrowscroll/TallTextAboveButtonTest.java
index 573045d..5351839 100644
--- a/tests/FrameworkTest/tests/src/com/android/frameworktest/scroll/arrowscroll/TallTextAboveButtonTest.java
+++ b/core/tests/coretests/src/android/widget/scroll/arrowscroll/TallTextAboveButtonTest.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.scroll.arrowscroll;
+package android.widget.scroll.arrowscroll;
 
-import com.android.frameworktest.scroll.TallTextAboveButton;
+import android.widget.scroll.TallTextAboveButton;
 
 import android.test.ActivityInstrumentationTestCase;
 import android.test.suitebuilder.annotation.MediumTest;
@@ -39,7 +39,7 @@
     }
 
     public TallTextAboveButtonTest() {
-        super("com.android.frameworktest", TallTextAboveButton.class);
+        super("com.android.frameworks.coretests", TallTextAboveButton.class);
     }
 
     @MediumTest

core/tests/coretests/src/android/widget/touchmode/ChangeTouchModeTest.java

diff --git a/tests/FrameworkTest/tests/src/com/android/frameworktest/touchmode/ChangeTouchModeTest.java b/core/tests/coretests/src/android/widget/touchmode/ChangeTouchModeTest.java
similarity index 82%
rename from tests/FrameworkTest/tests/src/com/android/frameworktest/touchmode/ChangeTouchModeTest.java
rename to core/tests/coretests/src/android/widget/touchmode/ChangeTouchModeTest.java
index d274d0d..449c95c 100644
--- a/tests/FrameworkTest/tests/src/com/android/frameworktest/touchmode/ChangeTouchModeTest.java
+++ b/core/tests/coretests/src/android/widget/touchmode/ChangeTouchModeTest.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.touchmode;
+package android.widget.touchmode;
 
-import com.android.frameworktest.layout.linear.LLOfButtons1;
-import com.android.frameworktest.layout.linear.LLOfButtons2;
-import static com.android.frameworktest.util.TouchModeFlexibleAsserts.assertInTouchModeAfterClick;
-import static com.android.frameworktest.util.TouchModeFlexibleAsserts.assertNotInTouchModeAfterKey;
-import static com.android.frameworktest.util.TouchModeFlexibleAsserts.assertInTouchModeAfterTap;
+import android.widget.layout.linear.LLOfButtons1;
+import android.widget.layout.linear.LLOfButtons2;
+import static android.util.TouchModeFlexibleAsserts.assertInTouchModeAfterClick;
+import static android.util.TouchModeFlexibleAsserts.assertNotInTouchModeAfterKey;
+import static android.util.TouchModeFlexibleAsserts.assertInTouchModeAfterTap;
 
 import android.test.ActivityInstrumentationTestCase;
 import android.test.suitebuilder.annotation.LargeTest;
@@ -34,7 +34,7 @@
 public class ChangeTouchModeTest extends ActivityInstrumentationTestCase<LLOfButtons1> {
 
     public ChangeTouchModeTest() {
-        super("com.android.frameworktest", LLOfButtons1.class);
+        super("com.android.frameworks.coretests", LLOfButtons1.class);
     }
 
     @Override
@@ -73,7 +73,7 @@
         LLOfButtons2 otherActivity = null;
         try {
             otherActivity =
-                    launchActivity("com.android.frameworktest", LLOfButtons2.class, null);
+                    launchActivity("com.android.frameworks.coretests", LLOfButtons2.class, null);
             assertNotNull(otherActivity);
             assertFalse(otherActivity.isInTouchMode());
         } finally {
@@ -89,7 +89,7 @@
         LLOfButtons2 otherActivity = null;
         try {
             otherActivity =
-                    launchActivity("com.android.frameworktest", LLOfButtons2.class, null);
+                    launchActivity("com.android.frameworks.coretests", LLOfButtons2.class, null);
             assertNotNull(otherActivity);
             assertTrue(otherActivity.isInTouchMode());
         } finally {
@@ -107,7 +107,7 @@
         LLOfButtons2 otherActivity = null;
         try {
             otherActivity =
-                    launchActivity("com.android.frameworktest", LLOfButtons2.class, null);
+                    launchActivity("com.android.frameworks.coretests", LLOfButtons2.class, null);
             assertNotNull(otherActivity);
             assertFalse(otherActivity.isInTouchMode());
             assertInTouchModeAfterClick(this, otherActivity.getFirstButton());

core/tests/coretests/src/android/widget/touchmode/FocusableInTouchModeClickTest.java

diff --git a/tests/FrameworkTest/tests/src/com/android/frameworktest/touchmode/FocusableInTouchModeClickTest.java b/core/tests/coretests/src/android/widget/touchmode/FocusableInTouchModeClickTest.java
similarity index 91%
rename from tests/FrameworkTest/tests/src/com/android/frameworktest/touchmode/FocusableInTouchModeClickTest.java
rename to core/tests/coretests/src/android/widget/touchmode/FocusableInTouchModeClickTest.java
index 7cd6444..691b25a 100644
--- a/tests/FrameworkTest/tests/src/com/android/frameworktest/touchmode/FocusableInTouchModeClickTest.java
+++ b/core/tests/coretests/src/android/widget/touchmode/FocusableInTouchModeClickTest.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.touchmode;
+package android.widget.touchmode;
 
-import com.android.frameworktest.layout.linear.LLOfTwoFocusableInTouchMode;
+import android.widget.layout.linear.LLOfTwoFocusableInTouchMode;
 
 import android.test.ActivityInstrumentationTestCase2;
 import android.test.TouchUtils;
@@ -26,7 +26,7 @@
 public class FocusableInTouchModeClickTest extends ActivityInstrumentationTestCase2<LLOfTwoFocusableInTouchMode> {
 
     public FocusableInTouchModeClickTest() {
-        super("com.android.frameworktest", LLOfTwoFocusableInTouchMode.class);
+        super("com.android.frameworks.coretests", LLOfTwoFocusableInTouchMode.class);
     }
 
     protected void setUp() throws Exception {

core/tests/coretests/src/android/widget/touchmode/StartInTouchWithViewInFocusTest.java

diff --git a/tests/FrameworkTest/tests/src/com/android/frameworktest/touchmode/StartInTouchWithViewInFocusTest.java b/core/tests/coretests/src/android/widget/touchmode/StartInTouchWithViewInFocusTest.java
similarity index 88%
rename from tests/FrameworkTest/tests/src/com/android/frameworktest/touchmode/StartInTouchWithViewInFocusTest.java
rename to core/tests/coretests/src/android/widget/touchmode/StartInTouchWithViewInFocusTest.java
index 6403435..5339188 100644
--- a/tests/FrameworkTest/tests/src/com/android/frameworktest/touchmode/StartInTouchWithViewInFocusTest.java
+++ b/core/tests/coretests/src/android/widget/touchmode/StartInTouchWithViewInFocusTest.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.touchmode;
+package android.widget.touchmode;
 
-import com.android.frameworktest.layout.linear.LLEditTextThenButton;
-import static com.android.frameworktest.util.TouchModeFlexibleAsserts.assertNotInTouchModeAfterKey;
+import android.widget.layout.linear.LLEditTextThenButton;
+import static android.util.TouchModeFlexibleAsserts.assertNotInTouchModeAfterKey;
 
 import android.test.ActivityInstrumentationTestCase2;
 import android.test.suitebuilder.annotation.MediumTest;
@@ -33,7 +33,7 @@
     private Button mButton;
 
     public StartInTouchWithViewInFocusTest() {
-        super("com.android.frameworktest", LLEditTextThenButton.class);
+        super("com.android.frameworks.coretests", LLEditTextThenButton.class);
     }
 
     @Override

core/tests/coretests/src/android/widget/touchmode/TouchModeFocusChangeTest.java

diff --git a/tests/FrameworkTest/tests/src/com/android/frameworktest/touchmode/TouchModeFocusChangeTest.java b/core/tests/coretests/src/android/widget/touchmode/TouchModeFocusChangeTest.java
similarity index 85%
rename from tests/FrameworkTest/tests/src/com/android/frameworktest/touchmode/TouchModeFocusChangeTest.java
rename to core/tests/coretests/src/android/widget/touchmode/TouchModeFocusChangeTest.java
index 1a0c833..bd6977e 100644
--- a/tests/FrameworkTest/tests/src/com/android/frameworktest/touchmode/TouchModeFocusChangeTest.java
+++ b/core/tests/coretests/src/android/widget/touchmode/TouchModeFocusChangeTest.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.touchmode;
+package android.widget.touchmode;
 
-import com.android.frameworktest.layout.linear.LLOfButtons1;
-import static com.android.frameworktest.util.TouchModeFlexibleAsserts.assertInTouchModeAfterClick;
-import static com.android.frameworktest.util.TouchModeFlexibleAsserts.assertInTouchModeAfterTap;
-import static com.android.frameworktest.util.TouchModeFlexibleAsserts.assertNotInTouchModeAfterKey;
+import android.widget.layout.linear.LLOfButtons1;
+import static android.util.TouchModeFlexibleAsserts.assertInTouchModeAfterClick;
+import static android.util.TouchModeFlexibleAsserts.assertInTouchModeAfterTap;
+import static android.util.TouchModeFlexibleAsserts.assertNotInTouchModeAfterKey;
 
 import android.test.ActivityInstrumentationTestCase;
 import android.test.suitebuilder.annotation.MediumTest;
@@ -37,7 +37,7 @@
     private Button mFirstButton;
 
     public TouchModeFocusChangeTest() {
-        super("com.android.frameworktest", LLOfButtons1.class);
+        super("com.android.frameworks.coretests", LLOfButtons1.class);
     }
 
 

core/tests/coretests/src/android/widget/touchmode/TouchModeFocusableTest.java

diff --git a/tests/FrameworkTest/tests/src/com/android/frameworktest/touchmode/TouchModeFocusableTest.java b/core/tests/coretests/src/android/widget/touchmode/TouchModeFocusableTest.java
similarity index 88%
rename from tests/FrameworkTest/tests/src/com/android/frameworktest/touchmode/TouchModeFocusableTest.java
rename to core/tests/coretests/src/android/widget/touchmode/TouchModeFocusableTest.java
index 86925b5..dd07a08 100644
--- a/tests/FrameworkTest/tests/src/com/android/frameworktest/touchmode/TouchModeFocusableTest.java
+++ b/core/tests/coretests/src/android/widget/touchmode/TouchModeFocusableTest.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package com.android.frameworktest.touchmode;
+package android.widget.touchmode;
 
-import com.android.frameworktest.layout.linear.LLEditTextThenButton;
-import static com.android.frameworktest.util.TouchModeFlexibleAsserts.assertInTouchModeAfterTap;
-import static com.android.frameworktest.util.TouchModeFlexibleAsserts.assertInTouchModeAfterClick;
+import android.widget.layout.linear.LLEditTextThenButton;
+import static android.util.TouchModeFlexibleAsserts.assertInTouchModeAfterTap;
+import static android.util.TouchModeFlexibleAsserts.assertInTouchModeAfterClick;
 
 import android.test.ActivityInstrumentationTestCase;
 import android.test.suitebuilder.annotation.LargeTest;
@@ -36,7 +36,7 @@
 
 
     public TouchModeFocusableTest() {
-        super("com.android.frameworktest", LLEditTextThenButton.class);
+        super("com.android.frameworks.coretests", LLEditTextThenButton.class);
     }
 
     @Override

graphics/java/android/graphics/YuvImage.java

diff --git a/graphics/java/android/graphics/YuvImage.java b/graphics/java/android/graphics/YuvImage.java
index 4a3bd47..09b4bf4 100644
--- a/graphics/java/android/graphics/YuvImage.java
+++ b/graphics/java/android/graphics/YuvImage.java
@@ -19,8 +19,6 @@
 import java.io.OutputStream;
 
 /**
- * @hide pending API council approval
- *
  * YuvImage contains YUV data and provides a method that compresses a region of
  * the YUV data to a Jpeg. The YUV data should be provided as a single byte
  * array irrespective of the number of image planes in it. The stride of each

include/media/stagefright/HTTPDataSource.h

diff --git a/include/media/stagefright/HTTPDataSource.h b/include/media/stagefright/HTTPDataSource.h
index 3075f1c..42444dc 100644
--- a/include/media/stagefright/HTTPDataSource.h
+++ b/include/media/stagefright/HTTPDataSource.h
@@ -53,6 +53,7 @@
     void *mBuffer;
     size_t mBufferLength;
     off_t mBufferOffset;
+    bool mFirstRequest;
 
     status_t mInitCheck;
 

media/libstagefright/HTTPDataSource.cpp

diff --git a/media/libstagefright/HTTPDataSource.cpp b/media/libstagefright/HTTPDataSource.cpp
index 135a044..cf189af 100644
--- a/media/libstagefright/HTTPDataSource.cpp
+++ b/media/libstagefright/HTTPDataSource.cpp
@@ -24,6 +24,8 @@
 
 namespace android {
 
+static const char *kUserAgent = "stagefright-http";
+
 // Given a connected HTTPStream, determine if the given path redirects
 // somewhere else, if so, disconnect the stream, update host path and port
 // accordingly and return true, otherwise return false and leave the stream
@@ -34,6 +36,9 @@
     request.append("HEAD ");
     request.append(path->c_str());
     request.append(" HTTP/1.1\r\n");
+    request.append("User-Agent: ");
+    request.append(kUserAgent);
+    request.append("\r\n");
     request.append("Host: ");
     request.append(host->c_str());
     request.append("\r\n\r\n");
@@ -78,6 +83,8 @@
         CHECK(end > start && (*end == '\0'));
 
         *port = (tmp >= 0 && tmp < 65536) ? (int)tmp : 80;
+
+        host->erase(colonPos, host->size() - colonPos);
     } else {
         *port = 80;
     }
@@ -94,7 +101,8 @@
       mPath(NULL),
       mBuffer(malloc(kBufferSize)),
       mBufferLength(0),
-      mBufferOffset(0) {
+      mBufferOffset(0),
+      mFirstRequest(true) {
     CHECK(!strncasecmp("http://", uri, 7));
 
     string host;
@@ -123,10 +131,10 @@
         host = string(host, 0, colon - host.c_str());
     }
 
-    LOGI("Connecting to host '%s', port %d, path '%s'",
-         host.c_str(), port, path.c_str());
-
     do {
+        LOGI("Connecting to host '%s', port %d, path '%s'",
+             host.c_str(), port, path.c_str());
+
         mInitCheck = mHttp->connect(host.c_str(), port);
 
         if (mInitCheck != OK) {
@@ -146,7 +154,8 @@
       mPath(NULL),
       mBuffer(malloc(kBufferSize)),
       mBufferLength(0),
-      mBufferOffset(0) {
+      mBufferOffset(0),
+      mFirstRequest(true) {
     string host = _host;
     string path = _path;
 
@@ -191,11 +200,18 @@
 }
 
 ssize_t HTTPDataSource::sendRangeRequest(size_t offset) {
+    char agent[128];
+    sprintf(agent, "User-Agent: %s\r\n", kUserAgent);
+
     char host[128];
     sprintf(host, "Host: %s\r\n", mHost);
 
     char range[128];
-    sprintf(range, "Range: bytes=%d-\r\n\r\n", offset);
+    if (offset > 0) {
+        sprintf(range, "Range: bytes=%d-\r\n\r\n", offset);
+    } else {
+        range[0] = '\0';
+    }
 
     int http_status;
 
@@ -205,6 +221,7 @@
         if ((err = mHttp->send("GET ")) != OK
             || (err = mHttp->send(mPath)) != OK
             || (err = mHttp->send(" HTTP/1.1\r\n")) != OK
+            || (err = mHttp->send(agent)) != OK
             || (err = mHttp->send(host)) != OK
             || (err = mHttp->send(range)) != OK
             || (err = mHttp->send("\r\n")) != OK
@@ -227,7 +244,7 @@
 
     string value;
     if (!mHttp->find_header_value("Content-Length", &value)) {
-        return UNKNOWN_ERROR;
+        return kBufferSize;
     }
 
     char *end;
@@ -252,8 +269,12 @@
     }
 
     ssize_t contentLength = 0;
-    if (mBufferLength <= 0 || offset != mBufferOffset + mBufferLength) {
-        mHttp->disconnect();
+    if (mFirstRequest || offset != mBufferOffset + mBufferLength) {
+        if (!mFirstRequest) {
+            mHttp->disconnect();
+        }
+        mFirstRequest = false;
+
         contentLength = sendRangeRequest(offset);
 
         if (contentLength > kBufferSize) {

media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/performance/MediaPlayerPerformance.java

diff --git a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/performance/MediaPlayerPerformance.java b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/performance/MediaPlayerPerformance.java
index 4cdc06d..88e171d 100644
--- a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/performance/MediaPlayerPerformance.java
+++ b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/performance/MediaPlayerPerformance.java
@@ -255,13 +255,19 @@
     }
 
     //Write the ps output to the file
-    public void getMemoryWriteToLog(Writer output) {
+    public void getMemoryWriteToLog(Writer output, int writeCount) {
         String memusage = null;
-        memusage = captureMediaserverInfo();
-        Log.v(TAG, memusage);
         try {
-            //Write to file output
+            if (writeCount == 0) {
+                mStartMemory = getMediaserverVsize();
+                output.write("Start memory : " + mStartMemory + "\n");
+            }
+            memusage = captureMediaserverInfo();
             output.write(memusage);
+            if (writeCount == NUM_STRESS_LOOP - 1) {
+                mEndMemory = getMediaserverVsize();
+                output.write("End Memory :" + mEndMemory + "\n");
+            }
         } catch (Exception e) {
             e.toString();
         }
@@ -312,9 +318,6 @@
         //Wait for 10 seconds to make sure the memory settle.
         Thread.sleep(10000);
         mEndPid = getMediaserverPid();
-        mEndMemory = getMediaserverVsize();
-        Log.v(TAG, "End Memory " + mEndMemory);
-        output.write("End Memory :" + mEndMemory + "\n");
         int memDiff = mEndMemory - startMemory;
         if (memDiff < 0)
             memDiff = 0;
@@ -348,12 +351,9 @@
         File h263MemoryOut = new File(MEDIA_MEMORY_OUTPUT);
         Writer output = new BufferedWriter(new FileWriter(h263MemoryOut, true));
         output.write("H263 Video Playback Only\n");
-        mStartMemory = getMediaserverVsize();
-        output.write("Start memory : " + mStartMemory + "\n");
-        Log.v(TAG, "first mem : " + mStartMemory);
         for (int i = 0; i < NUM_STRESS_LOOP; i++) {
             mediaStressPlayback(MediaNames.VIDEO_HIGHRES_H263);
-            getMemoryWriteToLog(output);
+            getMemoryWriteToLog(output, i);
         }
         output.write("\n");
         memoryResult = validateMemoryResult(mStartPid, mStartMemory, output);
@@ -370,12 +370,9 @@
         File h264MemoryOut = new File(MEDIA_MEMORY_OUTPUT);
         Writer output = new BufferedWriter(new FileWriter(h264MemoryOut, true));
         output.write("H264 Video Playback only\n");
-        mStartMemory = getMediaserverVsize();
-        output.write("Start memory : " + mStartMemory + "\n");
-        Log.v(TAG, "first mem : " + mStartMemory);
         for (int i = 0; i < NUM_STRESS_LOOP; i++) {
             mediaStressPlayback(MediaNames.VIDEO_H264_AMR);
-            getMemoryWriteToLog(output);
+            getMemoryWriteToLog(output, i);
         }
         output.write("\n");
         memoryResult = validateMemoryResult(mStartPid, mStartMemory, output);
@@ -392,12 +389,9 @@
             File wmvMemoryOut = new File(MEDIA_MEMORY_OUTPUT);
             Writer output = new BufferedWriter(new FileWriter(wmvMemoryOut, true));
             output.write("WMV video playback only\n");
-            mStartMemory = getMediaserverVsize();
-            output.write("Start memory : " + mStartMemory + "\n");
-            Log.v(TAG, "first mem : " + mStartMemory);
             for (int i = 0; i < NUM_STRESS_LOOP; i++) {
                 mediaStressPlayback(MediaNames.VIDEO_WMV);
-                getMemoryWriteToLog(output);
+                getMemoryWriteToLog(output, i);
             }
             output.write("\n");
             memoryResult = validateMemoryResult(mStartPid, mStartMemory, output);
@@ -415,14 +409,10 @@
         File videoH263RecordOnlyMemoryOut = new File(MEDIA_MEMORY_OUTPUT);
         Writer output = new BufferedWriter(new FileWriter(videoH263RecordOnlyMemoryOut, true));
         output.write("H263 video record only\n");
-        mStartMemory = getMediaserverVsize();
-        output.write("Start memory : " + mStartMemory + "\n");
-        Log.v(TAG, "first mem : " + mStartMemory);
-
         for (int i = 0; i < NUM_STRESS_LOOP; i++) {
             stressVideoRecord(20, 352, 288, MediaRecorder.VideoEncoder.H263,
                     MediaRecorder.OutputFormat.MPEG_4, MediaNames.RECORDED_VIDEO_3GP, true);
-            getMemoryWriteToLog(output);
+            getMemoryWriteToLog(output, i);
         }
         output.write("\n");
         memoryResult = validateMemoryResult(mStartPid, mStartMemory, output);
@@ -439,14 +429,10 @@
         File videoMp4RecordOnlyMemoryOut = new File(MEDIA_MEMORY_OUTPUT);
         Writer output = new BufferedWriter(new FileWriter(videoMp4RecordOnlyMemoryOut, true));
         output.write("MPEG4 video record only\n");
-        mStartMemory = getMediaserverVsize();
-        output.write("Start memory : " + mStartMemory + "\n");
-        Log.v(TAG, "first mem : " + mStartMemory);
-
         for (int i = 0; i < NUM_STRESS_LOOP; i++) {
             stressVideoRecord(20, 352, 288, MediaRecorder.VideoEncoder.MPEG_4_SP,
                     MediaRecorder.OutputFormat.MPEG_4, MediaNames.RECORDED_VIDEO_3GP, true);
-            getMemoryWriteToLog(output);
+            getMemoryWriteToLog(output, i);
         }
         output.write("\n");
         memoryResult = validateMemoryResult(mStartPid, mStartMemory, output);
@@ -464,14 +450,10 @@
         File videoRecordAudioMemoryOut = new File(MEDIA_MEMORY_OUTPUT);
         Writer output = new BufferedWriter(new FileWriter(videoRecordAudioMemoryOut, true));
         output.write("Audio and h263 video record\n");
-        mStartMemory = getMediaserverVsize();
-        output.write("Start memory : " + mStartMemory + "\n");
-        Log.v(TAG, "first mem : " + mStartMemory);
-
         for (int i = 0; i < NUM_STRESS_LOOP; i++) {
             stressVideoRecord(20, 352, 288, MediaRecorder.VideoEncoder.H263,
                     MediaRecorder.OutputFormat.MPEG_4, MediaNames.RECORDED_VIDEO_3GP, false);
-            getMemoryWriteToLog(output);
+            getMemoryWriteToLog(output, i);
         }
         output.write("\n");
         memoryResult = validateMemoryResult(mStartPid, mStartMemory, output);
@@ -488,13 +470,9 @@
         File audioOnlyMemoryOut = new File(MEDIA_MEMORY_OUTPUT);
         Writer output = new BufferedWriter(new FileWriter(audioOnlyMemoryOut, true));
         output.write("Audio record only\n");
-        mStartMemory = getMediaserverVsize();
-        output.write("Start memory : " + mStartMemory + "\n");
-        Log.v(TAG, "first mem : " + mStartMemory);
-
         for (int i = 0; i < NUM_STRESS_LOOP; i++) {
             stressAudioRecord(MediaNames.RECORDER_OUTPUT);
-            getMemoryWriteToLog(output);
+            getMemoryWriteToLog(output, i);
         }
         output.write("\n");
         memoryResult = validateMemoryResult(mStartPid, mStartMemory, output);

packages/DefaultContainerService/AndroidManifest.xml

diff --git a/packages/DefaultContainerService/AndroidManifest.xml b/packages/DefaultContainerService/AndroidManifest.xml
index fd77148..3d72017 100755
--- a/packages/DefaultContainerService/AndroidManifest.xml
+++ b/packages/DefaultContainerService/AndroidManifest.xml
@@ -1,6 +1,10 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
         package="com.android.defcontainer">
     <uses-permission android:name="android.permission.ACCESS_DOWNLOAD_MANAGER"/>
+    <uses-permission android:name="android.permission.ASEC_ACCESS"/>
+    <uses-permission android:name="android.permission.ASEC_CREATE"/>
+    <uses-permission android:name="android.permission.ASEC_DESTROY"/>
+    <uses-permission android:name="android.permission.ASEC_MOUNT_UNMOUNT"/>
 
     <application android:process="def.container.service"
                  android:label="@string/service_name">

services/java/com/android/server/DevicePolicyManagerService.java

diff --git a/services/java/com/android/server/DevicePolicyManagerService.java b/services/java/com/android/server/DevicePolicyManagerService.java
index ebd6f3d..7b8645f 100644
--- a/services/java/com/android/server/DevicePolicyManagerService.java
+++ b/services/java/com/android/server/DevicePolicyManagerService.java
@@ -35,7 +35,6 @@
 import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
 import android.os.Binder;
-import android.os.Handler;
 import android.os.IBinder;
 import android.os.IPowerManager;
 import android.os.RecoverySystem;
@@ -49,6 +48,8 @@
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.IOException;
+import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 
 /**
@@ -65,7 +66,10 @@
     int mActivePasswordLength = 0;
     int mFailedPasswordAttempts = 0;
     
-    ActiveAdmin mActiveAdmin;
+    final HashMap<ComponentName, ActiveAdmin> mAdminMap
+            = new HashMap<ComponentName, ActiveAdmin>();
+    final ArrayList<ActiveAdmin> mAdminList
+            = new ArrayList<ActiveAdmin>();
     
     static class ActiveAdmin {
         final DeviceAdminInfo info;
@@ -148,7 +152,7 @@
     }
     
     ActiveAdmin getActiveAdminUncheckedLocked(ComponentName who) {
-        ActiveAdmin admin = mActiveAdmin;
+        ActiveAdmin admin = mAdminMap.get(who);
         if (admin != null
                 && who.getPackageName().equals(admin.info.getActivityInfo().packageName)
                 && who.getClassName().equals(admin.info.getActivityInfo().name)) {
@@ -159,7 +163,7 @@
     
     ActiveAdmin getActiveAdminForCallerLocked(ComponentName who)
             throws SecurityException {
-        ActiveAdmin admin = mActiveAdmin;
+        ActiveAdmin admin = mAdminMap.get(who);
         if (admin != null && admin.getUid() == Binder.getCallingUid()) {
             if (who != null) {
                 if (!who.getPackageName().equals(admin.info.getActivityInfo().packageName)
@@ -167,7 +171,7 @@
                     throw new SecurityException("Current admin is not " + who);
                 }
             }
-            return mActiveAdmin;
+            return admin;
         }
         throw new SecurityException("Current admin is not owned by uid " + Binder.getCallingUid());
     }
@@ -190,28 +194,25 @@
     }
     
     void sendAdminCommandLocked(String action, int reqPolicy) {
-        if (mActiveAdmin != null) {
-            if (mActiveAdmin.info.usesPolicy(reqPolicy)) {
-                return;
+        final int N = mAdminList.size();
+        if (N > 0) {
+            for (int i=0; i<N; i++) {
+                ActiveAdmin admin = mAdminList.get(i);
+                if (admin.info.usesPolicy(reqPolicy)) {
+                    sendAdminCommandLocked(admin, action);
+                }
             }
-            sendAdminCommandLocked(mActiveAdmin, action);
         }
     }
     
-    ComponentName getActiveAdminLocked() {
-        if (mActiveAdmin != null) {
-            return mActiveAdmin.info.getComponent();
-        }
-        return null;
-    }
-    
     void removeActiveAdminLocked(ComponentName adminReceiver) {
-        ComponentName cur = getActiveAdminLocked();
-        if (cur != null && cur.equals(adminReceiver)) {
-            sendAdminCommandLocked(mActiveAdmin,
+        ActiveAdmin admin = getActiveAdminUncheckedLocked(adminReceiver);
+        if (admin != null) {
+            sendAdminCommandLocked(admin,
                     DeviceAdmin.ACTION_DEVICE_ADMIN_DISABLED);
             // XXX need to wait for it to complete.
-            mActiveAdmin = null;
+            mAdminList.remove(admin);
+            mAdminMap.remove(adminReceiver);
         }
     }
     
@@ -251,13 +252,17 @@
 
             out.startTag(null, "policies");
             
-            ActiveAdmin ap = mActiveAdmin;
-            if (ap != null) {
-                out.startTag(null, "admin");
-                out.attribute(null, "name", ap.info.getComponent().flattenToString());
-                ap.writeToXml(out);
-                out.endTag(null, "admin");
+            final int N = mAdminList.size();
+            for (int i=0; i<N; i++) {
+                ActiveAdmin ap = mAdminList.get(i);
+                if (ap != null) {
+                    out.startTag(null, "admin");
+                    out.attribute(null, "name", ap.info.getComponent().flattenToString());
+                    ap.writeToXml(out);
+                    out.endTag(null, "admin");
+                }
             }
+            
             out.endTag(null, "policies");
 
             if (mFailedPasswordAttempts != 0) {
@@ -314,7 +319,8 @@
                     if (dai != null) {
                         ActiveAdmin ap = new ActiveAdmin(dai);
                         ap.readFromXml(parser);
-                        mActiveAdmin = ap;
+                        mAdminMap.put(ap.info.getComponent(), ap);
+                        mAdminList.add(ap);
                     }
                 } else if ("failed-password-attempts".equals(tag)) {
                     mFailedPasswordAttempts = Integer.parseInt(
@@ -369,16 +375,14 @@
         synchronized (this) {
             long ident = Binder.clearCallingIdentity();
             try {
-                ComponentName cur = getActiveAdminLocked();
-                if (cur != null && cur.equals(adminReceiver)) {
-                    throw new IllegalStateException("An admin is already set");
+                if (getActiveAdminUncheckedLocked(adminReceiver) != null) {
+                    throw new IllegalArgumentException("Admin is already added");
                 }
-                if (cur != null) {
-                    removeActiveAdminLocked(adminReceiver);
-                }
-                mActiveAdmin = new ActiveAdmin(info);
+                ActiveAdmin admin = new ActiveAdmin(info);
+                mAdminMap.put(adminReceiver, admin);
+                mAdminList.add(admin);
                 saveSettingsLocked();
-                sendAdminCommandLocked(mActiveAdmin,
+                sendAdminCommandLocked(admin,
                         DeviceAdmin.ACTION_DEVICE_ADMIN_ENABLED);
             } finally {
                 Binder.restoreCallingIdentity(ident);
@@ -386,15 +390,33 @@
         }
     }
     
-    public ComponentName getActiveAdmin() {
+    public boolean isAdminActive(ComponentName adminReceiver) {
         synchronized (this) {
-            return getActiveAdminLocked();
+            return getActiveAdminUncheckedLocked(adminReceiver) != null;
+        }
+    }
+    
+    public List<ComponentName> getActiveAdmins() {
+        synchronized (this) {
+            final int N = mAdminList.size();
+            if (N <= 0) {
+                return null;
+            }
+            ArrayList<ComponentName> res = new ArrayList<ComponentName>(N);
+            for (int i=0; i<N; i++) {
+                res.add(mAdminList.get(i).info.getComponent());
+            }
+            return res;
         }
     }
     
     public void removeActiveAdmin(ComponentName adminReceiver) {
         synchronized (this) {
-            if (mActiveAdmin == null || mActiveAdmin.getUid() != Binder.getCallingUid()) {
+            ActiveAdmin admin = getActiveAdminUncheckedLocked(adminReceiver);
+            if (admin == null) {
+                return;
+            }
+            if (admin.getUid() != Binder.getCallingUid()) {
                 mContext.enforceCallingOrSelfPermission(
                         android.Manifest.permission.BIND_DEVICE_ADMIN, null);
             }
@@ -423,8 +445,15 @@
     
     public int getPasswordMode() {
         synchronized (this) {
-            return mActiveAdmin != null ? mActiveAdmin.passwordMode
-                    : DevicePolicyManager.PASSWORD_MODE_UNSPECIFIED;
+            final int N = mAdminList.size();
+            int mode = DevicePolicyManager.PASSWORD_MODE_UNSPECIFIED;
+            for  (int i=0; i<N; i++) {
+                ActiveAdmin admin = mAdminList.get(i);
+                if (mode < admin.passwordMode) {
+                    mode = admin.passwordMode;
+                }
+            }
+            return mode;
         }
     }
     
@@ -444,7 +473,15 @@
     
     public int getMinimumPasswordLength() {
         synchronized (this) {
-            return mActiveAdmin != null ? mActiveAdmin.minimumPasswordLength : 0;
+            final int N = mAdminList.size();
+            int length = 0;
+            for  (int i=0; i<N; i++) {
+                ActiveAdmin admin = mAdminList.get(i);
+                if (length < admin.minimumPasswordLength) {
+                    length = admin.minimumPasswordLength;
+                }
+            }
+            return length;
         }
     }
     
@@ -486,7 +523,18 @@
     
     public int getMaximumFailedPasswordsForWipe() {
         synchronized (this) {
-            return mActiveAdmin != null ? mActiveAdmin.maximumFailedPasswordsForWipe : 0;
+            final int N = mAdminList.size();
+            int count = 0;
+            for  (int i=0; i<N; i++) {
+                ActiveAdmin admin = mAdminList.get(i);
+                if (count == 0) {
+                    count = admin.maximumFailedPasswordsForWipe;
+                } else if (admin.maximumFailedPasswordsForWipe != 0
+                        && count > admin.maximumFailedPasswordsForWipe) {
+                    count = admin.maximumFailedPasswordsForWipe;
+                }
+            }
+            return count;
         }
     }
     
@@ -546,7 +594,18 @@
     
     public long getMaximumTimeToLock() {
         synchronized (this) {
-            return mActiveAdmin != null ? mActiveAdmin.maximumTimeToUnlock : 0;
+            final int N = mAdminList.size();
+            long time = 0;
+            for  (int i=0; i<N; i++) {
+                ActiveAdmin admin = mAdminList.get(i);
+                if (time == 0) {
+                    time = admin.maximumTimeToUnlock;
+                } else if (admin.maximumTimeToUnlock != 0
+                        && time > admin.maximumTimeToUnlock) {
+                    time = admin.maximumTimeToUnlock;
+                }
+            }
+            return time;
         }
     }
     

telephony/java/com/android/internal/telephony/gsm/UsimPhoneBookManager.java

diff --git a/telephony/java/com/android/internal/telephony/gsm/UsimPhoneBookManager.java b/telephony/java/com/android/internal/telephony/gsm/UsimPhoneBookManager.java
index d27f240..9caae3d 100644
--- a/telephony/java/com/android/internal/telephony/gsm/UsimPhoneBookManager.java
+++ b/telephony/java/com/android/internal/telephony/gsm/UsimPhoneBookManager.java
@@ -282,7 +282,7 @@
     private void readAdnFileAndWait(int recNum) {
         Map <Integer,Integer> fileIds;
         fileIds = mPbrFile.mFileIds.get(recNum);
-        if (fileIds == null) return;
+        if (fileIds == null || fileIds.isEmpty()) return;
 
         mAdnCache.requestLoadAllAdnLike(fileIds.get(USIM_EFADN_TAG),
             fileIds.get(USIM_EFEXT1_TAG), obtainMessage(EVENT_USIM_ADN_LOAD_DONE));

tests/FrameworkTest/tests/src/com/android/frameworktest/AllTests.java

diff --git a/tests/FrameworkTest/tests/src/com/android/frameworktest/AllTests.java b/tests/FrameworkTest/tests/src/com/android/frameworktest/AllTests.java
deleted file mode 100644
index e43ebb8..0000000
--- a/tests/FrameworkTest/tests/src/com/android/frameworktest/AllTests.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.frameworktest;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import android.test.suitebuilder.TestSuiteBuilder;
-
-public class AllTests extends TestSuite {
-
-    public static Test suite() {
-        return new TestSuiteBuilder(AllTests.class)
-                .includeAllPackagesUnderHere()
-                .includePackages("android.content")
-                .includePackages("android.widget")
-                .build();
-    }
-
-}

tools/aapt/Resource.cpp

diff --git a/tools/aapt/Resource.cpp b/tools/aapt/Resource.cpp
index c530dd4..d53c472 100644
--- a/tools/aapt/Resource.cpp
+++ b/tools/aapt/Resource.cpp
@@ -1854,10 +1854,16 @@
 writeProguardForLayouts(ProguardKeepSet* keep, const sp<AaptAssets>& assets)
 {
     status_t err;
-    sp<AaptDir> layout = assets->resDir(String8("layout"));
+    const Vector<sp<AaptDir> >& dirs = assets->resDirs();
+    const size_t K = dirs.size();
+    for (size_t k=0; k<K; k++) {
+        const sp<AaptDir>& d = dirs.itemAt(k);
+        const String8& dirName = d->getLeaf();
+        if ((dirName != String8("layout")) && (strncmp(dirName.string(), "layout-", 7) != 0)) {
+            continue;
+        }
 
-    if (layout != NULL) {
-        const KeyedVector<String8,sp<AaptGroup> > groups = layout->getFiles();
+        const KeyedVector<String8,sp<AaptGroup> > groups = d->getFiles();
         const size_t N = groups.size();
         for (size_t i=0; i<N; i++) {
             const sp<AaptGroup>& group = groups.valueAt(i);