summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera/WideAnglePanoramaModule.java
diff options
context:
space:
mode:
authorDave Daynard <nardholio@gmail.com>2014-09-02 19:14:08 -0400
committerSteve Kondik <steve@cyngn.com>2016-11-02 12:22:26 -0700
commitae5b8078f1d56eb50547bce0296fca6c939d0aec (patch)
treed44a19357f5fb2ef0a25f0804f500a440df61f23 /src/com/android/camera/WideAnglePanoramaModule.java
parent60fe2087173761175a4441f6a6e26f80497375da (diff)
downloadandroid_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/camera/WideAnglePanoramaModule.java')
-rw-r--r--src/com/android/camera/WideAnglePanoramaModule.java5
1 files changed, 5 insertions, 0 deletions
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();
}