diff options
| author | Michael Bestas <mikeioannina@gmail.com> | 2014-01-28 00:44:30 +0200 |
|---|---|---|
| committer | Michael Bestas <mikeioannina@gmail.com> | 2015-09-17 23:26:02 +0300 |
| commit | cea0604f347b07d51d48b14b6c6b7d43ba1b0377 (patch) | |
| tree | 8e2ec7828858ab94caf542a42de558091fcf154b /src/com/android/camera/PhotoModule.java | |
| parent | 4b6ade90186f024ce6986a5a13efa3be9e9c8d80 (diff) | |
| download | android_packages_apps_Snap-cea0604f347b07d51d48b14b6c6b7d43ba1b0377.tar.gz android_packages_apps_Snap-cea0604f347b07d51d48b14b6c6b7d43ba1b0377.tar.bz2 android_packages_apps_Snap-cea0604f347b07d51d48b14b6c6b7d43ba1b0377.zip | |
Camera: Handle keys only while in app
Thanks to Lars Greiss (SlimRoms)
Change-Id: I63f757d25260fba4683f494f8b4daf178a2b4e13
Diffstat (limited to 'src/com/android/camera/PhotoModule.java')
| -rw-r--r-- | src/com/android/camera/PhotoModule.java | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java index 02f45b459..8865d54cd 100644 --- a/src/com/android/camera/PhotoModule.java +++ b/src/com/android/camera/PhotoModule.java @@ -2474,13 +2474,14 @@ public class PhotoModule @Override public boolean onKeyDown(int keyCode, KeyEvent event) { - /*TODO: if (!mActivity.mShowCameraAppView) { + // Do not handle any key if the activity is + // not in active camera/video mode + if (!mActivity.isInCameraApp()) { return false; - }*/ + } switch (keyCode) { case KeyEvent.KEYCODE_VOLUME_UP: - if (/*TODO: mActivity.isInCameraApp() &&*/ mFirstTimeInitialized - && (mUI.mMenuInitialized)) { + if (mFirstTimeInitialized && (mUI.mMenuInitialized)) { if (!CameraActivity.mPowerShutter && !CameraUtil.hasCameraKey()) { onShutterButtonFocus(true); } else { @@ -2489,8 +2490,7 @@ public class PhotoModule } return true; case KeyEvent.KEYCODE_VOLUME_DOWN: - if (/*TODO: mActivity.isInCameraApp() &&*/ mFirstTimeInitialized - && (mUI.mMenuInitialized)) { + if (mFirstTimeInitialized && (mUI.mMenuInitialized)) { if (!CameraActivity.mPowerShutter && !CameraUtil.hasCameraKey()) { onShutterButtonFocus(true); } else { @@ -2499,7 +2499,7 @@ public class PhotoModule } return true; case KeyEvent.KEYCODE_FOCUS: - if (/*TODO: mActivity.isInCameraApp() &&*/ mFirstTimeInitialized) { + if (mFirstTimeInitialized) { if (event.getRepeatCount() == 0) { onShutterButtonFocus(true); } @@ -2534,9 +2534,6 @@ public class PhotoModule @Override public boolean onKeyUp(int keyCode, KeyEvent event) { - /*TODO: if (!mActivity.mShowCameraAppView) { - return false; - }*/ switch (keyCode) { case KeyEvent.KEYCODE_VOLUME_UP: case KeyEvent.KEYCODE_VOLUME_DOWN: |