diff options
| author | Michael Bestas <mikeioannina@gmail.com> | 2014-01-28 00:44:30 +0200 |
|---|---|---|
| committer | Michael Bestas <mikeioannina@gmail.com> | 2017-01-04 21:57:38 +0200 |
| commit | 78a0768c85982b2453b861328cbc8d1b573a638c (patch) | |
| tree | eb1e2ab6e12a77b105b4b17b836462e8c88b5531 /src/com/android/camera/PhotoModule.java | |
| parent | e3b62178828c4fccfcd4582f176b5029fcae271a (diff) | |
| download | android_packages_apps_Snap-78a0768c85982b2453b861328cbc8d1b573a638c.tar.gz android_packages_apps_Snap-78a0768c85982b2453b861328cbc8d1b573a638c.tar.bz2 android_packages_apps_Snap-78a0768c85982b2453b861328cbc8d1b573a638c.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')
| -rwxr-xr-x | 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 5b8548bb3..dd97e7435 100755 --- a/src/com/android/camera/PhotoModule.java +++ b/src/com/android/camera/PhotoModule.java @@ -2751,13 +2751,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 { @@ -2766,8 +2767,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 { @@ -2776,7 +2776,7 @@ public class PhotoModule } return true; case KeyEvent.KEYCODE_FOCUS: - if (/*TODO: mActivity.isInCameraApp() &&*/ mFirstTimeInitialized) { + if (mFirstTimeInitialized) { if (event.getRepeatCount() == 0) { onShutterButtonFocus(true); } @@ -2811,9 +2811,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: |