diff options
-rw-r--r-- | src/com/android/camera/PhotoModule.java | 7 | ||||
-rw-r--r-- | src/com/android/camera/ui/PieMenuButton.java | 61 |
2 files changed, 67 insertions, 1 deletions
diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java index ec6dcab3d..60cb67896 100644 --- a/src/com/android/camera/PhotoModule.java +++ b/src/com/android/camera/PhotoModule.java @@ -1437,7 +1437,11 @@ public class PhotoModule } mFocusManager.onShutterDown(); } else { - mFocusManager.onShutterUp(); + // for countdown mode, we need to postpone the shutter release + // i.e. lock the focus during countdown. + if (!mCountDownView.isCountingDown()) { + mFocusManager.onShutterUp(); + } } } @@ -2429,6 +2433,7 @@ public class PhotoModule public void onCountDownFinished() { mSnapshotOnIdle = false; mFocusManager.doSnap(); + mFocusManager.onShutterUp(); } void setPreviewFrameLayoutAspectRatio() { diff --git a/src/com/android/camera/ui/PieMenuButton.java b/src/com/android/camera/ui/PieMenuButton.java new file mode 100644 index 000000000..e5719310a --- /dev/null +++ b/src/com/android/camera/ui/PieMenuButton.java @@ -0,0 +1,61 @@ +/* + * Copyright (C) 2013 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.camera.ui; + +import android.content.Context; +import android.util.AttributeSet; +import android.view.MotionEvent; +import android.view.View; + +public class PieMenuButton extends View { + private boolean mPressed; + private boolean mReadyToClick = false; + public PieMenuButton(Context context, AttributeSet attrs) { + super(context, attrs); + } + + @Override + protected void drawableStateChanged() { + super.drawableStateChanged(); + mPressed = isPressed(); + } + + @Override + public boolean onTouchEvent(MotionEvent event) { + if (MotionEvent.ACTION_UP == event.getAction() && mPressed) { + // Perform a customized click as soon as the ACTION_UP event + // is received. The reason for doing this is that Framework + // delays the performClick() call after ACTION_UP. But we do not + // want the delay because it affects an important state change + // for PieRenderer. + mReadyToClick = true; + performClick(); + } + return super.onTouchEvent(event); + } + + @Override + public boolean performClick() { + if (mReadyToClick) { + // We only respond to our customized click which happens right + // after ACTION_UP event is received, with no delay. + mReadyToClick = false; + return super.performClick(); + } + return false; + } +};
\ No newline at end of file |