From e3b62178828c4fccfcd4582f176b5029fcae271a Mon Sep 17 00:00:00 2001 From: Michael Bestas Date: Tue, 5 Nov 2013 16:43:50 +0200 Subject: Camera: Cleanup hardware key handling * Fix power shutter behaviour in camcorder mode * Disable volume change while in panorama mode, volume buttons should only handle camera operations while in the camera * Add camera/power/volume key shutter handling in panorama mode On devices with a hardware camera key: * Disable power & volume shutter features * Volume buttons control the zoom On devices without a hardware camera key: * When power shutter is disabled, volume buttons control the shutter (like AOSP) * When power shutter is enabled, volume buttons control the zoom Change-Id: I141946d5b6f5aec8b1e9a9f99270d30295596079 --- src/com/android/camera/CameraSettings.java | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src/com/android/camera/CameraSettings.java') diff --git a/src/com/android/camera/CameraSettings.java b/src/com/android/camera/CameraSettings.java index 51f72ceb0..a5e59987c 100644 --- a/src/com/android/camera/CameraSettings.java +++ b/src/com/android/camera/CameraSettings.java @@ -847,6 +847,7 @@ public class CameraSettings { ListPreference cameraHdr = group.findPreference(KEY_CAMERA_HDR); ListPreference disMode = group.findPreference(KEY_DIS); ListPreference cameraHdrPlus = group.findPreference(KEY_CAMERA_HDR_PLUS); + ListPreference powerShutter = group.findPreference(KEY_POWER_SHUTTER); ListPreference videoHfrMode = group.findPreference(KEY_VIDEO_HIGH_FRAME_RATE); ListPreference seeMoreMode = group.findPreference(KEY_SEE_MORE); @@ -956,6 +957,9 @@ public class CameraSettings { !GcamHelper.hasGcamCapture() || isFrontCamera)) { removePreference(group, cameraHdrPlus.getKey()); } + if (powerShutter != null && CameraUtil.hasCameraKey()) { + removePreference(group, powerShutter.getKey()); + } if (SystemProperties.getBoolean("persist.env.camera.saveinsd", false)) { final String CAMERA_SAVEPATH_SDCARD = "1"; -- cgit v1.2.3