diff options
Diffstat (limited to 'src/com/android/camera')
| -rw-r--r-- | src/com/android/camera/Camera.java | 23 | ||||
| -rw-r--r-- | src/com/android/camera/CameraSettings.java | 4 |
2 files changed, 11 insertions, 16 deletions
diff --git a/src/com/android/camera/Camera.java b/src/com/android/camera/Camera.java index b335d76..a8ffa21 100644 --- a/src/com/android/camera/Camera.java +++ b/src/com/android/camera/Camera.java @@ -1382,7 +1382,7 @@ public class Camera extends Activity implements View.OnClickListener, // If the user has half-pressed the shutter and focus is completed, we // can take the photo right away. If the focus mode is infinity, we can // also take the photo. - if (mFocusMode.equals(CameraSettings.VALUE_FOCUS_INFINITY) + if (mFocusMode.equals(Parameters.FOCUS_MODE_INFINITY) || (mFocusState == FOCUS_SUCCESS || mFocusState == FOCUS_FAIL)) { if (mZoomButtons != null) mZoomButtons.setVisible(false); @@ -1399,7 +1399,7 @@ public class Camera extends Activity implements View.OnClickListener, private void doFocus(boolean pressed) { // Do the focus if the mode is not infinity. - if (!mFocusMode.equals(CameraSettings.VALUE_FOCUS_INFINITY)) { + if (!mFocusMode.equals(Parameters.FOCUS_MODE_INFINITY)) { if (pressed) { // Focus key down. autoFocus(); } else { // Focus key up. @@ -1652,20 +1652,19 @@ public class Camera extends Activity implements View.OnClickListener, } // Set scene mode. - if (mParameters.getSupportedSceneModes() != null) { - String sceneMode = mPreferences.getString( - CameraSettings.KEY_SCENE_MODE, - getString(R.string.pref_camera_scenemode_default)); + String sceneMode = mPreferences.getString( + CameraSettings.KEY_SCENE_MODE, + getString(R.string.pref_camera_scenemode_default)); + if (isSupported(sceneMode, mParameters.getSupportedSceneModes())) { mParameters.setSceneMode(sceneMode); } // Set focus mode. - // TODO: use camera parameters API after it is finished. - if (mParameters.get("focus-mode-values") != null) { - mFocusMode = mPreferences.getString( - CameraSettings.KEY_FOCUS_MODE, - getString(R.string.pref_camera_focusmode_default)); - mParameters.set("focus-mode", mFocusMode); + mFocusMode = mPreferences.getString( + CameraSettings.KEY_FOCUS_MODE, + getString(R.string.pref_camera_focusmode_default)); + if (isSupported(mFocusMode, mParameters.getSupportedFocusModes())) { + mParameters.setFocusMode(mFocusMode); } mCameraDevice.setParameters(mParameters); diff --git a/src/com/android/camera/CameraSettings.java b/src/com/android/camera/CameraSettings.java index 748d904..5b6fc5b 100644 --- a/src/com/android/camera/CameraSettings.java +++ b/src/com/android/camera/CameraSettings.java @@ -35,10 +35,6 @@ public class CameraSettings { "pref_camera_whitebalance_key"; public static final String KEY_SCENE_MODE = "pref_camera_scenemode_key"; - // TODO: use camera parameters API after it is finished. - public static final String VALUE_FOCUS_INFINITY = "infinity"; - public static final String VALUE_FOCUS_AUTO = "auto"; - public static final int CURRENT_VERSION = 1; // max mms video duration in seconds. |