diff options
| author | Dave Daynard <nardholio@gmail.com> | 2014-09-02 19:14:08 -0400 |
|---|---|---|
| committer | Steve Kondik <steve@cyngn.com> | 2016-11-02 12:22:26 -0700 |
| commit | ae5b8078f1d56eb50547bce0296fca6c939d0aec (patch) | |
| tree | d44a19357f5fb2ef0a25f0804f500a440df61f23 /src/com/android | |
| parent | 60fe2087173761175a4441f6a6e26f80497375da (diff) | |
| download | android_packages_apps_Snap-ae5b8078f1d56eb50547bce0296fca6c939d0aec.tar.gz android_packages_apps_Snap-ae5b8078f1d56eb50547bce0296fca6c939d0aec.tar.bz2 android_packages_apps_Snap-ae5b8078f1d56eb50547bce0296fca6c939d0aec.zip | |
Camera2: Headset shutter mode
Use play button on headset to take a picture/video/panorama
Use media next/previous for zoom
Change-Id: I25c22646b041e5e0941fbe361eccfe77a2a1e42f
Diffstat (limited to 'src/com/android')
| -rwxr-xr-x | src/com/android/camera/PhotoModule.java | 5 | ||||
| -rw-r--r-- | src/com/android/camera/VideoModule.java | 6 | ||||
| -rw-r--r-- | src/com/android/camera/WideAnglePanoramaModule.java | 5 |
3 files changed, 16 insertions, 0 deletions
diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java index dd97e7435..659688b38 100755 --- a/src/com/android/camera/PhotoModule.java +++ b/src/com/android/camera/PhotoModule.java @@ -2758,6 +2758,7 @@ public class PhotoModule } switch (keyCode) { case KeyEvent.KEYCODE_VOLUME_UP: + case KeyEvent.KEYCODE_MEDIA_NEXT: if (mFirstTimeInitialized && (mUI.mMenuInitialized)) { if (!CameraActivity.mPowerShutter && !CameraUtil.hasCameraKey()) { onShutterButtonFocus(true); @@ -2767,6 +2768,7 @@ public class PhotoModule } return true; case KeyEvent.KEYCODE_VOLUME_DOWN: + case KeyEvent.KEYCODE_MEDIA_PREVIOUS: if (mFirstTimeInitialized && (mUI.mMenuInitialized)) { if (!CameraActivity.mPowerShutter && !CameraUtil.hasCameraKey()) { onShutterButtonFocus(true); @@ -2784,6 +2786,7 @@ public class PhotoModule } return false; case KeyEvent.KEYCODE_CAMERA: + case KeyEvent.KEYCODE_HEADSETHOOK: if (mFirstTimeInitialized && event.getRepeatCount() == 0) { onShutterButtonClick(); } @@ -2814,6 +2817,8 @@ public class PhotoModule switch (keyCode) { case KeyEvent.KEYCODE_VOLUME_UP: case KeyEvent.KEYCODE_VOLUME_DOWN: + case KeyEvent.KEYCODE_MEDIA_NEXT: + case KeyEvent.KEYCODE_MEDIA_PREVIOUS: if (!CameraActivity.mPowerShutter && !CameraUtil.hasCameraKey() && mFirstTimeInitialized) { onShutterButtonClick(); diff --git a/src/com/android/camera/VideoModule.java b/src/com/android/camera/VideoModule.java index 5fe584562..cac9eb4b6 100644 --- a/src/com/android/camera/VideoModule.java +++ b/src/com/android/camera/VideoModule.java @@ -1369,6 +1369,7 @@ public class VideoModule implements CameraModule, switch (keyCode) { case KeyEvent.KEYCODE_VOLUME_UP: + case KeyEvent.KEYCODE_MEDIA_NEXT: if (event.getRepeatCount() == 0 && !CameraActivity.mPowerShutter && !CameraUtil.hasCameraKey()) { mUI.clickShutter(); @@ -1377,6 +1378,7 @@ public class VideoModule implements CameraModule, } return true; case KeyEvent.KEYCODE_VOLUME_DOWN: + case KeyEvent.KEYCODE_MEDIA_PREVIOUS: if (event.getRepeatCount() == 0 && !CameraActivity.mPowerShutter && !CameraUtil.hasCameraKey()) { mUI.clickShutter(); @@ -1385,6 +1387,7 @@ public class VideoModule implements CameraModule, } return true; case KeyEvent.KEYCODE_CAMERA: + case KeyEvent.KEYCODE_HEADSETHOOK: if (event.getRepeatCount() == 0) { mUI.clickShutter(); } @@ -1413,16 +1416,19 @@ public class VideoModule implements CameraModule, public boolean onKeyUp(int keyCode, KeyEvent event) { switch (keyCode) { case KeyEvent.KEYCODE_VOLUME_UP: + case KeyEvent.KEYCODE_MEDIA_NEXT: if (!CameraActivity.mPowerShutter && !CameraUtil.hasCameraKey()) { mUI.pressShutter(false); } return true; case KeyEvent.KEYCODE_VOLUME_DOWN: + case KeyEvent.KEYCODE_MEDIA_PREVIOUS: if (!CameraActivity.mPowerShutter && !CameraUtil.hasCameraKey()) { mUI.pressShutter(false); } return true; case KeyEvent.KEYCODE_CAMERA: + case KeyEvent.KEYCODE_HEADSETHOOK: mUI.pressShutter(false); return true; case KeyEvent.KEYCODE_POWER: diff --git a/src/com/android/camera/WideAnglePanoramaModule.java b/src/com/android/camera/WideAnglePanoramaModule.java index 2580c5a0d..e8e9483a0 100644 --- a/src/com/android/camera/WideAnglePanoramaModule.java +++ b/src/com/android/camera/WideAnglePanoramaModule.java @@ -1246,8 +1246,11 @@ public class WideAnglePanoramaModule switch (keyCode) { case KeyEvent.KEYCODE_VOLUME_UP: case KeyEvent.KEYCODE_VOLUME_DOWN: + case KeyEvent.KEYCODE_MEDIA_NEXT: + case KeyEvent.KEYCODE_MEDIA_PREVIOUS: return true; case KeyEvent.KEYCODE_CAMERA: + case KeyEvent.KEYCODE_HEADSETHOOK: if (event.getRepeatCount() == 0) { onShutterButtonClick(); } @@ -1263,6 +1266,8 @@ public class WideAnglePanoramaModule switch (keyCode) { case KeyEvent.KEYCODE_VOLUME_UP: case KeyEvent.KEYCODE_VOLUME_DOWN: + case KeyEvent.KEYCODE_MEDIA_NEXT: + case KeyEvent.KEYCODE_MEDIA_PREVIOUS: if (!CameraActivity.mPowerShutter && !CameraUtil.hasCameraKey()) { onShutterButtonClick(); } |