summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rwxr-xr-xAndroid.mk2
-rwxr-xr-xsrc/com/android/camera/CameraActivity.java4
-rwxr-xr-xsrc/com/android/camera/CameraSettings.java4
-rw-r--r--src/com/android/camera/PhotoModule.java21
-rw-r--r--src/com/android/camera/VideoModule.java41
-rw-r--r--src/com/android/camera/WideAnglePanoramaModule.java33
-rwxr-xr-xsrc/com/android/camera/util/CameraUtil.java12
7 files changed, 102 insertions, 15 deletions
diff --git a/Android.mk b/Android.mk
index d2ec01c8a..0baa728c4 100755
--- a/Android.mk
+++ b/Android.mk
@@ -22,6 +22,8 @@ LOCAL_AAPT_FLAGS := \
--version-name "$(version_name_package)" \
--version-code $(version_code_package) \
+LOCAL_JAVA_LIBRARIES := org.lineageos.platform.internal
+
LOCAL_PACKAGE_NAME := Snap
LOCAL_PRIVILEGED_MODULE := true
LOCAL_PRIVATE_PLATFORM_APIS:=true
diff --git a/src/com/android/camera/CameraActivity.java b/src/com/android/camera/CameraActivity.java
index 8294f0573..d516b74ff 100755
--- a/src/com/android/camera/CameraActivity.java
+++ b/src/com/android/camera/CameraActivity.java
@@ -2030,7 +2030,9 @@ public class CameraActivity extends Activity
protected void initPowerShutter(ComboPreferences prefs) {
String val = prefs.getString(CameraSettings.KEY_POWER_SHUTTER,
getResources().getString(R.string.pref_camera_power_shutter_default));
- mPowerShutter = val.equals(CameraSettings.VALUE_ON);
+ if (!CameraUtil.hasCameraKey()) {
+ mPowerShutter = val.equals(CameraSettings.VALUE_ON);
+ }
if (mPowerShutter /*TODO: && mShowCameraAppView*/) {
getWindow().addPrivateFlags(
WindowManager.LayoutParams.PRIVATE_FLAG_PREVENT_POWER_KEY);
diff --git a/src/com/android/camera/CameraSettings.java b/src/com/android/camera/CameraSettings.java
index d3db767b7..9d56b5d84 100755
--- a/src/com/android/camera/CameraSettings.java
+++ b/src/com/android/camera/CameraSettings.java
@@ -986,6 +986,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);
@@ -1097,6 +1098,9 @@ public class CameraSettings {
!GcamHelper.hasGcamCapture() || isFrontCamera)) {
removePreference(group, cameraHdrPlus.getKey());
}
+ if (powerShutter != null && CameraUtil.hasCameraKey()) {
+ removePreference(group, powerShutter.getKey());
+ }
if (PersistUtil.isSaveInSdEnabled()) {
final String CAMERA_SAVEPATH_SDCARD = "1";
diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java
index da180c077..86e47912a 100644
--- a/src/com/android/camera/PhotoModule.java
+++ b/src/com/android/camera/PhotoModule.java
@@ -2809,13 +2809,21 @@ public class PhotoModule
case KeyEvent.KEYCODE_VOLUME_UP:
if (/*TODO: mActivity.isInCameraApp() &&*/ mFirstTimeInitialized
&& (mUI.mMenuInitialized)) {
- mUI.onScaleStepResize(true);
+ if (!CameraActivity.mPowerShutter && !CameraUtil.hasCameraKey()) {
+ onShutterButtonFocus(true);
+ } else {
+ mUI.onScaleStepResize(true);
+ }
}
return true;
case KeyEvent.KEYCODE_VOLUME_DOWN:
if (/*TODO: mActivity.isInCameraApp() &&*/ mFirstTimeInitialized
&& (mUI.mMenuInitialized)) {
- mUI.onScaleStepResize(false);
+ if (!CameraActivity.mPowerShutter && !CameraUtil.hasCameraKey()) {
+ onShutterButtonFocus(true);
+ } else {
+ mUI.onScaleStepResize(false);
+ }
}
return true;
case KeyEvent.KEYCODE_FOCUS:
@@ -2844,7 +2852,7 @@ public class PhotoModule
return true;
case KeyEvent.KEYCODE_POWER:
if (mFirstTimeInitialized && event.getRepeatCount() == 0
- && CameraActivity.mPowerShutter) {
+ && CameraActivity.mPowerShutter && !CameraUtil.hasCameraKey()) {
onShutterButtonFocus(true);
}
return true;
@@ -2860,6 +2868,10 @@ public class PhotoModule
switch (keyCode) {
case KeyEvent.KEYCODE_VOLUME_UP:
case KeyEvent.KEYCODE_VOLUME_DOWN:
+ if (!CameraActivity.mPowerShutter && !CameraUtil.hasCameraKey()
+ && mFirstTimeInitialized) {
+ onShutterButtonClick();
+ }
return true;
case KeyEvent.KEYCODE_FOCUS:
if (mFirstTimeInitialized) {
@@ -2867,7 +2879,8 @@ public class PhotoModule
}
return true;
case KeyEvent.KEYCODE_POWER:
- if (CameraActivity.mPowerShutter && mFirstTimeInitialized) {
+ if (CameraActivity.mPowerShutter && !CameraUtil.hasCameraKey()
+ && mFirstTimeInitialized) {
onShutterButtonClick();
}
return true;
diff --git a/src/com/android/camera/VideoModule.java b/src/com/android/camera/VideoModule.java
index df436106e..e713c72dc 100644
--- a/src/com/android/camera/VideoModule.java
+++ b/src/com/android/camera/VideoModule.java
@@ -1385,25 +1385,41 @@ public class VideoModule implements CameraModule,
switch (keyCode) {
case KeyEvent.KEYCODE_VOLUME_UP:
- mUI.onScaleStepResize(true);
+ if (event.getRepeatCount() == 0 && !CameraActivity.mPowerShutter &&
+ !CameraUtil.hasCameraKey()) {
+ mUI.clickShutter();
+ } else {
+ mUI.onScaleStepResize(true);
+ }
return true;
case KeyEvent.KEYCODE_VOLUME_DOWN:
- mUI.onScaleStepResize(false);
+ if (event.getRepeatCount() == 0 && !CameraActivity.mPowerShutter &&
+ !CameraUtil.hasCameraKey()) {
+ mUI.clickShutter();
+ } else {
+ mUI.onScaleStepResize(false);
+ }
return true;
case KeyEvent.KEYCODE_CAMERA:
if (event.getRepeatCount() == 0) {
mUI.clickShutter();
- return true;
}
- break;
+ return true;
case KeyEvent.KEYCODE_DPAD_CENTER:
if (event.getRepeatCount() == 0) {
mUI.clickShutter();
- return true;
}
- break;
+ return true;
+ case KeyEvent.KEYCODE_POWER:
+ if (event.getRepeatCount() == 0 && CameraActivity.mPowerShutter &&
+ !CameraUtil.hasCameraKey()) {
+ mUI.clickShutter();
+ }
+ return true;
case KeyEvent.KEYCODE_MENU:
- if (mMediaRecorderRecording) return true;
+ if (mMediaRecorderRecording) {
+ return true;
+ }
break;
}
return false;
@@ -1413,14 +1429,21 @@ public class VideoModule implements CameraModule,
public boolean onKeyUp(int keyCode, KeyEvent event) {
switch (keyCode) {
case KeyEvent.KEYCODE_VOLUME_UP:
+ if (!CameraActivity.mPowerShutter && !CameraUtil.hasCameraKey()) {
+ mUI.pressShutter(false);
+ }
+ return true;
case KeyEvent.KEYCODE_VOLUME_DOWN:
+ if (!CameraActivity.mPowerShutter && !CameraUtil.hasCameraKey()) {
+ mUI.pressShutter(false);
+ }
return true;
case KeyEvent.KEYCODE_CAMERA:
mUI.pressShutter(false);
return true;
case KeyEvent.KEYCODE_POWER:
- if (CameraActivity.mPowerShutter) {
- onShutterButtonClick();
+ if (CameraActivity.mPowerShutter && !CameraUtil.hasCameraKey()) {
+ mUI.pressShutter(false);
}
return true;
}
diff --git a/src/com/android/camera/WideAnglePanoramaModule.java b/src/com/android/camera/WideAnglePanoramaModule.java
index 0aab8f804..65e18a17d 100644
--- a/src/com/android/camera/WideAnglePanoramaModule.java
+++ b/src/com/android/camera/WideAnglePanoramaModule.java
@@ -310,6 +310,9 @@ public class WideAnglePanoramaModule
CameraSettings.upgradeGlobalPreferences(mPreferences.getGlobal(), activity);
mLocationManager = new LocationManager(mActivity, null);
+ // Power shutter
+ mActivity.initPowerShutter(mPreferences);
+
mMainHandler = new Handler() {
@Override
public void handleMessage(Message msg) {
@@ -943,6 +946,10 @@ public class WideAnglePanoramaModule
}
mUI.showPreviewCover();
releaseCamera();
+
+ // Load the power shutter
+ mActivity.initPowerShutter(mPreferences);
+
synchronized (mRendererLock) {
mCameraTexture = null;
@@ -1235,14 +1242,38 @@ public class WideAnglePanoramaModule
public void onActivityResult(int requestCode, int resultCode, Intent data) {
}
-
@Override
public boolean onKeyDown(int keyCode, KeyEvent event) {
+ switch (keyCode) {
+ case KeyEvent.KEYCODE_VOLUME_UP:
+ case KeyEvent.KEYCODE_VOLUME_DOWN:
+ return true;
+ case KeyEvent.KEYCODE_CAMERA:
+ if (event.getRepeatCount() == 0) {
+ onShutterButtonClick();
+ }
+ return true;
+ case KeyEvent.KEYCODE_POWER:
+ 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 (!CameraActivity.mPowerShutter && !CameraUtil.hasCameraKey()) {
+ onShutterButtonClick();
+ }
+ return true;
+ case KeyEvent.KEYCODE_POWER:
+ if (CameraActivity.mPowerShutter && !CameraUtil.hasCameraKey()) {
+ onShutterButtonClick();
+ }
+ return true;
+ }
return false;
}
diff --git a/src/com/android/camera/util/CameraUtil.java b/src/com/android/camera/util/CameraUtil.java
index f01d33127..f102939d5 100755
--- a/src/com/android/camera/util/CameraUtil.java
+++ b/src/com/android/camera/util/CameraUtil.java
@@ -144,6 +144,9 @@ public class CameraUtil {
public static final String TRUE = "true";
public static final String FALSE = "false";
+ // Hardware camera key mask
+ private static final int KEY_MASK_CAMERA = 0x20;
+
private static final Class<?>[] CTOR_SIGNATURE =
new Class[] {CaptureRequest.class, CameraMetadataNative.class, boolean.class, int.class};
@@ -191,6 +194,10 @@ public class CameraUtil {
return (supported != null) && supported.contains(SCENE_MODE_HDR);
}
+ public static boolean hasCameraKey() {
+ return (sDeviceKeysPresent & KEY_MASK_CAMERA) != 0;
+ }
+
public static boolean isMeteringAreaSupported(Parameters params) {
return params.getMaxNumMeteringAreas() > 0;
}
@@ -216,6 +223,9 @@ public class CameraUtil {
private static float sPixelDensity = 1;
private static ImageFileNamer sImageFileNamer;
+ // Get available hardware keys
+ private static int sDeviceKeysPresent;
+
private CameraUtil() {
}
@@ -227,6 +237,8 @@ public class CameraUtil {
sPixelDensity = metrics.density;
sImageFileNamer = new ImageFileNamer(
context.getString(R.string.image_file_name_format));
+ sDeviceKeysPresent = context.getResources().getInteger(
+ org.lineageos.platform.internal.R.integer.config_deviceHardwareKeys);
}
public static int dpToPixel(int dp) {
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-18 02:17:53 +0000