Code drop from //branches/cupcake/...@124589

7 files changed, 105 insertions, 0 deletions

diff --git a/media/tests/MediaFrameworkTest/res/drawable/icon.png b/media/tests/MediaFrameworkTest/res/drawable/icon.png
new file mode 100644
index 0000000..64e3601
--- /dev/null
+++ b/media/tests/MediaFrameworkTest/res/drawable/icon.png
diff --git a/media/tests/MediaFrameworkTest/res/layout/movie_view.xml b/media/tests/MediaFrameworkTest/res/layout/movie_view.xml
new file mode 100644
index 0000000..35fedfa
--- /dev/null
+++ b/media/tests/MediaFrameworkTest/res/layout/movie_view.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 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.
+-->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" 	 	
+	android:layout_width="fill_parent" 
+	android:layout_height="fill_parent"
+	android:orientation="vertical">
+
+	<FrameLayout
+		android:layout_width="fill_parent"
+		android:layout_height="0px"
+		android:layout_weight="1">
+		
+	<VideoView 
+	 android:id="@+id/surface_view" 
+        android:layout_width="320px"
+        android:layout_height="240px"
+	/>
+	</FrameLayout>
+	
+	<LinearLayout 	
+	android:layout_width="fill_parent" 
+	android:layout_height="wrap_content"
+	android:orientation="vertical">
+	
+	 <EditText android:id="@+id/url"
+        android:layout_width="fill_parent" 
+        android:layout_height="wrap_content"
+        android:layout_weight="0"
+        android:singleLine="true"
+        android:paddingBottom="8dip">
+        <requestFocus />
+    </EditText>
+
+    <Button android:id="@+id/open"
+        android:layout_width="wrap_content" 
+        android:layout_height="wrap_content" 
+        android:layout_weight="0"
+        android:text="@string/open_url">
+    </Button>
+    
+    </LinearLayout>
+    
+</LinearLayout>
diff --git a/media/tests/MediaFrameworkTest/res/layout/surface_view.xml b/media/tests/MediaFrameworkTest/res/layout/surface_view.xml
new file mode 100644
index 0000000..c25e476
--- /dev/null
+++ b/media/tests/MediaFrameworkTest/res/layout/surface_view.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 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.
+-->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"    
+  android:layout_width="fill_parent" 
+  android:layout_height="fill_parent"
+  android:orientation="vertical">
+
+  <FrameLayout
+    android:layout_width="fill_parent"
+    android:layout_height="0px"
+    android:layout_weight="1">
+    
+  <SurfaceView
+     android:id="@+id/surface_view"
+     android:layout_width="320dip"
+     android:layout_height="240dip"
+     android:layout_centerInParent="true"
+     />
+     
+  <VideoView 
+   android:id="@+id/video_view" 
+        android:layout_width="320px"
+        android:layout_height="240px"
+  />
+  
+  </FrameLayout>
+    
+</LinearLayout>
+
diff --git a/media/tests/MediaFrameworkTest/res/raw/shortmp3.mp3 b/media/tests/MediaFrameworkTest/res/raw/shortmp3.mp3
new file mode 100644
index 0000000..3af32a15
--- /dev/null
+++ b/media/tests/MediaFrameworkTest/res/raw/shortmp3.mp3
diff --git a/media/tests/MediaFrameworkTest/res/raw/testmidi.mid b/media/tests/MediaFrameworkTest/res/raw/testmidi.mid
new file mode 100644
index 0000000..df84e20
--- /dev/null
+++ b/media/tests/MediaFrameworkTest/res/raw/testmidi.mid
diff --git a/media/tests/MediaFrameworkTest/res/raw/testmp3.mp3 b/media/tests/MediaFrameworkTest/res/raw/testmp3.mp3
new file mode 100644
index 0000000..89c44b0
--- /dev/null
+++ b/media/tests/MediaFrameworkTest/res/raw/testmp3.mp3
diff --git a/media/tests/MediaFrameworkTest/res/values/strings.xml b/media/tests/MediaFrameworkTest/res/values/strings.xml
new file mode 100644
index 0000000..a24309f
--- /dev/null
+++ b/media/tests/MediaFrameworkTest/res/values/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">mediaPlayerApiTest</string>
+    <string name="open_url">Open</string>
+</resources>