Follow class package change: LocaleList
In order to avoid layering violation, LocaleList needs to be moved from
android.util package to android.os package [1]. This CL follows up that
package change.
No behavior change is intended.
[1]: Ia8de2ee9df3dd0a42b1fe84574439519b680fe18
Bug: 28819696
Change-Id: I976c91295245dc410dcd5590ff4a8cc047c8ab2d
diff --git a/tests/tests/content/src/android/content/res/cts/ConfigurationTest.java b/tests/tests/content/src/android/content/res/cts/ConfigurationTest.java
index bc0f42e..dbc3e21 100644
--- a/tests/tests/content/src/android/content/res/cts/ConfigurationTest.java
+++ b/tests/tests/content/src/android/content/res/cts/ConfigurationTest.java
@@ -20,9 +20,9 @@
import android.content.pm.ActivityInfo;
import android.content.res.Configuration;
+import android.os.LocaleList;
import android.os.Parcel;
import android.test.AndroidTestCase;
-import android.util.LocaleList;
import android.view.View;
public class ConfigurationTest extends AndroidTestCase {
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 f264f1c..73f441b 100644
--- a/tests/tests/content/src/android/content/res/cts/ResourcesTest.java
+++ b/tests/tests/content/src/android/content/res/cts/ResourcesTest.java
@@ -32,10 +32,10 @@
import android.content.res.XmlResourceParser;
import android.graphics.drawable.Drawable;
import android.os.Bundle;
+import android.os.LocaleList;
import android.test.AndroidTestCase;
import android.util.AttributeSet;
import android.util.DisplayMetrics;
-import android.util.LocaleList;
import android.util.TypedValue;
import android.util.Xml;
import android.view.Display;
diff --git a/tests/tests/graphics/src/android/graphics/cts/PaintTest.java b/tests/tests/graphics/src/android/graphics/cts/PaintTest.java
index aa8348a..d50897fe 100644
--- a/tests/tests/graphics/src/android/graphics/cts/PaintTest.java
+++ b/tests/tests/graphics/src/android/graphics/cts/PaintTest.java
@@ -35,9 +35,9 @@
import android.graphics.Typeface;
import android.graphics.Xfermode;
import android.os.Build;
+import android.os.LocaleList;
import android.test.AndroidTestCase;
import android.text.SpannedString;
-import android.util.LocaleList;
import android.util.Log;
import java.util.Locale;
diff --git a/tests/tests/util/src/android/util/cts/LocaleListTest.java b/tests/tests/os/src/android/os/cts/LocaleListTest.java
similarity index 99%
rename from tests/tests/util/src/android/util/cts/LocaleListTest.java
rename to tests/tests/os/src/android/os/cts/LocaleListTest.java
index 7693adf..bc30e5c 100644
--- a/tests/tests/util/src/android/util/cts/LocaleListTest.java
+++ b/tests/tests/os/src/android/os/cts/LocaleListTest.java
@@ -14,10 +14,10 @@
* limitations under the License.
*/
-package android.util.cts;
+package android.os.cts;
+import android.os.LocaleList;
import android.os.Parcel;
-import android.util.LocaleList;
import android.test.AndroidTestCase;
import java.util.Locale;
diff --git a/tests/tests/print/src/android/print/cts/BasePrintTest.java b/tests/tests/print/src/android/print/cts/BasePrintTest.java
index 497c63e..7f0ae5d 100644
--- a/tests/tests/print/src/android/print/cts/BasePrintTest.java
+++ b/tests/tests/print/src/android/print/cts/BasePrintTest.java
@@ -32,6 +32,7 @@
import android.graphics.pdf.PdfDocument;
import android.os.Bundle;
import android.os.CancellationSignal;
+import android.os.LocaleList;
import android.os.ParcelFileDescriptor;
import android.os.SystemClock;
import android.print.PageRange;
@@ -55,7 +56,6 @@
import android.support.test.uiautomator.UiSelector;
import android.test.InstrumentationTestCase;
import android.util.DisplayMetrics;
-import android.util.LocaleList;
import android.util.Log;
import org.hamcrest.BaseMatcher;
diff --git a/tests/tests/text/src/android/text/style/cts/LocaleSpanTest.java b/tests/tests/text/src/android/text/style/cts/LocaleSpanTest.java
index f44cca5..bb7cdd9 100644
--- a/tests/tests/text/src/android/text/style/cts/LocaleSpanTest.java
+++ b/tests/tests/text/src/android/text/style/cts/LocaleSpanTest.java
@@ -18,11 +18,11 @@
import junit.framework.TestCase;
import android.annotation.NonNull;
+import android.os.LocaleList;
import android.os.Parcel;
import android.test.suitebuilder.annotation.SmallTest;
import android.text.TextPaint;
import android.text.style.LocaleSpan;
-import android.util.LocaleList;
public class LocaleSpanTest extends TestCase {
diff --git a/tests/tests/view/src/android/view/inputmethod/cts/EditorInfoTest.java b/tests/tests/view/src/android/view/inputmethod/cts/EditorInfoTest.java
index 22c6be4..e9c3058 100644
--- a/tests/tests/view/src/android/view/inputmethod/cts/EditorInfoTest.java
+++ b/tests/tests/view/src/android/view/inputmethod/cts/EditorInfoTest.java
@@ -18,10 +18,10 @@
import android.os.Bundle;
+import android.os.LocaleList;
import android.os.Parcel;
import android.test.AndroidTestCase;
import android.text.TextUtils;
-import android.util.LocaleList;
import android.util.Printer;
import android.view.inputmethod.EditorInfo;
diff --git a/tests/tests/widget/src/android/widget/cts/TextViewTest.java b/tests/tests/widget/src/android/widget/cts/TextViewTest.java
index effc685..4a709dd 100644
--- a/tests/tests/widget/src/android/widget/cts/TextViewTest.java
+++ b/tests/tests/widget/src/android/widget/cts/TextViewTest.java
@@ -39,6 +39,7 @@
import android.graphics.drawable.Drawable;
import android.net.Uri;
import android.os.Bundle;
+import android.os.LocaleList;
import android.os.Parcelable;
import android.test.ActivityInstrumentationTestCase2;
import android.test.TouchUtils;
@@ -77,7 +78,6 @@
import android.text.style.UnderlineSpan;
import android.text.util.Linkify;
import android.util.DisplayMetrics;
-import android.util.LocaleList;
import android.util.TypedValue;
import android.view.ActionMode;
import android.view.ContextMenu;
