diff options
author | Wu-cheng Li <wuchengli@google.com> | 2011-10-28 00:22:04 +0800 |
---|---|---|
committer | Wu-cheng Li <wuchengli@google.com> | 2011-10-28 00:40:08 +0800 |
commit | 30e2c49eedfbce51be7458161829a750f809d56d (patch) | |
tree | e6e9c1496df8a3659fd0c9a04cd40c4121a7d118 /src/com/android/camera/Camera.java | |
parent | c04d01bb510465ea35a06b09146a3bb79c6f770e (diff) | |
download | LegacyCamera-30e2c49eedfbce51be7458161829a750f809d56d.zip LegacyCamera-30e2c49eedfbce51be7458161829a750f809d56d.tar.gz LegacyCamera-30e2c49eedfbce51be7458161829a750f809d56d.tar.bz2 |
Remove long pressing shutter triggers autocous.
autoFocus behavior has changed in CAF. The focus callback
will not return immediately if CAF is scanning. There is
no need to have long pressing behavior.
bug:5514415
Change-Id: Iacf14fa3ad48b03c79122296a74e7511c41ea62f
Diffstat (limited to 'src/com/android/camera/Camera.java')
-rw-r--r-- | src/com/android/camera/Camera.java | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/src/com/android/camera/Camera.java b/src/com/android/camera/Camera.java index 1bedb4f..8898510 100644 --- a/src/com/android/camera/Camera.java +++ b/src/com/android/camera/Camera.java @@ -82,7 +82,7 @@ public class Camera extends ActivityBase implements FocusManager.Listener, View.OnTouchListener, ShutterButton.OnShutterButtonListener, SurfaceHolder.Callback, ModePicker.OnModeChangeListener, FaceDetectionListener, CameraPreference.OnPreferenceChangedListener, - LocationManager.Listener, ShutterButton.OnShutterButtonLongPressListener { + LocationManager.Listener { private static final String TAG = "camera"; @@ -370,7 +370,6 @@ public class Camera extends ActivityBase implements FocusManager.Listener, // Initialize shutter button. mShutterButton = (ShutterButton) findViewById(R.id.shutter_button); mShutterButton.setOnShutterButtonListener(this); - mShutterButton.setOnShutterButtonLongPressListener(this); mShutterButton.setVisibility(View.VISIBLE); // Initialize focus UI. @@ -1393,15 +1392,6 @@ public class Camera extends ActivityBase implements FocusManager.Listener, mFocusManager.doSnap(); } - @Override - public void onShutterButtonLongPressed() { - if (mPausing || mCameraState == SNAPSHOT_IN_PROGRESS - || mCameraDevice == null || mPicturesRemaining <= 0) return; - - Log.v(TAG, "onShutterButtonLongPressed"); - mFocusManager.shutterLongPressed(); - } - private OnScreenHint mStorageHint; private void updateStorageHint() { |