Merge "Migrate frameworks/base/core/tests/overlaytests/device to androidx.test"

LOCAL_MODULE_TAGS := tests

LOCAL_PACKAGE_NAME := OverlayDeviceTests

LOCAL_PRIVATE_PLATFORM_APIS := true

LOCAL_STATIC_JAVA_LIBRARIES := android-support-test

LOCAL_STATIC_JAVA_LIBRARIES := androidx.test.rules

LOCAL_COMPATIBILITY_SUITE := device-tests

LOCAL_TARGET_REQUIRED_MODULES := \

    OverlayDeviceTests_AppOverlayOne \

        <uses-library android:name="android.test.runner"/>

    </application>

    <instrumentation android:name="android.support.test.runner.AndroidJUnitRunner"

    <instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"

        android:targetPackage="com.android.overlaytest"

        android:label="Runtime resource overlay tests" />

</manifest>

import android.content.res.XmlResourceParser;

import android.os.LocaleList;

import android.os.ParcelFileDescriptor;

import android.support.test.InstrumentationRegistry;

import android.util.AttributeSet;

import android.util.Xml;

import androidx.test.InstrumentationRegistry;

import org.junit.Before;

import org.junit.Ignore;

import org.junit.Test;

package com.android.overlaytest;

import android.support.test.filters.MediumTest;

import androidx.test.filters.MediumTest;

import org.junit.BeforeClass;

import org.junit.runner.RunWith;

package com.android.overlaytest;

import android.support.test.filters.MediumTest;

import androidx.test.filters.MediumTest;

import org.junit.BeforeClass;

import org.junit.runner.RunWith;