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>2015-09-17 23:26:03 +0300
commit335b416fbb319eeaba23e4054e3f98adcc90c99f (patch)
tree3aaa4423a0f6446b75c0ecacb7de6ad5cee664f2 /src/com/android/camera/PhotoModule.java
parent2db625e1748d222bb2459f2eed286d16c8cffe12 (diff)
downloadandroid_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/PhotoModule.java')
-rw-r--r--src/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 8865d54cd..8d919b4e3 100644
--- a/src/com/android/camera/PhotoModule.java
+++ b/src/com/android/camera/PhotoModule.java
@@ -2481,6 +2481,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);
@@ -2490,6 +2491,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);
@@ -2507,6 +2509,7 @@ public class PhotoModule
}
return false;
case KeyEvent.KEYCODE_CAMERA:
+ case KeyEvent.KEYCODE_HEADSETHOOK:
if (mFirstTimeInitialized && event.getRepeatCount() == 0) {
onShutterButtonClick();
}
@@ -2537,6 +2540,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();