summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera/PhotoModule.java
diff options
context:
space:
mode:
Diffstat (limited to 'src/com/android/camera/PhotoModule.java')
-rw-r--r--src/com/android/camera/PhotoModule.java16
1 files changed, 11 insertions, 5 deletions
diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java
index d40f0d299..c23c41f9c 100644
--- a/src/com/android/camera/PhotoModule.java
+++ b/src/com/android/camera/PhotoModule.java
@@ -2469,7 +2469,17 @@ public class PhotoModule
public boolean onKeyDown(int keyCode, KeyEvent event) {
switch (keyCode) {
case KeyEvent.KEYCODE_VOLUME_UP:
+ if (/*TODO: mActivity.isInCameraApp() &&*/ mFirstTimeInitialized
+ && (mUI.mMenuInitialized)) {
+ mUI.onScaleStepResize(true);
+ }
+ return true;
case KeyEvent.KEYCODE_VOLUME_DOWN:
+ if (/*TODO: mActivity.isInCameraApp() &&*/ mFirstTimeInitialized
+ && (mUI.mMenuInitialized)) {
+ mUI.onScaleStepResize(false);
+ }
+ return true;
case KeyEvent.KEYCODE_FOCUS:
if (/*TODO: mActivity.isInCameraApp() &&*/ mFirstTimeInitialized) {
if (event.getRepeatCount() == 0) {
@@ -2503,11 +2513,7 @@ public class PhotoModule
switch (keyCode) {
case KeyEvent.KEYCODE_VOLUME_UP:
case KeyEvent.KEYCODE_VOLUME_DOWN:
- if (/*mActivity.isInCameraApp() && */ mFirstTimeInitialized) {
- onShutterButtonClick();
- return true;
- }
- return false;
+ return true;
case KeyEvent.KEYCODE_FOCUS:
if (mFirstTimeInitialized) {
onShutterButtonFocus(false);