From ff73d91434df2b2eebaadb5d2e8d1949d9aad4bc Mon Sep 17 00:00:00 2001
From: mingwax <mingwax@codeaurora.org>
Date: Tue, 1 Nov 2016 11:11:26 +0800
Subject: SnapdragonCamera: Fix press volume key can`t take picture

Did not implement the code. Add code in onKeyDown and onKeyUp
method refer to PhotoModule.java. Add the listening which the
user press the volume key down or up.

Change-Id: I5380d3fcad146fccadf7d1657c4e2e79f218f75e
CRs-Fixed: 1084315
---
 src/com/android/camera/CaptureModule.java | 35 +++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)

(limited to 'src/com/android/camera/CaptureModule.java')

diff --git a/src/com/android/camera/CaptureModule.java b/src/com/android/camera/CaptureModule.java
index c800c6e4e..c8fb6d440 100644
--- a/src/com/android/camera/CaptureModule.java
+++ b/src/com/android/camera/CaptureModule.java
@@ -2046,11 +2046,46 @@ public class CaptureModule implements CameraModule, PhotoController,
 
     @Override
     public boolean onKeyDown(int keyCode, KeyEvent event) {
+        switch (keyCode) {
+            case KeyEvent.KEYCODE_VOLUME_UP:
+            case KeyEvent.KEYCODE_VOLUME_DOWN:
+                if (CameraUtil.volumeKeyShutterDisable(mActivity)) {
+                    return false;
+                }
+            case KeyEvent.KEYCODE_FOCUS:
+                if (mFirstTimeInitialized) {
+                    if (event.getRepeatCount() == 0) {
+                        onShutterButtonFocus(true);
+                    }
+                    return true;
+                }
+                return false;
+            case KeyEvent.KEYCODE_CAMERA:
+                if (mFirstTimeInitialized && event.getRepeatCount() == 0) {
+                    onShutterButtonClick();
+                }
+                return true;
+        }
         return false;
     }
 
     @Override
     public boolean onKeyUp(int keyCode, KeyEvent event) {
+        switch (keyCode) {
+            case KeyEvent.KEYCODE_VOLUME_UP:
+            case KeyEvent.KEYCODE_VOLUME_DOWN:
+                if (mFirstTimeInitialized
+                        && !CameraUtil.volumeKeyShutterDisable(mActivity)) {
+                    onShutterButtonClick();
+                    return true;
+                }
+                return false;
+            case KeyEvent.KEYCODE_FOCUS:
+                if (mFirstTimeInitialized) {
+                    onShutterButtonFocus(false);
+                }
+                return true;
+        }
         return false;
     }
 
-- 
cgit v1.2.3