Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 52d6245b: Merge change 22995 into eclair

Browse Source 
Merge commit '52d6245ba2454eab456d609d065283dfa76e8c79' into eclair-plus-aosp

* commit '52d6245ba2454eab456d609d065283dfa76e8c79':
  modified:   res/layout/surface_view.xml
This commit is contained in:
Yu Shan Emily Lau
2009-08-31 12:10:07 -07:00
committed by Android Git Automerger
parent 6de3cc94d2 52d6245ba2
commit 4e22f62cbb
3 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
media/tests/MediaFrameworkTest/res/layout/surface_view.xml
View File

@@ -21,13 +21,12 @@
<FrameLayout
android:layout_width="fill_parent"
android:layout_height="0px"
android:layout_weight="1">
android:layout_height="fill_parent">
<SurfaceView
android:id="@+id/surface_view"
android:layout_width="320dip"
android:layout_height="240dip"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:layout_centerInParent="true"
/>

4
media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaFrameworkTest.java
View File

@@ -69,10 +69,6 @@ public class MediaFrameworkTest extends Activity {
setContentView(R.layout.surface_view);
mSurfaceView = (SurfaceView)findViewById(R.id.surface_view);
ViewGroup.LayoutParams lp = mSurfaceView.getLayoutParams();
lp.width = 320;
lp.height = 240;
mSurfaceView.setLayoutParams(lp);
mSurfaceView.getHolder().setFixedSize(320, 240);
mSurfaceView.getHolder().setType(SurfaceHolder.SURFACE_TYPE_PUSH_BUFFERS);
//Get the midi fd

9
media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaPlayerApiTest.java
View File

@@ -435,9 +435,16 @@ public class MediaPlayerApiTest extends ActivityInstrumentationTestCase<MediaFra
@LargeTest
public void testLocalMp3PrepareAsyncCallback() throws Exception {
boolean onPrepareSuccess =
CodecTest.prepareAsyncCallback(MediaNames.VIDEO_H263_AMR, false);
CodecTest.prepareAsyncCallback(MediaNames.MP3CBR, false);
assertTrue("LocalMp3prepareAsyncCallback", onPrepareSuccess);
}
@LargeTest
public void testLocalH263AMRPrepareAsyncCallback() throws Exception {
boolean onPrepareSuccess =
CodecTest.prepareAsyncCallback(MediaNames.VIDEO_H263_AMR, false);
assertTrue("testLocalH263AMRPrepareAsyncCallback", onPrepareSuccess);
}
@LargeTest
public void testStreamPrepareAsyncCallback() throws Exception {