summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera/PhotoModule.java
diff options
context:
space:
mode:
authorDave Daynard <nardholio@gmail.com>2014-09-02 19:14:08 -0400
committerMichael Bestas <mikeioannina@gmail.com>2017-01-04 21:57:38 +0200
commitd9700f7e060f4b4c32528bee970c6e4e6c1184f9 (patch)
treea4b3864b0b4012a25201a3b9a75f7594ffc1fa09 /src/com/android/camera/PhotoModule.java
parentad27bcf9b10788bbca5df1218136bc339f90b184 (diff)
downloadandroid_packages_apps_Snap-d9700f7e060f4b4c32528bee970c6e4e6c1184f9.tar.gz
android_packages_apps_Snap-d9700f7e060f4b4c32528bee970c6e4e6c1184f9.tar.bz2
android_packages_apps_Snap-d9700f7e060f4b4c32528bee970c6e4e6c1184f9.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/PhotoModule.java')
-rwxr-xr-xsrc/com/android/camera/PhotoModule.java5
1 files changed, 5 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();