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

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

Merge change Ib3558f35 into eclair-mr2 

* changes:
  Make our choice of surface explicit.
parents 1297164a d594fe17

opengl/tests/gldual/src/com/android/gldual/GLDualActivity.java

+1 −0
Original line number Original line Diff line number Diff line
@@ -33,6 +33,7 @@ public class GLDualActivity extends Activity { 
        super.onCreate(icicle);

        super.onCreate(icicle);

        View root = getLayoutInflater().inflate(R.layout.gldual_activity, null);

        View root = getLayoutInflater().inflate(R.layout.gldual_activity, null);

        mGLView = (GLSurfaceView) root.findViewById(R.id.gl1);

        mGLView = (GLSurfaceView) root.findViewById(R.id.gl1);

        mGLView.setEGLConfigChooser(5,6,5,0,0,0);

        mGLView.setRenderer(new TriangleRenderer());

        mGLView.setRenderer(new TriangleRenderer());

        mGL2View = (GLDualGL2View) root.findViewById(R.id.gl2);

        mGL2View = (GLDualGL2View) root.findViewById(R.id.gl2);

        setContentView(root);

        setContentView(root);