diff options
author | Dave Daynard <nardholio@gmail.com> | 2014-09-02 19:14:08 -0400 |
---|---|---|
committer | Michael Bestas <mikeioannina@gmail.com> | 2015-09-17 23:26:03 +0300 |
commit | 335b416fbb319eeaba23e4054e3f98adcc90c99f (patch) | |
tree | 3aaa4423a0f6446b75c0ecacb7de6ad5cee664f2 /src/com/android/camera/VideoModule.java | |
parent | 2db625e1748d222bb2459f2eed286d16c8cffe12 (diff) | |
download | android_packages_apps_Snap-335b416fbb319eeaba23e4054e3f98adcc90c99f.tar.gz android_packages_apps_Snap-335b416fbb319eeaba23e4054e3f98adcc90c99f.tar.bz2 android_packages_apps_Snap-335b416fbb319eeaba23e4054e3f98adcc90c99f.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/camera/VideoModule.java')
-rw-r--r-- | src/com/android/camera/VideoModule.java | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/com/android/camera/VideoModule.java b/src/com/android/camera/VideoModule.java index e6bf16d17..038d0d60a 100644 --- a/src/com/android/camera/VideoModule.java +++ b/src/com/android/camera/VideoModule.java @@ -1207,6 +1207,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(); @@ -1215,6 +1216,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(); @@ -1223,6 +1225,7 @@ public class VideoModule implements CameraModule, } return true; case KeyEvent.KEYCODE_CAMERA: + case KeyEvent.KEYCODE_HEADSETHOOK: if (event.getRepeatCount() == 0) { mUI.clickShutter(); } @@ -1251,16 +1254,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: |