Add video for VideoView demo
Add one of the CTS test videos so the demo works out of the box, and
make the video fill the screen instead of hardcoding it to a tiny size.
Change-Id: Ie26a4ae0e186fe966d0679b088492a0c7d035713
diff --git a/samples/ApiDemos/res/layout/videoview.xml b/samples/ApiDemos/res/layout/videoview.xml
index db97a11..ff636b9 100644
--- a/samples/ApiDemos/res/layout/videoview.xml
+++ b/samples/ApiDemos/res/layout/videoview.xml
@@ -1,14 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:orientation="vertical"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
>
<VideoView
android:id="@+id/surface_view"
- android:layout_width="320px"
- android:layout_height="240px"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_gravity="center"
/>
-</LinearLayout>
+</FrameLayout>
diff --git a/samples/ApiDemos/res/raw/videoviewdemo.mp4 b/samples/ApiDemos/res/raw/videoviewdemo.mp4
new file mode 100644
index 0000000..5772810
--- /dev/null
+++ b/samples/ApiDemos/res/raw/videoviewdemo.mp4
Binary files differ
diff --git a/samples/ApiDemos/src/com/example/android/apis/media/VideoViewDemo.java b/samples/ApiDemos/src/com/example/android/apis/media/VideoViewDemo.java
index e72c077..5143b4f 100644
--- a/samples/ApiDemos/src/com/example/android/apis/media/VideoViewDemo.java
+++ b/samples/ApiDemos/src/com/example/android/apis/media/VideoViewDemo.java
@@ -18,6 +18,7 @@
import com.example.android.apis.R;
import android.app.Activity;
+import android.net.Uri;
import android.os.Bundle;
import android.widget.MediaController;
import android.widget.Toast;
@@ -29,7 +30,6 @@
* TODO: Set the path variable to a streaming video URL or a local media
* file path.
*/
- private String path = "";
private VideoView mVideoView;
@Override
@@ -38,24 +38,14 @@
setContentView(R.layout.videoview);
mVideoView = (VideoView) findViewById(R.id.surface_view);
- if (path == "") {
- // Tell the user to provide a media file URL/path.
- Toast.makeText(
- VideoViewDemo.this,
- "Please edit VideoViewDemo Activity, and set path"
- + " variable to your media file URL/path",
- Toast.LENGTH_LONG).show();
- } else {
+ /*
+ * Alternatively, you can use mVideoView.setVideoPath(<path>);
+ */
+ mVideoView.setVideoURI(Uri.parse("android.resource://" + getPackageName() +
+ "/" + R.raw.videoviewdemo));
+ mVideoView.setMediaController(new MediaController(this));
+ mVideoView.requestFocus();
- /*
- * Alternatively,for streaming media you can use
- * mVideoView.setVideoURI(Uri.parse(URLstring));
- */
- mVideoView.setVideoPath(path);
- mVideoView.setMediaController(new MediaController(this));
- mVideoView.requestFocus();
-
- }
}
}
