summaryrefslogtreecommitdiffstats
path: root/media/tests/MediaFrameworkTest/res
diff options
context:
space:
mode:
authorBasavapatna Dattaguru <dattaguru@google.com>2011-02-13 20:28:38 -0800
committerBasavapatna Dattaguru <dattaguru@google.com>2011-02-14 20:59:51 -0800
commit0554f32afd5309344b8d0ddcebd5ff7bc6ae3410 (patch)
treed0d3f43034407725c69e4a942c141ab37b3b90c6 /media/tests/MediaFrameworkTest/res
parente77345966cbc2490ae7f0e343294a1ac215f07d5 (diff)
downloadframeworks_base-0554f32afd5309344b8d0ddcebd5ff7bc6ae3410.zip
frameworks_base-0554f32afd5309344b8d0ddcebd5ff7bc6ae3410.tar.gz
frameworks_base-0554f32afd5309344b8d0ddcebd5ff7bc6ae3410.tar.bz2
VideoEditor:IssueID:3396697: Added Preview Test code
This has dependency on Ide5ee82b24806a52b4e612db4bc3c34f75e4465a Removed trailing space in xml file Removed dependency on test cases other than Preview & API Change-Id: I835c0ca17d6ff15819407eb930cca8a08b095287
Diffstat (limited to 'media/tests/MediaFrameworkTest/res')
-rw-r--r--media/tests/MediaFrameworkTest/res/layout/surface_view.xml26
1 files changed, 15 insertions, 11 deletions
diff --git a/media/tests/MediaFrameworkTest/res/layout/surface_view.xml b/media/tests/MediaFrameworkTest/res/layout/surface_view.xml
index a72c283..4999e5d 100644
--- a/media/tests/MediaFrameworkTest/res/layout/surface_view.xml
+++ b/media/tests/MediaFrameworkTest/res/layout/surface_view.xml
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2007 The Android Open Source Project
+<!-- Copyright (C) 2011 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.
@@ -14,29 +14,33 @@
limitations under the License.
-->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="match_parent"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<FrameLayout
android:layout_width="match_parent"
android:layout_height="match_parent">
-
+
<SurfaceView
android:id="@+id/surface_view"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_centerInParent="true"
/>
-
- <VideoView
- android:id="@+id/video_view"
+
+ <ImageView android:id="@+id/overlay_layer"
+ android:layout_width="0dip"
+ android:layout_height="392dip"/>
+
+ <VideoView
+ android:id="@+id/video_view"
android:layout_width="320px"
android:layout_height="240px"
/>
-
+
</FrameLayout>
-
+
</LinearLayout>