summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera/Camera.java
diff options
context:
space:
mode:
authorheech.park <heech.park@samsung.com>2011-10-12 19:32:23 -0700
committerWu-cheng Li <wuchengli@google.com>2011-10-13 18:21:47 +0800
commit73ab0023b4a9d86ac5fa844116a83aa6c52acf0c (patch)
tree13da2f1c09e8880d165e52f4560e57e22ed67e8d /src/com/android/camera/Camera.java
parentac65f66171c9ff18b2c9f24fd4deae64ccf6fc93 (diff)
downloadLegacyCamera-73ab0023b4a9d86ac5fa844116a83aa6c52acf0c.zip
LegacyCamera-73ab0023b4a9d86ac5fa844116a83aa6c52acf0c.tar.gz
LegacyCamera-73ab0023b4a9d86ac5fa844116a83aa6c52acf0c.tar.bz2
Implemented full scan AF followed by capture on long pressing the shutter button.
1. In CAF, do full scan AF followed by capture on long pressing the shutter button. 2. Capture is triggered only if long press is released on the button. bug:5447399 Change-Id: I9c7d75d76074e2e20d1f1926388315cec2c22eed Signed-off-by: Raji Reddy Kandi <rajireddy.k@samsung.com> Signed-off-by: Sam Braganza <sam.braganza@samsung.com> Signed-off-by: heech.park <heech.park@samsung.com> Signed-off-by: heech.park <heech.park@samsung.com>
Diffstat (limited to 'src/com/android/camera/Camera.java')
-rw-r--r--src/com/android/camera/Camera.java14
1 files changed, 13 insertions, 1 deletions
diff --git a/src/com/android/camera/Camera.java b/src/com/android/camera/Camera.java
index cd8a0b3..4a311de 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 {
+ LocationManager.Listener, ShutterButton.OnShutterButtonLongPressListener {
private static final String TAG = "camera";
@@ -369,6 +369,7 @@ 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.
@@ -1318,6 +1319,7 @@ public class Camera extends ActivityBase implements FocusManager.Listener,
finish();
}
+ @Override
public void onShutterButtonFocus(ShutterButton button, boolean pressed) {
switch (button.getId()) {
case R.id.shutter_button:
@@ -1326,6 +1328,7 @@ public class Camera extends ActivityBase implements FocusManager.Listener,
}
}
+ @Override
public void onShutterButtonClick(ShutterButton button) {
switch (button.getId()) {
case R.id.shutter_button:
@@ -1334,6 +1337,15 @@ public class Camera extends ActivityBase implements FocusManager.Listener,
}
}
+ @Override
+ public void onShutterButtonLongPressed(ShutterButton button) {
+ if (mPausing || mCameraState == SNAPSHOT_IN_PROGRESS
+ || mCameraDevice == null || mPicturesRemaining <= 0) return;
+
+ Log.v(TAG, "onShutterButtonLongPressed");
+ mFocusManager.shutterLongPressed();
+ }
+
private OnScreenHint mStorageHint;
private void updateStorageHint() {