Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 52d6245b authored by Android (Google) Code Review's avatar Android (Google) Code Review
Browse files

Merge change 22995 into eclair 

* changes:
  	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.
parents de5cd3d8 d3b0d642

media/tests/MediaFrameworkTest/res/layout/surface_view.xml

+3 −4
Original line number Diff line number Diff line
@@ -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"

     />

media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaFrameworkTest.java

+0 −4
Original line number Diff line number Diff line
@@ -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

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

+8 −1
Original line number Diff line number Diff line
@@ -435,10 +435,17 @@ 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 {

        boolean onPrepareSuccess =