From d3b0d642c9f87acf586868139d4a54f43b2a71ad Mon Sep 17 00:00:00 2001
From: Yu Shan Emily Lau <yslau@google.com>
Date: Thu, 27 Aug 2009 15:51:02 -0700
Subject: [PATCH] 	modified:   res/layout/surface_view.xml 
 modified:   src/com/android/mediaframeworktest/MediaFrameworkTest.java 
 modified:  
 src/com/android/mediaframeworktest/functional/MediaPlayerApiTest.java        
 Fixed the async mp3 playback test case and also switch the base activity to
 full screen.

	modified:   src/com/android/mediaframeworktest/functional/MediaPlayerApiTest.java

	modified:   tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaPlayerApiTest.java

	modified:   tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaPlayerApiTest.java
---
 .../tests/MediaFrameworkTest/res/layout/surface_view.xml | 7 +++----
 .../android/mediaframeworktest/MediaFrameworkTest.java   | 4 ----
 .../functional/MediaPlayerApiTest.java                   | 9 ++++++++-
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/media/tests/MediaFrameworkTest/res/layout/surface_view.xml b/media/tests/MediaFrameworkTest/res/layout/surface_view.xml
index c25e4760744d9..cbd1ff811751f 100644
--- a/media/tests/MediaFrameworkTest/res/layout/surface_view.xml
+++ b/media/tests/MediaFrameworkTest/res/layout/surface_view.xml
@@ -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"
      />
      
diff --git a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaFrameworkTest.java b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaFrameworkTest.java
index e65cf41975fec..5e830a818932b 100644
--- a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaFrameworkTest.java
+++ b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaFrameworkTest.java
@@ -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
diff --git a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaPlayerApiTest.java b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaPlayerApiTest.java
index ea42f53155dfc..30e2d6c8e6987 100644
--- a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaPlayerApiTest.java
+++ b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaPlayerApiTest.java
@@ -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 {