LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Docs: Sync browseable samples for lmp-docs

Browse Source 
Synced to developers/samples/android commit
bc036ecdf44cd03163c206096172299f3940b057.

Change-Id: Ib68230d79ca300e7db906aff2ebfc2cb6c6968f7
This commit is contained in:
Trevor Johns
2014-12-09 18:47:59 -08:00
parent 1ccf8350d5
commit abededd8f7
503 changed files with 8907 additions and 2690 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
samples/browseable/Camera2Basic/src/com.example.android.camera2basic/Camera2BasicFragment.java
View File

@@ -266,8 +266,10 @@ public class Camera2BasicFragment extends Fragment implements View.OnClickListen
int afState = result.get(CaptureResult.CONTROL_AF_STATE);
if (CaptureResult.CONTROL_AF_STATE_FOCUSED_LOCKED == afState ||
CaptureResult.CONTROL_AF_STATE_NOT_FOCUSED_LOCKED == afState) {
int aeState = result.get(CaptureResult.CONTROL_AE_STATE);
if (aeState == CaptureResult.CONTROL_AE_STATE_CONVERGED) {
// CONTROL_AE_STATE can be null on some devices
Integer aeState = result.get(CaptureResult.CONTROL_AE_STATE);
if (aeState == null ||
aeState == CaptureResult.CONTROL_AE_STATE_CONVERGED) {
mState = STATE_WAITING_NON_PRECAPTURE;
captureStillPicture();
} else {
@@ -277,17 +279,19 @@ public class Camera2BasicFragment extends Fragment implements View.OnClickListen
break;
}
case STATE_WAITING_PRECAPTURE: {
int aeState = result.get(CaptureResult.CONTROL_AE_STATE);
if (CaptureResult.CONTROL_AE_STATE_PRECAPTURE == aeState) {
mState = STATE_WAITING_NON_PRECAPTURE;
} else if (CaptureRequest.CONTROL_AE_STATE_FLASH_REQUIRED == aeState) {
// CONTROL_AE_STATE can be null on some devices
Integer aeState = result.get(CaptureResult.CONTROL_AE_STATE);
if (aeState == null ||
aeState == CaptureResult.CONTROL_AE_STATE_PRECAPTURE ||
aeState == CaptureRequest.CONTROL_AE_STATE_FLASH_REQUIRED) {
mState = STATE_WAITING_NON_PRECAPTURE;
}
break;
}
case STATE_WAITING_NON_PRECAPTURE: {
int aeState = result.get(CaptureResult.CONTROL_AE_STATE);
if (CaptureResult.CONTROL_AE_STATE_PRECAPTURE != aeState) {
// CONTROL_AE_STATE can be null on some devices
Integer aeState = result.get(CaptureResult.CONTROL_AE_STATE);
if (aeState == null || aeState != CaptureResult.CONTROL_AE_STATE_PRECAPTURE) {
mState = STATE_PICTURE_TAKEN;
captureStillPicture();
}