diff options
Diffstat (limited to 'src/com/android/camera/Camera.java')
| -rw-r--r-- | src/com/android/camera/Camera.java | 14 |
1 files changed, 1 insertions, 13 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(); |