diff options
Diffstat (limited to 'src/com/android/camera/PhotoModule.java')
| -rw-r--r-- | src/com/android/camera/PhotoModule.java | 21 |
1 files changed, 17 insertions, 4 deletions
diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java index 9a798d50b..02f45b459 100644 --- a/src/com/android/camera/PhotoModule.java +++ b/src/com/android/camera/PhotoModule.java @@ -2481,13 +2481,21 @@ public class PhotoModule case KeyEvent.KEYCODE_VOLUME_UP: if (/*TODO: mActivity.isInCameraApp() &&*/ mFirstTimeInitialized && (mUI.mMenuInitialized)) { - mUI.onScaleStepResize(true); + if (!CameraActivity.mPowerShutter && !CameraUtil.hasCameraKey()) { + onShutterButtonFocus(true); + } else { + mUI.onScaleStepResize(true); + } } return true; case KeyEvent.KEYCODE_VOLUME_DOWN: if (/*TODO: mActivity.isInCameraApp() &&*/ mFirstTimeInitialized && (mUI.mMenuInitialized)) { - mUI.onScaleStepResize(false); + if (!CameraActivity.mPowerShutter && !CameraUtil.hasCameraKey()) { + onShutterButtonFocus(true); + } else { + mUI.onScaleStepResize(false); + } } return true; case KeyEvent.KEYCODE_FOCUS: @@ -2516,7 +2524,7 @@ public class PhotoModule return true; case KeyEvent.KEYCODE_POWER: if (mFirstTimeInitialized && event.getRepeatCount() == 0 - && CameraActivity.mPowerShutter) { + && CameraActivity.mPowerShutter && !CameraUtil.hasCameraKey()) { onShutterButtonFocus(true); } return true; @@ -2532,6 +2540,10 @@ public class PhotoModule switch (keyCode) { case KeyEvent.KEYCODE_VOLUME_UP: case KeyEvent.KEYCODE_VOLUME_DOWN: + if (!CameraActivity.mPowerShutter && !CameraUtil.hasCameraKey() + && mFirstTimeInitialized) { + onShutterButtonClick(); + } return true; case KeyEvent.KEYCODE_FOCUS: if (mFirstTimeInitialized) { @@ -2539,7 +2551,8 @@ public class PhotoModule } return true; case KeyEvent.KEYCODE_POWER: - if (CameraActivity.mPowerShutter && mFirstTimeInitialized) { + if (CameraActivity.mPowerShutter && !CameraUtil.hasCameraKey() + && mFirstTimeInitialized) { onShutterButtonClick(); } return true; |