am 14b5f131: Merge "camera2 docs: Fix instructions for using SurfaceView." into lmp-preview-dev

* commit '14b5f131c7118d58a6215e1f6d877d5cd31de54c':
  camera2 docs: Fix instructions for using SurfaceView.
This commit is contained in:
Eino-Ville Talvala
2014-06-13 00:35:59 +00:00
committed by Android Git Automerger

View File

@@ -154,10 +154,11 @@ public abstract class CameraDevice implements AutoCloseable {
*
* <ul>
*
* <li>For drawing to a {@link android.view.SurfaceView SurfaceView}: Set the size of the
* Surface with {@link android.view.SurfaceHolder#setFixedSize} to be one of the sizes
* returned by
* {@link StreamConfigurationMap#getOutputSizes(Class) getOutputSizes(SurfaceView.class)}
* <li>For drawing to a {@link android.view.SurfaceView SurfaceView}: Once the SurfaceView's
* Surface is {@link android.view.SurfaceHolder.Callback#surfaceCreated created}, set the
* size of the Surface with {@link android.view.SurfaceHolder#setFixedSize} to be one of the
* sizes returned by
* {@link StreamConfigurationMap#getOutputSizes(Class) getOutputSizes(SurfaceHolder.class)}
* and then obtain the Surface by calling {@link android.view.SurfaceHolder#getSurface}.</li>
*
* <li>For accessing through an OpenGL texture via a