Update imports to android-common
Several files were moved to android-common. Update all the references
to import those files from the new location.
diff --git a/tests/src/android/graphics/drawable/cts/DrawableTestUtils.java b/tests/src/android/graphics/drawable/cts/DrawableTestUtils.java
index 8745bd3..c068aa3 100644
--- a/tests/src/android/graphics/drawable/cts/DrawableTestUtils.java
+++ b/tests/src/android/graphics/drawable/cts/DrawableTestUtils.java
@@ -22,7 +22,7 @@
import java.io.IOException;
-import com.android.internal.util.XmlUtils;
+import com.android.common.XmlUtils;
import org.xmlpull.v1.XmlPullParser;
import org.xmlpull.v1.XmlPullParserException;
diff --git a/tests/tests/content/src/android/content/cts/ContextTest.java b/tests/tests/content/src/android/content/cts/ContextTest.java
index 3eac36a..0b9b4a3 100644
--- a/tests/tests/content/src/android/content/cts/ContextTest.java
+++ b/tests/tests/content/src/android/content/cts/ContextTest.java
@@ -29,7 +29,7 @@
import android.util.Xml;
import com.android.cts.stub.R;
-import com.android.internal.util.XmlUtils;
+import com.android.common.XmlUtils;
import dalvik.annotation.TestTargets;
import dalvik.annotation.TestLevel;
diff --git a/tests/tests/content/src/android/content/cts/IntentFilterTest.java b/tests/tests/content/src/android/content/cts/IntentFilterTest.java
index 4c050e3..d58682c 100644
--- a/tests/tests/content/src/android/content/cts/IntentFilterTest.java
+++ b/tests/tests/content/src/android/content/cts/IntentFilterTest.java
@@ -51,7 +51,7 @@
import android.util.Printer;
import android.util.StringBuilderPrinter;
-import com.android.internal.util.FastXmlSerializer;
+import com.android.common.FastXmlSerializer;
import dalvik.annotation.TestLevel;
import dalvik.annotation.TestTargetClass;
diff --git a/tests/tests/content/src/android/content/cts/IntentTest.java b/tests/tests/content/src/android/content/cts/IntentTest.java
index 8507e68..2be87ac 100644
--- a/tests/tests/content/src/android/content/cts/IntentTest.java
+++ b/tests/tests/content/src/android/content/cts/IntentTest.java
@@ -46,7 +46,7 @@
import android.util.Xml;
import com.android.internal.app.ResolverActivity;
-import com.android.internal.util.XmlUtils;
+import com.android.common.XmlUtils;
import dalvik.annotation.TestLevel;
import dalvik.annotation.TestTargetClass;
diff --git a/tests/tests/content/src/android/content/res/cts/AssetManagerTest.java b/tests/tests/content/src/android/content/res/cts/AssetManagerTest.java
index 6aa7297..9dd2884 100644
--- a/tests/tests/content/src/android/content/res/cts/AssetManagerTest.java
+++ b/tests/tests/content/src/android/content/res/cts/AssetManagerTest.java
@@ -31,7 +31,7 @@
import android.util.TypedValue;
import com.android.cts.stub.R;
-import com.android.internal.util.XmlUtils;
+import com.android.common.XmlUtils;
import dalvik.annotation.TestLevel;
import dalvik.annotation.TestTargetClass;
diff --git a/tests/tests/content/src/android/content/res/cts/ResourcesTest.java b/tests/tests/content/src/android/content/res/cts/ResourcesTest.java
index be5c18a..68181f5 100644
--- a/tests/tests/content/src/android/content/res/cts/ResourcesTest.java
+++ b/tests/tests/content/src/android/content/res/cts/ResourcesTest.java
@@ -17,7 +17,7 @@
package android.content.res.cts;
import com.android.cts.stub.R;
-import com.android.internal.util.XmlUtils;
+import com.android.common.XmlUtils;
import dalvik.annotation.TestLevel;
import dalvik.annotation.TestTargetClass;
diff --git a/tests/tests/content/src/android/content/res/cts/TypedArrayTest.java b/tests/tests/content/src/android/content/res/cts/TypedArrayTest.java
index 40d959d..a85b09e 100644
--- a/tests/tests/content/src/android/content/res/cts/TypedArrayTest.java
+++ b/tests/tests/content/src/android/content/res/cts/TypedArrayTest.java
@@ -28,7 +28,7 @@
import android.view.ContextThemeWrapper;
import com.android.cts.stub.R;
-import com.android.internal.util.XmlUtils;
+import com.android.common.XmlUtils;
import dalvik.annotation.TestLevel;
import dalvik.annotation.TestTargetClass;
diff --git a/tests/tests/database/src/android/database/cts/CursorWindowTest.java b/tests/tests/database/src/android/database/cts/CursorWindowTest.java
index eff2db8..5b6db60 100644
--- a/tests/tests/database/src/android/database/cts/CursorWindowTest.java
+++ b/tests/tests/database/src/android/database/cts/CursorWindowTest.java
@@ -16,7 +16,7 @@
package android.database.cts;
-import com.android.internal.database.ArrayListCursor;
+import com.android.common.ArrayListCursor;
import com.google.android.collect.Lists;
import dalvik.annotation.TestLevel;
diff --git a/tests/tests/graphics/src/android/graphics/drawable/cts/PaintDrawableTest.java b/tests/tests/graphics/src/android/graphics/drawable/cts/PaintDrawableTest.java
index 05472b2..f2a924d 100644
--- a/tests/tests/graphics/src/android/graphics/drawable/cts/PaintDrawableTest.java
+++ b/tests/tests/graphics/src/android/graphics/drawable/cts/PaintDrawableTest.java
@@ -212,7 +212,7 @@
IOException {
int type;
// FIXME: this come from
- // com.android.internal.util.XmlUtils.beginDocument. It's better put
+ // com.android.common.XmlUtils.beginDocument. It's better put
// it up as a utility method of CTS test cases.
type = parser.next();
while (type != XmlPullParser.START_TAG && type != XmlPullParser.END_DOCUMENT) {
diff --git a/tests/tests/view/src/android/view/cts/LayoutInflaterTest.java b/tests/tests/view/src/android/view/cts/LayoutInflaterTest.java
index ef46db2..35ad258 100644
--- a/tests/tests/view/src/android/view/cts/LayoutInflaterTest.java
+++ b/tests/tests/view/src/android/view/cts/LayoutInflaterTest.java
@@ -37,7 +37,7 @@
import android.widget.LinearLayout;
import com.android.cts.stub.R;
-import com.android.internal.util.XmlUtils;
+import com.android.common.XmlUtils;
import dalvik.annotation.TestTargets;
import dalvik.annotation.TestTargetNew;
diff --git a/tests/tests/view/src/android/view/cts/ViewGroupTest.java b/tests/tests/view/src/android/view/cts/ViewGroupTest.java
index 6936f7c..2cf692c 100644
--- a/tests/tests/view/src/android/view/cts/ViewGroupTest.java
+++ b/tests/tests/view/src/android/view/cts/ViewGroupTest.java
@@ -55,7 +55,7 @@
import android.widget.TextView;
import android.widget.cts.ViewGroupStubActivity;
-import com.android.internal.util.XmlUtils;
+import com.android.common.XmlUtils;
import dalvik.annotation.TestTargets;
import dalvik.annotation.TestLevel;
diff --git a/tests/tests/view/src/android/view/cts/ViewGroup_LayoutParamsTest.java b/tests/tests/view/src/android/view/cts/ViewGroup_LayoutParamsTest.java
index f38b899..e677ee6 100644
--- a/tests/tests/view/src/android/view/cts/ViewGroup_LayoutParamsTest.java
+++ b/tests/tests/view/src/android/view/cts/ViewGroup_LayoutParamsTest.java
@@ -29,7 +29,7 @@
import android.view.ViewGroup.LayoutParams;
import com.android.cts.stub.R;
-import com.android.internal.util.XmlUtils;
+import com.android.common.XmlUtils;
import dalvik.annotation.TestTargets;
import dalvik.annotation.TestLevel;
diff --git a/tests/tests/view/src/android/view/cts/ViewGroup_MarginLayoutParamsTest.java b/tests/tests/view/src/android/view/cts/ViewGroup_MarginLayoutParamsTest.java
index b395fc7..c1a7801 100644
--- a/tests/tests/view/src/android/view/cts/ViewGroup_MarginLayoutParamsTest.java
+++ b/tests/tests/view/src/android/view/cts/ViewGroup_MarginLayoutParamsTest.java
@@ -24,7 +24,7 @@
import android.view.ViewGroup.LayoutParams;
import android.view.ViewGroup.MarginLayoutParams;
-import com.android.internal.util.XmlUtils;
+import com.android.common.XmlUtils;
import com.android.cts.stub.R;
import dalvik.annotation.TestTargets;
diff --git a/tests/tests/widget/src/android/widget/cts/AlphabetIndexerTest.java b/tests/tests/widget/src/android/widget/cts/AlphabetIndexerTest.java
index 50a9472c..59b940c 100644
--- a/tests/tests/widget/src/android/widget/cts/AlphabetIndexerTest.java
+++ b/tests/tests/widget/src/android/widget/cts/AlphabetIndexerTest.java
@@ -16,7 +16,7 @@
package android.widget.cts;
-import com.android.internal.database.ArrayListCursor;
+import com.android.common.ArrayListCursor;
import dalvik.annotation.TestLevel;
import dalvik.annotation.TestTargetClass;
diff --git a/tests/tests/widget/src/android/widget/cts/DatePickerTest.java b/tests/tests/widget/src/android/widget/cts/DatePickerTest.java
index 1de4f42..a08f638 100644
--- a/tests/tests/widget/src/android/widget/cts/DatePickerTest.java
+++ b/tests/tests/widget/src/android/widget/cts/DatePickerTest.java
@@ -17,7 +17,7 @@
package android.widget.cts;
import com.android.cts.stub.R;
-import com.android.internal.util.XmlUtils;
+import com.android.common.XmlUtils;
import dalvik.annotation.TestLevel;
import dalvik.annotation.TestTargetClass;
diff --git a/tests/tests/widget/src/android/widget/cts/DigitalClockTest.java b/tests/tests/widget/src/android/widget/cts/DigitalClockTest.java
index cf23382..52cae16 100644
--- a/tests/tests/widget/src/android/widget/cts/DigitalClockTest.java
+++ b/tests/tests/widget/src/android/widget/cts/DigitalClockTest.java
@@ -31,7 +31,7 @@
import android.widget.LinearLayout;
import com.android.cts.stub.R;
-import com.android.internal.util.XmlUtils;
+import com.android.common.XmlUtils;
import dalvik.annotation.TestTargets;
import dalvik.annotation.TestLevel;
diff --git a/tests/tests/widget/src/android/widget/cts/LinearLayout_LayoutParamsTest.java b/tests/tests/widget/src/android/widget/cts/LinearLayout_LayoutParamsTest.java
index 4b6257a..3354d59 100644
--- a/tests/tests/widget/src/android/widget/cts/LinearLayout_LayoutParamsTest.java
+++ b/tests/tests/widget/src/android/widget/cts/LinearLayout_LayoutParamsTest.java
@@ -17,7 +17,7 @@
package android.widget.cts;
import com.android.cts.stub.R;
-import com.android.internal.util.XmlUtils;
+import com.android.common.XmlUtils;
import dalvik.annotation.TestLevel;
import dalvik.annotation.TestTargetClass;
diff --git a/tests/tests/widget/src/android/widget/cts/RelativeLayoutTest.java b/tests/tests/widget/src/android/widget/cts/RelativeLayoutTest.java
index 943e58e..5ade88e 100644
--- a/tests/tests/widget/src/android/widget/cts/RelativeLayoutTest.java
+++ b/tests/tests/widget/src/android/widget/cts/RelativeLayoutTest.java
@@ -17,7 +17,7 @@
package android.widget.cts;
import com.android.cts.stub.R;
-import com.android.internal.util.XmlUtils;
+import com.android.common.XmlUtils;
import dalvik.annotation.TestLevel;
import dalvik.annotation.TestTargetClass;
diff --git a/tests/tests/widget/src/android/widget/cts/ResourceCursorAdapterTest.java b/tests/tests/widget/src/android/widget/cts/ResourceCursorAdapterTest.java
index 6f87c61..38ec995 100644
--- a/tests/tests/widget/src/android/widget/cts/ResourceCursorAdapterTest.java
+++ b/tests/tests/widget/src/android/widget/cts/ResourceCursorAdapterTest.java
@@ -17,7 +17,7 @@
package android.widget.cts;
import com.android.cts.stub.R;
-import com.android.internal.database.ArrayListCursor;
+import com.android.common.ArrayListCursor;
import dalvik.annotation.TestLevel;
import dalvik.annotation.TestTargetClass;
diff --git a/tests/tests/widget/src/android/widget/cts/ResourceCursorTreeAdapterTest.java b/tests/tests/widget/src/android/widget/cts/ResourceCursorTreeAdapterTest.java
index 7788437..716104d 100644
--- a/tests/tests/widget/src/android/widget/cts/ResourceCursorTreeAdapterTest.java
+++ b/tests/tests/widget/src/android/widget/cts/ResourceCursorTreeAdapterTest.java
@@ -17,7 +17,7 @@
package android.widget.cts;
import com.android.cts.stub.R;
-import com.android.internal.database.ArrayListCursor;
+import com.android.common.ArrayListCursor;
import dalvik.annotation.TestTargets;
import dalvik.annotation.TestLevel;
diff --git a/tests/tests/widget/src/android/widget/cts/SimpleCursorAdapterTest.java b/tests/tests/widget/src/android/widget/cts/SimpleCursorAdapterTest.java
index bde16eb..8f32228 100644
--- a/tests/tests/widget/src/android/widget/cts/SimpleCursorAdapterTest.java
+++ b/tests/tests/widget/src/android/widget/cts/SimpleCursorAdapterTest.java
@@ -17,7 +17,7 @@
package android.widget.cts;
import com.android.cts.stub.R;
-import com.android.internal.database.ArrayListCursor;
+import com.android.common.ArrayListCursor;
import dalvik.annotation.TestLevel;
import dalvik.annotation.TestTargetClass;
diff --git a/tests/tests/widget/src/android/widget/cts/SimpleCursorTreeAdapterTest.java b/tests/tests/widget/src/android/widget/cts/SimpleCursorTreeAdapterTest.java
index c140af2..7295e75 100644
--- a/tests/tests/widget/src/android/widget/cts/SimpleCursorTreeAdapterTest.java
+++ b/tests/tests/widget/src/android/widget/cts/SimpleCursorTreeAdapterTest.java
@@ -17,7 +17,7 @@
package android.widget.cts;
import com.android.cts.stub.R;
-import com.android.internal.database.ArrayListCursor;
+import com.android.common.ArrayListCursor;
import dalvik.annotation.TestLevel;
import dalvik.annotation.TestTargetClass;
diff --git a/tests/tests/widget/src/android/widget/cts/TableLayout_LayoutParamsTest.java b/tests/tests/widget/src/android/widget/cts/TableLayout_LayoutParamsTest.java
index a838476..40d6bc0 100644
--- a/tests/tests/widget/src/android/widget/cts/TableLayout_LayoutParamsTest.java
+++ b/tests/tests/widget/src/android/widget/cts/TableLayout_LayoutParamsTest.java
@@ -27,7 +27,7 @@
import android.widget.TableLayout;
import com.android.internal.R;
-import com.android.internal.util.XmlUtils;
+import com.android.common.XmlUtils;
import dalvik.annotation.TestTargets;
import dalvik.annotation.TestTargetNew;
diff --git a/tests/tests/widget/src/android/widget/cts/TableRow_LayoutParamsTest.java b/tests/tests/widget/src/android/widget/cts/TableRow_LayoutParamsTest.java
index 8ec8c34..b84cf0a 100644
--- a/tests/tests/widget/src/android/widget/cts/TableRow_LayoutParamsTest.java
+++ b/tests/tests/widget/src/android/widget/cts/TableRow_LayoutParamsTest.java
@@ -30,7 +30,7 @@
import android.widget.TableRow;
import com.android.internal.R;
-import com.android.internal.util.XmlUtils;
+import com.android.common.XmlUtils;
import dalvik.annotation.TestTargets;
import dalvik.annotation.TestTargetNew;
