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
committerArne Coucheron <arco68@gmail.com>2018-01-26 00:53:48 +0100
commita28e919dccf3eac2daa2c45b2e51a455ab8dffe3 (patch)
tree359cfc3e9d9f9bd37219783f8fe60b1c99f6af2b /src/com/android/camera/WideAnglePanoramaModule.java
parent677d2d17d095445d3ce120753688bb9cad23a99d (diff)
downloadandroid_packages_apps_Snap-a28e919dccf3eac2daa2c45b2e51a455ab8dffe3.tar.gz
android_packages_apps_Snap-a28e919dccf3eac2daa2c45b2e51a455ab8dffe3.tar.bz2
android_packages_apps_Snap-a28e919dccf3eac2daa2c45b2e51a455ab8dffe3.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 d3c4ff163..4e0da9fbe 100644
--- a/src/com/android/camera/WideAnglePanoramaModule.java
+++ b/src/com/android/camera/WideAnglePanoramaModule.java
@@ -1255,8 +1255,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();
}
@@ -1272,6 +1275,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();
}