diff options
| author | Eino-Ville Talvala <etalvala@google.com> | 2014-06-13 00:35:59 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-06-13 00:35:59 +0000 |
| commit | c5c363f0ffd9b554ebab9aa6e02c4d55a3398648 (patch) | |
| tree | 4040d2712919f4edabe704dd6d7e5d2e7ab98aba /core/java/android | |
| parent | 221748039c74215192e9e538a5d05f601b441242 (diff) | |
| parent | fb587f4f6b132a06b08a3fd4b2b1206dcb58224a (diff) | |
| download | frameworks_base-c5c363f0ffd9b554ebab9aa6e02c4d55a3398648.zip frameworks_base-c5c363f0ffd9b554ebab9aa6e02c4d55a3398648.tar.gz frameworks_base-c5c363f0ffd9b554ebab9aa6e02c4d55a3398648.tar.bz2 | |
am 14b5f131: Merge "camera2 docs: Fix instructions for using SurfaceView." into lmp-preview-dev
* commit '14b5f131c7118d58a6215e1f6d877d5cd31de54c':
camera2 docs: Fix instructions for using SurfaceView.
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/hardware/camera2/CameraDevice.java | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/core/java/android/hardware/camera2/CameraDevice.java b/core/java/android/hardware/camera2/CameraDevice.java index 77d0c41..1f89d33 100644 --- a/core/java/android/hardware/camera2/CameraDevice.java +++ b/core/java/android/hardware/camera2/CameraDevice.java @@ -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 |