diff options
Diffstat (limited to 'src/com/android/camera')
| -rw-r--r-- | src/com/android/camera/Camera.java | 14 | ||||
| -rw-r--r-- | src/com/android/camera/CameraSettings.java | 4 |
2 files changed, 1 insertions, 17 deletions
diff --git a/src/com/android/camera/Camera.java b/src/com/android/camera/Camera.java index ad5045a..a256e3b 100644 --- a/src/com/android/camera/Camera.java +++ b/src/com/android/camera/Camera.java @@ -227,7 +227,6 @@ public class Camera extends NoSearchActivity implements View.OnClickListener, private String mSceneMode; private final Handler mHandler = new MainHandler(); - private boolean mQuickCapture; private CameraHeadUpDisplay mHeadUpDisplay; // multiple cameras support @@ -630,7 +629,7 @@ public class Camera extends NoSearchActivity implements View.OnClickListener, // We want to show the taken picture for a while, so we wait // for at least 1.2 second before restarting the preview. long delay = 1200 - mPictureDisplayedToJpegCallbackTime; - if (delay < 0 || mQuickCapture) { + if (delay < 0) { restartPreview(); } else { mHandler.sendEmptyMessageDelayed(RESTART_PREVIEW, delay); @@ -901,9 +900,6 @@ public class Camera extends NoSearchActivity implements View.OnClickListener, mNumberOfCameras = CameraHolder.instance().getNumberOfCameras(); - // comment out -- unused now. - //mQuickCapture = getQuickCaptureSettings(); - // we need to reset exposure for the preview resetExposureCompensation(); /* @@ -2093,7 +2089,6 @@ public class Camera extends NoSearchActivity implements View.OnClickListener, recordLocation = RecordLocationPreference.get( mPreferences, getContentResolver()); - mQuickCapture = getQuickCaptureSettings(); if (mRecordLocation != recordLocation) { mRecordLocation = recordLocation; @@ -2107,13 +2102,6 @@ public class Camera extends NoSearchActivity implements View.OnClickListener, setCameraParametersWhenIdle(UPDATE_PARAM_PREFERENCE); } - private boolean getQuickCaptureSettings() { - String value = mPreferences.getString( - CameraSettings.KEY_QUICK_CAPTURE, - getString(R.string.pref_camera_quickcapture_default)); - return CameraSettings.QUICK_CAPTURE_ON.equals(value); - } - @Override public void onUserInteraction() { super.onUserInteraction(); diff --git a/src/com/android/camera/CameraSettings.java b/src/com/android/camera/CameraSettings.java index d718b45..9345029 100644 --- a/src/com/android/camera/CameraSettings.java +++ b/src/com/android/camera/CameraSettings.java @@ -47,13 +47,9 @@ public class CameraSettings { public static final String KEY_COLOR_EFFECT = "pref_camera_coloreffect_key"; public static final String KEY_WHITE_BALANCE = "pref_camera_whitebalance_key"; public static final String KEY_SCENE_MODE = "pref_camera_scenemode_key"; - public static final String KEY_QUICK_CAPTURE = "pref_camera_quickcapture_key"; public static final String KEY_EXPOSURE = "pref_camera_exposure_key"; public static final String KEY_CAMERA_ID = "pref_camera_id"; - public static final String QUICK_CAPTURE_ON = "on"; - public static final String QUICK_CAPTURE_OFF = "off"; - private static final String VIDEO_QUALITY_HIGH = "high"; private static final String VIDEO_QUALITY_MMS = "mms"; private static final String VIDEO_QUALITY_YOUTUBE = "youtube"; |