Merge "move activities for media to media package" into jb-dev
diff --git a/tests/src/android/app/cts/CTSResult.java b/libs/util/src/android/app/cts/CTSResult.java
similarity index 100%
rename from tests/src/android/app/cts/CTSResult.java
rename to libs/util/src/android/app/cts/CTSResult.java
diff --git a/tests/src/android/provider/cts/FileCopyHelper.java b/libs/util/src/android/provider/cts/FileCopyHelper.java
similarity index 100%
rename from tests/src/android/provider/cts/FileCopyHelper.java
rename to libs/util/src/android/provider/cts/FileCopyHelper.java
diff --git a/tests/AndroidManifest.xml b/tests/AndroidManifest.xml
index 31ad973..f9999f4 100644
--- a/tests/AndroidManifest.xml
+++ b/tests/AndroidManifest.xml
@@ -121,12 +121,6 @@
android:name="android.app.cts.MockApplication">
<activity android:name="android.app.cts.ActionBarActivity" />
-
- <activity android:name="android.media.cts.AudioManagerStub"
- android:label="AudioManagerStub"/>
- <activity android:name="android.media.cts.AudioManagerStubHelper"
- android:label="AudioManagerStubHelper"/>
-
<activity android:name="android.widget.cts.TwoLineListItemStubActivity"
android:label="TwoLineListItemStubActivity">
<intent-filter>
@@ -135,32 +129,6 @@
</intent-filter>
</activity>
- <activity android:name="android.media.cts.MediaStubActivity"
- android:label="MediaStubActivity"
- android:screenOrientation="nosensor"
- android:configChanges="keyboard|keyboardHidden|orientation|screenSize">
- <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.media.cts.MediaPlayerSurfaceStubActivity"
- android:label="MediaPlayerSurfaceStubActivity">
- <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.media.cts.RingtonePickerActivity"
- android:label="RingtonePickerActivity">
- <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.cts.ViewStubStubActivity"
android:label="ViewStubStubActivity">
<intent-filter>
@@ -530,9 +498,6 @@
</intent-filter>
</activity>
- <activity android:name="android.media.cts.FaceDetectorStub"
- android:label="FaceDetectorStub"/>
-
<activity android:name="android.widget.cts.ListViewStubActivity"
android:label="ListViewStubActivity">
<intent-filter>
diff --git a/tests/tests/media/Android.mk b/tests/tests/media/Android.mk
index 1a14f83..1e6098f 100644
--- a/tests/tests/media/Android.mk
+++ b/tests/tests/media/Android.mk
@@ -22,13 +22,12 @@
LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
LOCAL_JAVA_LIBRARIES := android.test.runner
+LOCAL_STATIC_JAVA_LIBRARIES := ctsutil ctstestserver
LOCAL_SRC_FILES := $(call all-java-files-under, src)
LOCAL_PACKAGE_NAME := CtsMediaTestCases
-LOCAL_INSTRUMENTATION_FOR := CtsTestStubs
-
# uncomment when dalvik.annotation.Test* are removed or part of SDK
#LOCAL_SDK_VERSION := current
diff --git a/tests/tests/media/AndroidManifest.xml b/tests/tests/media/AndroidManifest.xml
index 478586f..a336e73 100644
--- a/tests/tests/media/AndroidManifest.xml
+++ b/tests/tests/media/AndroidManifest.xml
@@ -17,12 +17,50 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.android.cts.media">
+ <uses-permission android:name="android.permission.CAMERA" />
+ <uses-permission android:name="android.permission.INTERNET" />
+ <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
+ <uses-permission android:name="android.permission.RECORD_AUDIO" />
+ <uses-permission android:name="android.permission.WAKE_LOCK" />
+ <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+ <uses-permission android:name="android.permission.WRITE_SETTINGS" />
+
<application>
<uses-library android:name="android.test.runner" />
+
+ <activity android:name="android.media.cts.AudioManagerStub"
+ android:label="AudioManagerStub"/>
+ <activity android:name="android.media.cts.AudioManagerStubHelper"
+ android:label="AudioManagerStubHelper"/>
+ <activity android:name="android.media.cts.MediaStubActivity"
+ android:label="MediaStubActivity"
+ android:screenOrientation="nosensor"
+ android:configChanges="keyboard|keyboardHidden|orientation|screenSize">
+ <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.media.cts.FaceDetectorStub"
+ android:label="FaceDetectorStub"/>
+ <activity android:name="android.media.cts.MediaPlayerSurfaceStubActivity"
+ android:label="MediaPlayerSurfaceStubActivity">
+ <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.media.cts.RingtonePickerActivity"
+ android:label="RingtonePickerActivity">
+ <intent-filter>
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+ </intent-filter>
+ </activity>
</application>
- <instrumentation android:name="android.test.InstrumentationCtsTestRunner"
- android:targetPackage="com.android.cts.stub"
+ <instrumentation android:name="android.test.InstrumentationTestRunner"
+ android:targetPackage="com.android.cts.media"
android:label="CTS tests of android.media"/>
</manifest>
diff --git a/tests/tests/media/res/drawable/faces.jpg b/tests/tests/media/res/drawable/faces.jpg
new file mode 100644
index 0000000..0672022
--- /dev/null
+++ b/tests/tests/media/res/drawable/faces.jpg
Binary files differ
diff --git a/tests/res/drawable/single_face.jpg b/tests/tests/media/res/drawable/single_face.jpg
similarity index 100%
rename from tests/res/drawable/single_face.jpg
rename to tests/tests/media/res/drawable/single_face.jpg
Binary files differ
diff --git a/tests/res/layout/mediaplayer.xml b/tests/tests/media/res/layout/mediaplayer.xml
similarity index 100%
rename from tests/res/layout/mediaplayer.xml
rename to tests/tests/media/res/layout/mediaplayer.xml
diff --git a/tests/res/raw/a_4.ogg b/tests/tests/media/res/raw/a_4.ogg
similarity index 100%
rename from tests/res/raw/a_4.ogg
rename to tests/tests/media/res/raw/a_4.ogg
Binary files differ
diff --git a/tests/res/raw/a_4_aac.mp4 b/tests/tests/media/res/raw/a_4_aac.mp4
similarity index 100%
rename from tests/res/raw/a_4_aac.mp4
rename to tests/tests/media/res/raw/a_4_aac.mp4
Binary files differ
diff --git a/tests/res/raw/b_5.ogg b/tests/tests/media/res/raw/b_5.ogg
similarity index 100%
rename from tests/res/raw/b_5.ogg
rename to tests/tests/media/res/raw/b_5.ogg
Binary files differ
diff --git a/tests/res/raw/b_5_aac.mp4 b/tests/tests/media/res/raw/b_5_aac.mp4
similarity index 100%
rename from tests/res/raw/b_5_aac.mp4
rename to tests/tests/media/res/raw/b_5_aac.mp4
Binary files differ
diff --git a/tests/res/raw/c_sharp_5.ogg b/tests/tests/media/res/raw/c_sharp_5.ogg
similarity index 100%
rename from tests/res/raw/c_sharp_5.ogg
rename to tests/tests/media/res/raw/c_sharp_5.ogg
Binary files differ
diff --git a/tests/res/raw/c_sharp_5_aac.mp4 b/tests/tests/media/res/raw/c_sharp_5_aac.mp4
similarity index 100%
rename from tests/res/raw/c_sharp_5_aac.mp4
rename to tests/tests/media/res/raw/c_sharp_5_aac.mp4
Binary files differ
diff --git a/tests/res/raw/e_5.ogg b/tests/tests/media/res/raw/e_5.ogg
similarity index 100%
rename from tests/res/raw/e_5.ogg
rename to tests/tests/media/res/raw/e_5.ogg
Binary files differ
diff --git a/tests/res/raw/e_5_aac.mp4 b/tests/tests/media/res/raw/e_5_aac.mp4
similarity index 100%
rename from tests/res/raw/e_5_aac.mp4
rename to tests/tests/media/res/raw/e_5_aac.mp4
Binary files differ
diff --git a/tests/res/raw/g_sharp_5.ogg b/tests/tests/media/res/raw/g_sharp_5.ogg
similarity index 100%
rename from tests/res/raw/g_sharp_5.ogg
rename to tests/tests/media/res/raw/g_sharp_5.ogg
Binary files differ
diff --git a/tests/res/raw/g_sharp_5_aac.mp4 b/tests/tests/media/res/raw/g_sharp_5_aac.mp4
similarity index 100%
rename from tests/res/raw/g_sharp_5_aac.mp4
rename to tests/tests/media/res/raw/g_sharp_5_aac.mp4
Binary files differ
diff --git a/tests/res/raw/john_cage.ogg b/tests/tests/media/res/raw/john_cage.ogg
similarity index 100%
rename from tests/res/raw/john_cage.ogg
rename to tests/tests/media/res/raw/john_cage.ogg
Binary files differ
diff --git a/tests/res/raw/monodcneg.mp3 b/tests/tests/media/res/raw/monodcneg.mp3
similarity index 100%
rename from tests/res/raw/monodcneg.mp3
rename to tests/tests/media/res/raw/monodcneg.mp3
Binary files differ
diff --git a/tests/res/raw/monodcpos.mp3 b/tests/tests/media/res/raw/monodcpos.mp3
similarity index 100%
rename from tests/res/raw/monodcpos.mp3
rename to tests/tests/media/res/raw/monodcpos.mp3
Binary files differ
diff --git a/tests/res/raw/mononoisedcpos.m4a b/tests/tests/media/res/raw/mononoisedcpos.m4a
similarity index 100%
rename from tests/res/raw/mononoisedcpos.m4a
rename to tests/tests/media/res/raw/mononoisedcpos.m4a
Binary files differ
diff --git a/tests/res/raw/playlist1.pls b/tests/tests/media/res/raw/playlist1.pls
similarity index 100%
rename from tests/res/raw/playlist1.pls
rename to tests/tests/media/res/raw/playlist1.pls
diff --git a/tests/res/raw/playlist2.m3u b/tests/tests/media/res/raw/playlist2.m3u
similarity index 100%
rename from tests/res/raw/playlist2.m3u
rename to tests/tests/media/res/raw/playlist2.m3u
diff --git a/tests/res/raw/sine1320hz5sec.wav b/tests/tests/media/res/raw/sine1320hz5sec.wav
similarity index 100%
rename from tests/res/raw/sine1320hz5sec.wav
rename to tests/tests/media/res/raw/sine1320hz5sec.wav
Binary files differ
diff --git a/tests/res/raw/sinesweepflac.flac b/tests/tests/media/res/raw/sinesweepflac.flac
similarity index 100%
rename from tests/res/raw/sinesweepflac.flac
rename to tests/tests/media/res/raw/sinesweepflac.flac
Binary files differ
diff --git a/tests/res/raw/sinesweepm4a.m4a b/tests/tests/media/res/raw/sinesweepm4a.m4a
similarity index 100%
rename from tests/res/raw/sinesweepm4a.m4a
rename to tests/tests/media/res/raw/sinesweepm4a.m4a
Binary files differ
diff --git a/tests/res/raw/sinesweepmp3lame.mp3 b/tests/tests/media/res/raw/sinesweepmp3lame.mp3
similarity index 100%
rename from tests/res/raw/sinesweepmp3lame.mp3
rename to tests/tests/media/res/raw/sinesweepmp3lame.mp3
Binary files differ
diff --git a/tests/res/raw/sinesweepmp3smpb.mp3 b/tests/tests/media/res/raw/sinesweepmp3smpb.mp3
similarity index 100%
rename from tests/res/raw/sinesweepmp3smpb.mp3
rename to tests/tests/media/res/raw/sinesweepmp3smpb.mp3
Binary files differ
diff --git a/tests/res/raw/sinesweepogg.ogg b/tests/tests/media/res/raw/sinesweepogg.ogg
similarity index 100%
rename from tests/res/raw/sinesweepogg.ogg
rename to tests/tests/media/res/raw/sinesweepogg.ogg
Binary files differ
diff --git a/tests/res/raw/sinesweepraw.raw b/tests/tests/media/res/raw/sinesweepraw.raw
similarity index 100%
rename from tests/res/raw/sinesweepraw.raw
rename to tests/tests/media/res/raw/sinesweepraw.raw
Binary files differ
diff --git a/tests/res/raw/sinesweepwav.wav b/tests/tests/media/res/raw/sinesweepwav.wav
similarity index 100%
rename from tests/res/raw/sinesweepwav.wav
rename to tests/tests/media/res/raw/sinesweepwav.wav
Binary files differ
diff --git a/tests/res/raw/stereonoisedcpos.m4a b/tests/tests/media/res/raw/stereonoisedcpos.m4a
similarity index 100%
rename from tests/res/raw/stereonoisedcpos.m4a
rename to tests/tests/media/res/raw/stereonoisedcpos.m4a
Binary files differ
diff --git a/tests/res/raw/test_jet.jet b/tests/tests/media/res/raw/test_jet.jet
similarity index 100%
rename from tests/res/raw/test_jet.jet
rename to tests/tests/media/res/raw/test_jet.jet
Binary files differ
diff --git a/tests/tests/media/res/raw/testmp3.mp3 b/tests/tests/media/res/raw/testmp3.mp3
new file mode 100755
index 0000000..657faf7
--- /dev/null
+++ b/tests/tests/media/res/raw/testmp3.mp3
Binary files differ
diff --git a/tests/res/raw/testmp3_2.mp3 b/tests/tests/media/res/raw/testmp3_2.mp3
similarity index 100%
rename from tests/res/raw/testmp3_2.mp3
rename to tests/tests/media/res/raw/testmp3_2.mp3
Binary files differ
diff --git a/tests/tests/media/res/raw/testvideo.3gp b/tests/tests/media/res/raw/testvideo.3gp
new file mode 100644
index 0000000..1503272
--- /dev/null
+++ b/tests/tests/media/res/raw/testvideo.3gp
Binary files differ
diff --git a/tests/res/raw/video_176x144_3gp_h263_300kbps_12fps_aac_mono_24kbps_11025hz.3gp b/tests/tests/media/res/raw/video_176x144_3gp_h263_300kbps_12fps_aac_mono_24kbps_11025hz.3gp
similarity index 100%
rename from tests/res/raw/video_176x144_3gp_h263_300kbps_12fps_aac_mono_24kbps_11025hz.3gp
rename to tests/tests/media/res/raw/video_176x144_3gp_h263_300kbps_12fps_aac_mono_24kbps_11025hz.3gp
Binary files differ
diff --git a/tests/res/raw/video_176x144_3gp_h263_300kbps_12fps_aac_mono_24kbps_22050hz.3gp b/tests/tests/media/res/raw/video_176x144_3gp_h263_300kbps_12fps_aac_mono_24kbps_22050hz.3gp
similarity index 100%
rename from tests/res/raw/video_176x144_3gp_h263_300kbps_12fps_aac_mono_24kbps_22050hz.3gp
rename to tests/tests/media/res/raw/video_176x144_3gp_h263_300kbps_12fps_aac_mono_24kbps_22050hz.3gp
Binary files differ
diff --git a/tests/res/raw/video_176x144_3gp_h263_300kbps_12fps_aac_stereo_128kbps_11025hz.3gp b/tests/tests/media/res/raw/video_176x144_3gp_h263_300kbps_12fps_aac_stereo_128kbps_11025hz.3gp
similarity index 100%
rename from tests/res/raw/video_176x144_3gp_h263_300kbps_12fps_aac_stereo_128kbps_11025hz.3gp
rename to tests/tests/media/res/raw/video_176x144_3gp_h263_300kbps_12fps_aac_stereo_128kbps_11025hz.3gp
Binary files differ
diff --git a/tests/res/raw/video_176x144_3gp_h263_300kbps_12fps_aac_stereo_128kbps_22050hz.3gp b/tests/tests/media/res/raw/video_176x144_3gp_h263_300kbps_12fps_aac_stereo_128kbps_22050hz.3gp
similarity index 100%
rename from tests/res/raw/video_176x144_3gp_h263_300kbps_12fps_aac_stereo_128kbps_22050hz.3gp
rename to tests/tests/media/res/raw/video_176x144_3gp_h263_300kbps_12fps_aac_stereo_128kbps_22050hz.3gp
Binary files differ
diff --git a/tests/res/raw/video_176x144_3gp_h263_300kbps_12fps_aac_stereo_24kbps_11025hz.3gp b/tests/tests/media/res/raw/video_176x144_3gp_h263_300kbps_12fps_aac_stereo_24kbps_11025hz.3gp
similarity index 100%
rename from tests/res/raw/video_176x144_3gp_h263_300kbps_12fps_aac_stereo_24kbps_11025hz.3gp
rename to tests/tests/media/res/raw/video_176x144_3gp_h263_300kbps_12fps_aac_stereo_24kbps_11025hz.3gp
Binary files differ
diff --git a/tests/res/raw/video_176x144_3gp_h263_300kbps_12fps_aac_stereo_24kbps_22050hz.3gp b/tests/tests/media/res/raw/video_176x144_3gp_h263_300kbps_12fps_aac_stereo_24kbps_22050hz.3gp
similarity index 100%
rename from tests/res/raw/video_176x144_3gp_h263_300kbps_12fps_aac_stereo_24kbps_22050hz.3gp
rename to tests/tests/media/res/raw/video_176x144_3gp_h263_300kbps_12fps_aac_stereo_24kbps_22050hz.3gp
Binary files differ
diff --git a/tests/res/raw/video_176x144_3gp_h263_300kbps_25fps_aac_mono_24kbps_11025hz.3gp b/tests/tests/media/res/raw/video_176x144_3gp_h263_300kbps_25fps_aac_mono_24kbps_11025hz.3gp
similarity index 100%
rename from tests/res/raw/video_176x144_3gp_h263_300kbps_25fps_aac_mono_24kbps_11025hz.3gp
rename to tests/tests/media/res/raw/video_176x144_3gp_h263_300kbps_25fps_aac_mono_24kbps_11025hz.3gp
Binary files differ
diff --git a/tests/res/raw/video_176x144_3gp_h263_300kbps_25fps_aac_mono_24kbps_22050hz.3gp b/tests/tests/media/res/raw/video_176x144_3gp_h263_300kbps_25fps_aac_mono_24kbps_22050hz.3gp
similarity index 100%
rename from tests/res/raw/video_176x144_3gp_h263_300kbps_25fps_aac_mono_24kbps_22050hz.3gp
rename to tests/tests/media/res/raw/video_176x144_3gp_h263_300kbps_25fps_aac_mono_24kbps_22050hz.3gp
Binary files differ
diff --git a/tests/res/raw/video_176x144_3gp_h263_300kbps_25fps_aac_stereo_128kbps_11025hz.3gp b/tests/tests/media/res/raw/video_176x144_3gp_h263_300kbps_25fps_aac_stereo_128kbps_11025hz.3gp
similarity index 100%
rename from tests/res/raw/video_176x144_3gp_h263_300kbps_25fps_aac_stereo_128kbps_11025hz.3gp
rename to tests/tests/media/res/raw/video_176x144_3gp_h263_300kbps_25fps_aac_stereo_128kbps_11025hz.3gp
Binary files differ
diff --git a/tests/res/raw/video_176x144_3gp_h263_300kbps_25fps_aac_stereo_128kbps_22050hz.3gp b/tests/tests/media/res/raw/video_176x144_3gp_h263_300kbps_25fps_aac_stereo_128kbps_22050hz.3gp
similarity index 100%
rename from tests/res/raw/video_176x144_3gp_h263_300kbps_25fps_aac_stereo_128kbps_22050hz.3gp
rename to tests/tests/media/res/raw/video_176x144_3gp_h263_300kbps_25fps_aac_stereo_128kbps_22050hz.3gp
Binary files differ
diff --git a/tests/res/raw/video_176x144_3gp_h263_300kbps_25fps_aac_stereo_24kbps_11025hz.3gp b/tests/tests/media/res/raw/video_176x144_3gp_h263_300kbps_25fps_aac_stereo_24kbps_11025hz.3gp
similarity index 100%
rename from tests/res/raw/video_176x144_3gp_h263_300kbps_25fps_aac_stereo_24kbps_11025hz.3gp
rename to tests/tests/media/res/raw/video_176x144_3gp_h263_300kbps_25fps_aac_stereo_24kbps_11025hz.3gp
Binary files differ
diff --git a/tests/res/raw/video_176x144_3gp_h263_300kbps_25fps_aac_stereo_24kbps_22050hz.3gp b/tests/tests/media/res/raw/video_176x144_3gp_h263_300kbps_25fps_aac_stereo_24kbps_22050hz.3gp
similarity index 100%
rename from tests/res/raw/video_176x144_3gp_h263_300kbps_25fps_aac_stereo_24kbps_22050hz.3gp
rename to tests/tests/media/res/raw/video_176x144_3gp_h263_300kbps_25fps_aac_stereo_24kbps_22050hz.3gp
Binary files differ
diff --git a/tests/res/raw/video_176x144_3gp_h263_56kbps_12fps_aac_mono_24kbps_11025hz.3gp b/tests/tests/media/res/raw/video_176x144_3gp_h263_56kbps_12fps_aac_mono_24kbps_11025hz.3gp
similarity index 100%
rename from tests/res/raw/video_176x144_3gp_h263_56kbps_12fps_aac_mono_24kbps_11025hz.3gp
rename to tests/tests/media/res/raw/video_176x144_3gp_h263_56kbps_12fps_aac_mono_24kbps_11025hz.3gp
Binary files differ
diff --git a/tests/res/raw/video_176x144_3gp_h263_56kbps_12fps_aac_mono_24kbps_22050hz.3gp b/tests/tests/media/res/raw/video_176x144_3gp_h263_56kbps_12fps_aac_mono_24kbps_22050hz.3gp
similarity index 100%
rename from tests/res/raw/video_176x144_3gp_h263_56kbps_12fps_aac_mono_24kbps_22050hz.3gp
rename to tests/tests/media/res/raw/video_176x144_3gp_h263_56kbps_12fps_aac_mono_24kbps_22050hz.3gp
Binary files differ
diff --git a/tests/res/raw/video_176x144_3gp_h263_56kbps_12fps_aac_stereo_128kbps_11025hz.3gp b/tests/tests/media/res/raw/video_176x144_3gp_h263_56kbps_12fps_aac_stereo_128kbps_11025hz.3gp
similarity index 100%
rename from tests/res/raw/video_176x144_3gp_h263_56kbps_12fps_aac_stereo_128kbps_11025hz.3gp
rename to tests/tests/media/res/raw/video_176x144_3gp_h263_56kbps_12fps_aac_stereo_128kbps_11025hz.3gp
Binary files differ
diff --git a/tests/res/raw/video_176x144_3gp_h263_56kbps_12fps_aac_stereo_128kbps_22050hz.3gp b/tests/tests/media/res/raw/video_176x144_3gp_h263_56kbps_12fps_aac_stereo_128kbps_22050hz.3gp
similarity index 100%
rename from tests/res/raw/video_176x144_3gp_h263_56kbps_12fps_aac_stereo_128kbps_22050hz.3gp
rename to tests/tests/media/res/raw/video_176x144_3gp_h263_56kbps_12fps_aac_stereo_128kbps_22050hz.3gp
Binary files differ
diff --git a/tests/res/raw/video_176x144_3gp_h263_56kbps_12fps_aac_stereo_24kbps_11025hz.3gp b/tests/tests/media/res/raw/video_176x144_3gp_h263_56kbps_12fps_aac_stereo_24kbps_11025hz.3gp
similarity index 100%
rename from tests/res/raw/video_176x144_3gp_h263_56kbps_12fps_aac_stereo_24kbps_11025hz.3gp
rename to tests/tests/media/res/raw/video_176x144_3gp_h263_56kbps_12fps_aac_stereo_24kbps_11025hz.3gp
Binary files differ
diff --git a/tests/res/raw/video_176x144_3gp_h263_56kbps_12fps_aac_stereo_24kbps_22050hz.3gp b/tests/tests/media/res/raw/video_176x144_3gp_h263_56kbps_12fps_aac_stereo_24kbps_22050hz.3gp
similarity index 100%
rename from tests/res/raw/video_176x144_3gp_h263_56kbps_12fps_aac_stereo_24kbps_22050hz.3gp
rename to tests/tests/media/res/raw/video_176x144_3gp_h263_56kbps_12fps_aac_stereo_24kbps_22050hz.3gp
Binary files differ
diff --git a/tests/res/raw/video_176x144_3gp_h263_56kbps_25fps_aac_mono_24kbps_11025hz.3gp b/tests/tests/media/res/raw/video_176x144_3gp_h263_56kbps_25fps_aac_mono_24kbps_11025hz.3gp
similarity index 100%
rename from tests/res/raw/video_176x144_3gp_h263_56kbps_25fps_aac_mono_24kbps_11025hz.3gp
rename to tests/tests/media/res/raw/video_176x144_3gp_h263_56kbps_25fps_aac_mono_24kbps_11025hz.3gp
Binary files differ
diff --git a/tests/res/raw/video_176x144_3gp_h263_56kbps_25fps_aac_mono_24kbps_22050hz.3gp b/tests/tests/media/res/raw/video_176x144_3gp_h263_56kbps_25fps_aac_mono_24kbps_22050hz.3gp
similarity index 100%
rename from tests/res/raw/video_176x144_3gp_h263_56kbps_25fps_aac_mono_24kbps_22050hz.3gp
rename to tests/tests/media/res/raw/video_176x144_3gp_h263_56kbps_25fps_aac_mono_24kbps_22050hz.3gp
Binary files differ
diff --git a/tests/res/raw/video_176x144_3gp_h263_56kbps_25fps_aac_stereo_128kbps_11025hz.3gp b/tests/tests/media/res/raw/video_176x144_3gp_h263_56kbps_25fps_aac_stereo_128kbps_11025hz.3gp
similarity index 100%
rename from tests/res/raw/video_176x144_3gp_h263_56kbps_25fps_aac_stereo_128kbps_11025hz.3gp
rename to tests/tests/media/res/raw/video_176x144_3gp_h263_56kbps_25fps_aac_stereo_128kbps_11025hz.3gp
Binary files differ
diff --git a/tests/res/raw/video_176x144_3gp_h263_56kbps_25fps_aac_stereo_128kbps_22050hz.3gp b/tests/tests/media/res/raw/video_176x144_3gp_h263_56kbps_25fps_aac_stereo_128kbps_22050hz.3gp
similarity index 100%
rename from tests/res/raw/video_176x144_3gp_h263_56kbps_25fps_aac_stereo_128kbps_22050hz.3gp
rename to tests/tests/media/res/raw/video_176x144_3gp_h263_56kbps_25fps_aac_stereo_128kbps_22050hz.3gp
Binary files differ
diff --git a/tests/res/raw/video_176x144_3gp_h263_56kbps_25fps_aac_stereo_24kbps_11025hz.3gp b/tests/tests/media/res/raw/video_176x144_3gp_h263_56kbps_25fps_aac_stereo_24kbps_11025hz.3gp
similarity index 100%
rename from tests/res/raw/video_176x144_3gp_h263_56kbps_25fps_aac_stereo_24kbps_11025hz.3gp
rename to tests/tests/media/res/raw/video_176x144_3gp_h263_56kbps_25fps_aac_stereo_24kbps_11025hz.3gp
Binary files differ
diff --git a/tests/res/raw/video_176x144_3gp_h263_56kbps_25fps_aac_stereo_24kbps_22050hz.3gp b/tests/tests/media/res/raw/video_176x144_3gp_h263_56kbps_25fps_aac_stereo_24kbps_22050hz.3gp
similarity index 100%
rename from tests/res/raw/video_176x144_3gp_h263_56kbps_25fps_aac_stereo_24kbps_22050hz.3gp
rename to tests/tests/media/res/raw/video_176x144_3gp_h263_56kbps_25fps_aac_stereo_24kbps_22050hz.3gp
Binary files differ
diff --git a/tests/res/raw/video_480x360_mp4_h264_1000kbps_25fps_aac_stereo_128kbps_44100hz.mp4 b/tests/tests/media/res/raw/video_480x360_mp4_h264_1000kbps_25fps_aac_stereo_128kbps_44100hz.mp4
similarity index 100%
rename from tests/res/raw/video_480x360_mp4_h264_1000kbps_25fps_aac_stereo_128kbps_44100hz.mp4
rename to tests/tests/media/res/raw/video_480x360_mp4_h264_1000kbps_25fps_aac_stereo_128kbps_44100hz.mp4
Binary files differ
diff --git a/tests/res/raw/video_480x360_mp4_h264_1000kbps_30fps_aac_stereo_128kbps_44100hz.mp4 b/tests/tests/media/res/raw/video_480x360_mp4_h264_1000kbps_30fps_aac_stereo_128kbps_44100hz.mp4
similarity index 100%
rename from tests/res/raw/video_480x360_mp4_h264_1000kbps_30fps_aac_stereo_128kbps_44100hz.mp4
rename to tests/tests/media/res/raw/video_480x360_mp4_h264_1000kbps_30fps_aac_stereo_128kbps_44100hz.mp4
Binary files differ
diff --git a/tests/res/raw/video_480x360_mp4_h264_1350kbps_25fps_aac_stereo_128kbps_44100hz.mp4 b/tests/tests/media/res/raw/video_480x360_mp4_h264_1350kbps_25fps_aac_stereo_128kbps_44100hz.mp4
similarity index 100%
rename from tests/res/raw/video_480x360_mp4_h264_1350kbps_25fps_aac_stereo_128kbps_44100hz.mp4
rename to tests/tests/media/res/raw/video_480x360_mp4_h264_1350kbps_25fps_aac_stereo_128kbps_44100hz.mp4
Binary files differ
diff --git a/tests/res/raw/video_480x360_mp4_h264_1350kbps_30fps_aac_stereo_128kbps_44100hz.mp4 b/tests/tests/media/res/raw/video_480x360_mp4_h264_1350kbps_30fps_aac_stereo_128kbps_44100hz.mp4
similarity index 100%
rename from tests/res/raw/video_480x360_mp4_h264_1350kbps_30fps_aac_stereo_128kbps_44100hz.mp4
rename to tests/tests/media/res/raw/video_480x360_mp4_h264_1350kbps_30fps_aac_stereo_128kbps_44100hz.mp4
Binary files differ
diff --git a/tests/res/raw/video_480x360_mp4_h264_1350kbps_30fps_aac_stereo_192kbps_44100hz.mp4 b/tests/tests/media/res/raw/video_480x360_mp4_h264_1350kbps_30fps_aac_stereo_192kbps_44100hz.mp4
similarity index 100%
rename from tests/res/raw/video_480x360_mp4_h264_1350kbps_30fps_aac_stereo_192kbps_44100hz.mp4
rename to tests/tests/media/res/raw/video_480x360_mp4_h264_1350kbps_30fps_aac_stereo_192kbps_44100hz.mp4
Binary files differ
diff --git a/tests/res/raw/video_480x360_mp4_h264_500kbps_25fps_aac_stereo_128kbps_44100hz.mp4 b/tests/tests/media/res/raw/video_480x360_mp4_h264_500kbps_25fps_aac_stereo_128kbps_44100hz.mp4
similarity index 100%
rename from tests/res/raw/video_480x360_mp4_h264_500kbps_25fps_aac_stereo_128kbps_44100hz.mp4
rename to tests/tests/media/res/raw/video_480x360_mp4_h264_500kbps_25fps_aac_stereo_128kbps_44100hz.mp4
Binary files differ
diff --git a/tests/res/raw/video_480x360_mp4_h264_500kbps_30fps_aac_stereo_128kbps_44100hz.mp4 b/tests/tests/media/res/raw/video_480x360_mp4_h264_500kbps_30fps_aac_stereo_128kbps_44100hz.mp4
similarity index 100%
rename from tests/res/raw/video_480x360_mp4_h264_500kbps_30fps_aac_stereo_128kbps_44100hz.mp4
rename to tests/tests/media/res/raw/video_480x360_mp4_h264_500kbps_30fps_aac_stereo_128kbps_44100hz.mp4
Binary files differ
diff --git a/tests/tests/media/src/android/media/cts/AudioEffectTest.java b/tests/tests/media/src/android/media/cts/AudioEffectTest.java
index 1d85af3..1dea39a 100644
--- a/tests/tests/media/src/android/media/cts/AudioEffectTest.java
+++ b/tests/tests/media/src/android/media/cts/AudioEffectTest.java
@@ -16,7 +16,7 @@
package android.media.cts;
-import com.android.cts.stub.R;
+import com.android.cts.media.R;
import android.content.res.AssetFileDescriptor;
import android.media.audiofx.AudioEffect;
diff --git a/tests/src/android/media/cts/AudioManagerStub.java b/tests/tests/media/src/android/media/cts/AudioManagerStub.java
similarity index 98%
rename from tests/src/android/media/cts/AudioManagerStub.java
rename to tests/tests/media/src/android/media/cts/AudioManagerStub.java
index e5d6f33..baae5fc 100644
--- a/tests/src/android/media/cts/AudioManagerStub.java
+++ b/tests/tests/media/src/android/media/cts/AudioManagerStub.java
@@ -16,7 +16,8 @@
package android.media.cts;
-import com.android.cts.stub.R;
+import com.android.cts.media.R;
+
import android.app.Activity;
import android.app.cts.CTSResult;
import android.content.Context;
diff --git a/tests/src/android/media/cts/AudioManagerStubHelper.java b/tests/tests/media/src/android/media/cts/AudioManagerStubHelper.java
similarity index 100%
rename from tests/src/android/media/cts/AudioManagerStubHelper.java
rename to tests/tests/media/src/android/media/cts/AudioManagerStubHelper.java
diff --git a/tests/tests/media/src/android/media/cts/AudioManagerTest.java b/tests/tests/media/src/android/media/cts/AudioManagerTest.java
index d52e699..1f7c20f 100644
--- a/tests/tests/media/src/android/media/cts/AudioManagerTest.java
+++ b/tests/tests/media/src/android/media/cts/AudioManagerTest.java
@@ -36,7 +36,7 @@
import static android.media.AudioManager.VIBRATE_TYPE_RINGER;
import static android.provider.Settings.System.SOUND_EFFECTS_ENABLED;
-import com.android.cts.stub.R;
+import com.android.cts.media.R;
import android.content.Context;
diff --git a/tests/tests/media/src/android/media/cts/AudioPreProcessingTest.java b/tests/tests/media/src/android/media/cts/AudioPreProcessingTest.java
index 2f0ba20..e993695 100644
--- a/tests/tests/media/src/android/media/cts/AudioPreProcessingTest.java
+++ b/tests/tests/media/src/android/media/cts/AudioPreProcessingTest.java
@@ -16,7 +16,7 @@
package android.media.cts;
-import com.android.cts.stub.R;
+import com.android.cts.media.R;
import android.media.AudioFormat;
import android.media.AudioRecord;
diff --git a/tests/tests/media/src/android/media/cts/DecoderTest.java b/tests/tests/media/src/android/media/cts/DecoderTest.java
index a63eaac..ac80538 100644
--- a/tests/tests/media/src/android/media/cts/DecoderTest.java
+++ b/tests/tests/media/src/android/media/cts/DecoderTest.java
@@ -16,7 +16,7 @@
package android.media.cts;
-import com.android.cts.stub.R;
+import com.android.cts.media.R;
import android.content.Context;
import android.content.res.AssetFileDescriptor;
diff --git a/tests/src/android/media/cts/FaceDetectorStub.java b/tests/tests/media/src/android/media/cts/FaceDetectorStub.java
similarity index 97%
rename from tests/src/android/media/cts/FaceDetectorStub.java
rename to tests/tests/media/src/android/media/cts/FaceDetectorStub.java
index 4c8344b..b1cb82d 100644
--- a/tests/src/android/media/cts/FaceDetectorStub.java
+++ b/tests/tests/media/src/android/media/cts/FaceDetectorStub.java
@@ -16,7 +16,7 @@
package android.media.cts;
-import com.android.cts.stub.R;
+import com.android.cts.media.R;
import android.app.Activity;
import android.media.FaceDetector.Face;
diff --git a/tests/tests/media/src/android/media/cts/FaceDetectorTest.java b/tests/tests/media/src/android/media/cts/FaceDetectorTest.java
index 3d98ddc..4eebd52 100644
--- a/tests/tests/media/src/android/media/cts/FaceDetectorTest.java
+++ b/tests/tests/media/src/android/media/cts/FaceDetectorTest.java
@@ -16,7 +16,7 @@
package android.media.cts;
-import com.android.cts.stub.R;
+import com.android.cts.media.R;
import android.content.Intent;
diff --git a/tests/tests/media/src/android/media/cts/FaceDetector_FaceTest.java b/tests/tests/media/src/android/media/cts/FaceDetector_FaceTest.java
index 709a4be..32c68fb 100644
--- a/tests/tests/media/src/android/media/cts/FaceDetector_FaceTest.java
+++ b/tests/tests/media/src/android/media/cts/FaceDetector_FaceTest.java
@@ -16,7 +16,7 @@
package android.media.cts;
-import com.android.cts.stub.R;
+import com.android.cts.media.R;
import android.content.Intent;
diff --git a/tests/src/android/media/cts/FaceView.java b/tests/tests/media/src/android/media/cts/FaceView.java
similarity index 100%
rename from tests/src/android/media/cts/FaceView.java
rename to tests/tests/media/src/android/media/cts/FaceView.java
diff --git a/tests/tests/media/src/android/media/cts/JetPlayerTest.java b/tests/tests/media/src/android/media/cts/JetPlayerTest.java
index 848d395..07f1c1b 100644
--- a/tests/tests/media/src/android/media/cts/JetPlayerTest.java
+++ b/tests/tests/media/src/android/media/cts/JetPlayerTest.java
@@ -16,7 +16,7 @@
package android.media.cts;
-import com.android.cts.stub.R;
+import com.android.cts.media.R;
import android.content.res.AssetFileDescriptor;
diff --git a/tests/src/android/media/cts/MediaPlayerSurfaceStubActivity.java b/tests/tests/media/src/android/media/cts/MediaPlayerSurfaceStubActivity.java
similarity index 98%
rename from tests/src/android/media/cts/MediaPlayerSurfaceStubActivity.java
rename to tests/tests/media/src/android/media/cts/MediaPlayerSurfaceStubActivity.java
index 3cd6fc8..c47995c 100644
--- a/tests/src/android/media/cts/MediaPlayerSurfaceStubActivity.java
+++ b/tests/tests/media/src/android/media/cts/MediaPlayerSurfaceStubActivity.java
@@ -15,7 +15,7 @@
*/
package android.media.cts;
-import com.android.cts.stub.R;
+import com.android.cts.media.R;
import android.app.Activity;
import android.content.res.AssetFileDescriptor;
diff --git a/tests/tests/media/src/android/media/cts/MediaPlayerSurfaceTest.java b/tests/tests/media/src/android/media/cts/MediaPlayerSurfaceTest.java
index 196382d..481c8d0 100644
--- a/tests/tests/media/src/android/media/cts/MediaPlayerSurfaceTest.java
+++ b/tests/tests/media/src/android/media/cts/MediaPlayerSurfaceTest.java
@@ -29,7 +29,7 @@
public void testSetSurface() throws Exception {
Bundle extras = new Bundle();
- MediaPlayerSurfaceStubActivity activity = launchActivity("com.android.cts.stub",
+ MediaPlayerSurfaceStubActivity activity = launchActivity("com.android.cts.media",
MediaPlayerSurfaceStubActivity.class, extras);
activity.playVideo();
activity.finish();
diff --git a/tests/tests/media/src/android/media/cts/MediaPlayerTest.java b/tests/tests/media/src/android/media/cts/MediaPlayerTest.java
index 3274d13..90ed4fc 100644
--- a/tests/tests/media/src/android/media/cts/MediaPlayerTest.java
+++ b/tests/tests/media/src/android/media/cts/MediaPlayerTest.java
@@ -15,7 +15,7 @@
*/
package android.media.cts;
-import com.android.cts.stub.R;
+import com.android.cts.media.R;
import android.content.Context;
import android.content.pm.PackageManager;
diff --git a/tests/tests/media/src/android/media/cts/MediaScannerConnectionTest.java b/tests/tests/media/src/android/media/cts/MediaScannerConnectionTest.java
index f6340f4..4234a5b 100644
--- a/tests/tests/media/src/android/media/cts/MediaScannerConnectionTest.java
+++ b/tests/tests/media/src/android/media/cts/MediaScannerConnectionTest.java
@@ -16,7 +16,7 @@
package android.media.cts;
-import com.android.cts.stub.R;
+import com.android.cts.media.R;
import android.content.ComponentName;
diff --git a/tests/tests/media/src/android/media/cts/MediaScannerTest.java b/tests/tests/media/src/android/media/cts/MediaScannerTest.java
index a56042b..e121c52 100644
--- a/tests/tests/media/src/android/media/cts/MediaScannerTest.java
+++ b/tests/tests/media/src/android/media/cts/MediaScannerTest.java
@@ -16,7 +16,7 @@
package android.media.cts;
-import com.android.cts.stub.R;
+import com.android.cts.media.R;
import android.content.ComponentName;
import android.content.ContentResolver;
diff --git a/tests/src/android/media/cts/MediaStubActivity.java b/tests/tests/media/src/android/media/cts/MediaStubActivity.java
similarity index 97%
rename from tests/src/android/media/cts/MediaStubActivity.java
rename to tests/tests/media/src/android/media/cts/MediaStubActivity.java
index 114772e..6d111af 100644
--- a/tests/src/android/media/cts/MediaStubActivity.java
+++ b/tests/tests/media/src/android/media/cts/MediaStubActivity.java
@@ -15,7 +15,7 @@
*/
package android.media.cts;
-import com.android.cts.stub.R;
+import com.android.cts.media.R;
import android.app.Activity;
import android.os.Bundle;
diff --git a/tests/tests/media/src/android/media/cts/RingtoneManagerTest.java b/tests/tests/media/src/android/media/cts/RingtoneManagerTest.java
index e667516..1fe10ef 100644
--- a/tests/tests/media/src/android/media/cts/RingtoneManagerTest.java
+++ b/tests/tests/media/src/android/media/cts/RingtoneManagerTest.java
@@ -15,7 +15,7 @@
*/
package android.media.cts;
-import com.android.cts.stub.R;
+import com.android.cts.media.R;
import android.app.Activity;
diff --git a/tests/src/android/media/cts/RingtonePickerActivity.java b/tests/tests/media/src/android/media/cts/RingtonePickerActivity.java
similarity index 100%
rename from tests/src/android/media/cts/RingtonePickerActivity.java
rename to tests/tests/media/src/android/media/cts/RingtonePickerActivity.java
diff --git a/tests/tests/media/src/android/media/cts/SoundPoolAacTest.java b/tests/tests/media/src/android/media/cts/SoundPoolAacTest.java
index edd4d58..a5eaf6b 100644
--- a/tests/tests/media/src/android/media/cts/SoundPoolAacTest.java
+++ b/tests/tests/media/src/android/media/cts/SoundPoolAacTest.java
@@ -16,7 +16,7 @@
package android.media.cts;
-import com.android.cts.stub.R;
+import com.android.cts.media.R;
public class SoundPoolAacTest extends SoundPoolTest {
diff --git a/tests/tests/media/src/android/media/cts/SoundPoolOggTest.java b/tests/tests/media/src/android/media/cts/SoundPoolOggTest.java
index 14bb47e..d35a93e 100644
--- a/tests/tests/media/src/android/media/cts/SoundPoolOggTest.java
+++ b/tests/tests/media/src/android/media/cts/SoundPoolOggTest.java
@@ -16,7 +16,7 @@
package android.media.cts;
-import com.android.cts.stub.R;
+import com.android.cts.media.R;
public class SoundPoolOggTest extends SoundPoolTest {
diff --git a/tests/tests/media/src/android/media/cts/SoundPoolTest.java b/tests/tests/media/src/android/media/cts/SoundPoolTest.java
index c0ab192..15d18a0 100644
--- a/tests/tests/media/src/android/media/cts/SoundPoolTest.java
+++ b/tests/tests/media/src/android/media/cts/SoundPoolTest.java
@@ -16,7 +16,7 @@
package android.media.cts;
-import com.android.cts.stub.R;
+import com.android.cts.media.R;
import android.content.Context;
diff --git a/tests/tests/media/src/android/media/cts/VideoEditorTest.java b/tests/tests/media/src/android/media/cts/VideoEditorTest.java
index 481f4d6..37a8246 100644
--- a/tests/tests/media/src/android/media/cts/VideoEditorTest.java
+++ b/tests/tests/media/src/android/media/cts/VideoEditorTest.java
@@ -16,7 +16,7 @@
package android.media.cts;
-import com.android.cts.stub.R;
+import com.android.cts.media.R;
import android.test.ActivityInstrumentationTestCase2;
diff --git a/tests/src/android/media/cts/VideoSurfaceView.java b/tests/tests/media/src/android/media/cts/VideoSurfaceView.java
similarity index 99%
rename from tests/src/android/media/cts/VideoSurfaceView.java
rename to tests/tests/media/src/android/media/cts/VideoSurfaceView.java
index ae3da1a..943a56b 100644
--- a/tests/src/android/media/cts/VideoSurfaceView.java
+++ b/tests/tests/media/src/android/media/cts/VideoSurfaceView.java
@@ -16,7 +16,7 @@
package android.media.cts;
-import com.android.cts.stub.R;
+import com.android.cts.media.R;
import java.io.IOException;
import java.nio.ByteBuffer;
