volume button cancels ongoing countdown
prevent volume button from doing anything during intent capture review
bug: 15141921
Change-Id: Icf974de09eb59e92bcce4a14aaa4775e21043c13
diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java
index f1fb0d0..4b90ea1 100644
--- a/src/com/android/camera/PhotoModule.java
+++ b/src/com/android/camera/PhotoModule.java
@@ -1516,7 +1516,11 @@
@Override
public void onCountDownFinished() {
- mAppController.getCameraAppUI().transitionToCapture();
+ if (mIsImageCaptureIntent) {
+ mAppController.getCameraAppUI().transitionToIntentReviewLayout();
+ } else {
+ mAppController.getCameraAppUI().transitionToCapture();
+ }
mAppController.getCameraAppUI().showModeOptions();
if (mPaused) {
return;
@@ -1745,7 +1749,8 @@
case KeyEvent.KEYCODE_VOLUME_UP:
case KeyEvent.KEYCODE_VOLUME_DOWN:
case KeyEvent.KEYCODE_FOCUS:
- if (/* TODO: mActivity.isInCameraApp() && */mFirstTimeInitialized) {
+ if (/* TODO: mActivity.isInCameraApp() && */mFirstTimeInitialized &&
+ !mActivity.getCameraAppUI().isInIntentReview()) {
if (event.getRepeatCount() == 0) {
onShutterButtonFocus(true);
}
@@ -1776,9 +1781,14 @@
switch (keyCode) {
case KeyEvent.KEYCODE_VOLUME_UP:
case KeyEvent.KEYCODE_VOLUME_DOWN:
- if (/* mActivity.isInCameraApp() && */mFirstTimeInitialized) {
- mVolumeButtonClickedFlag = true;
- onShutterButtonClick();
+ if (/* mActivity.isInCameraApp() && */mFirstTimeInitialized &&
+ !mActivity.getCameraAppUI().isInIntentReview()) {
+ if (mUI.isCountingDown()) {
+ cancelCountDown();
+ } else {
+ mVolumeButtonClickedFlag = true;
+ onShutterButtonClick();
+ }
return true;
}
return false;