summaryrefslogtreecommitdiffstats
path: root/src/com
diff options
context:
space:
mode:
Diffstat (limited to 'src/com')
-rw-r--r--src/com/android/camera/CameraSettings.java1
-rw-r--r--src/com/android/camera/PhotoMenu.java23
-rwxr-xr-xsrc/com/android/camera/PhotoModule.java33
-rwxr-xr-xsrc/com/android/camera/VideoModule.java120
4 files changed, 122 insertions, 55 deletions
diff --git a/src/com/android/camera/CameraSettings.java b/src/com/android/camera/CameraSettings.java
index 2859d1acd..8a84326ff 100644
--- a/src/com/android/camera/CameraSettings.java
+++ b/src/com/android/camera/CameraSettings.java
@@ -92,6 +92,7 @@ public class CameraSettings {
public static final String KEY_LENSSHADING = "pref_camera_lensshading_key";
public static final String KEY_HISTOGRAM = "pref_camera_histogram_key";
public static final String KEY_DENOISE = "pref_camera_denoise_key";
+ public static final String KEY_BRIGHTNESS = "pref_camera_brightness_key";
public static final String KEY_REDEYE_REDUCTION = "pref_camera_redeyereduction_key";
public static final String KEY_CDS_MODE = "pref_camera_cds_mode_key";
public static final String KEY_VIDEO_CDS_MODE = "pref_camera_video_cds_mode_key";
diff --git a/src/com/android/camera/PhotoMenu.java b/src/com/android/camera/PhotoMenu.java
index c4e8f8350..096a8524e 100644
--- a/src/com/android/camera/PhotoMenu.java
+++ b/src/com/android/camera/PhotoMenu.java
@@ -455,6 +455,29 @@ public class PhotoMenu extends PieController
Toast.makeText(mActivity,
R.string.flash_aebracket_message,Toast.LENGTH_SHORT).show();
}
+ } else if (notSame(pref, CameraSettings.KEY_LONGSHOT, mSettingOff)) {
+ ListPreference advancefeaturePref =
+ mPreferenceGroup.findPreference(CameraSettings.KEY_ADVANCED_FEATURES);
+ if (advancefeaturePref != null) {
+ if (notSame(advancefeaturePref, CameraSettings.KEY_ADVANCED_FEATURES,
+ mActivity.getString(R.string.pref_camera_advanced_feature_default))) {
+ Toast.makeText(mActivity, R.string.longshot_enable_message,
+ Toast.LENGTH_LONG).show();
+ }
+ setPreference(CameraSettings.KEY_ADVANCED_FEATURES,
+ mActivity.getString(R.string.pref_camera_advanced_feature_default));
+ }
+ } else if (notSame(pref, CameraSettings.KEY_ADVANCED_FEATURES,
+ mActivity.getString(R.string.pref_camera_advanced_feature_default))) {
+ ListPreference longshotPref =
+ mPreferenceGroup.findPreference(CameraSettings.KEY_LONGSHOT);
+ if (longshotPref != null ) {
+ if (notSame(longshotPref, CameraSettings.KEY_LONGSHOT, mSettingOff)) {
+ Toast.makeText(mActivity, R.string.advance_feature_enable_msg,
+ Toast.LENGTH_LONG).show();
+ }
+ setPreference(CameraSettings.KEY_LONGSHOT, mSettingOff);
+ }
}
super.onSettingChanged(pref);
}
diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java
index 010256315..a4a54358b 100755
--- a/src/com/android/camera/PhotoModule.java
+++ b/src/com/android/camera/PhotoModule.java
@@ -204,6 +204,7 @@ public class PhotoModule
private static final int MINIMUM_BRIGHTNESS = 0;
private static final int MAXIMUM_BRIGHTNESS = 6;
+ private static final int DEFAULT_BRIGHTNESS = 3;
private int mbrightness = 3;
private int mbrightness_step = 1;
private ProgressBar brightnessProgressBar;
@@ -505,6 +506,9 @@ public class PhotoModule
seeker.setOnSeekBarChangeListener(mSeekListener);
}
brightnessProgressBar.setMax(MAXIMUM_BRIGHTNESS);
+ mbrightness = mPreferences.getInt(
+ CameraSettings.KEY_BRIGHTNESS,
+ DEFAULT_BRIGHTNESS);
brightnessProgressBar.setProgress(mbrightness);
skinToneSeekBar = (SeekBar) mRootView.findViewById(R.id.skintoneseek);
skinToneSeekBar.setOnSeekBarChangeListener(mskinToneSeekListener);
@@ -1701,7 +1705,8 @@ public class PhotoModule
if (oldOrientation != mOrientation) {
Log.v(TAG, "onOrientationChanged, update parameters");
if (mParameters != null && mCameraDevice != null) {
- onSharedPreferenceChanged();
+ setFlipValue();
+ mCameraDevice.setParameters(mParameters);
}
}
@@ -2256,6 +2261,9 @@ public class PhotoModule
}
}
brightnessProgressBar.setProgress(mbrightness);
+ Editor editor = mPreferences.edit();
+ editor.putInt(CameraSettings.KEY_BRIGHTNESS, mbrightness);
+ editor.apply();
brightnessProgressBar.setVisibility(View.VISIBLE);
mBrightnessVisible = true;
}
@@ -2274,6 +2282,9 @@ public class PhotoModule
}
}
brightnessProgressBar.setProgress(mbrightness);
+ Editor editor = mPreferences.edit();
+ editor.putInt(CameraSettings.KEY_BRIGHTNESS, mbrightness);
+ editor.apply();
brightnessProgressBar.setVisibility(View.VISIBLE);
mBrightnessVisible = true;
}
@@ -2887,6 +2898,18 @@ public class PhotoModule
mCameraDevice.setHistogramMode(null);
}
}
+
+ setFlipValue();
+
+ /* Disable focus if aebracket is ON */
+ String aeBracket = mParameters.get(CameraSettings.KEY_QC_AE_BRACKETING);
+ if (!aeBracket.equalsIgnoreCase("off")) {
+ String fMode = Parameters.FLASH_MODE_OFF;
+ mParameters.setFlashMode(fMode);
+ }
+ }
+
+ private void setFlipValue() {
// Read Flip mode from adb command
//value: 0(default) - FLIP_MODE_OFF
//value: 1 - FLIP_MODE_H
@@ -2929,14 +2952,8 @@ public class PhotoModule
if(CameraUtil.isSupported(picture_flip, CameraSettings.getSupportedFlipMode(mParameters))){
mParameters.set(CameraSettings.KEY_QC_SNAPSHOT_PICTURE_FLIP, picture_flip);
}
- /* Disable focus if aebracket is ON */
- String aeBracket = mParameters.get(CameraSettings.KEY_QC_AE_BRACKETING);
- if (!aeBracket.equalsIgnoreCase("off")) {
- String fMode = Parameters.FLASH_MODE_OFF;
- mUI.overrideSettings(CameraSettings.KEY_FLASH_MODE, fMode);
- mParameters.setFlashMode(fMode);
- }
}
+
@TargetApi(Build.VERSION_CODES.JELLY_BEAN)
private void setAutoExposureLockIfSupported() {
if (mAeLockSupported) {
diff --git a/src/com/android/camera/VideoModule.java b/src/com/android/camera/VideoModule.java
index 226e50398..651a3e3a6 100755
--- a/src/com/android/camera/VideoModule.java
+++ b/src/com/android/camera/VideoModule.java
@@ -565,8 +565,10 @@ public class VideoModule implements CameraModule,
if (mOrientation != newOrientation) {
mOrientation = newOrientation;
Log.v(TAG, "onOrientationChanged, update parameters");
- if ((mParameters != null) && (true == mPreviewing) && !mMediaRecorderRecording){
- setCameraParameters();
+ if ((mCameraDevice != null) && (mParameters != null)
+ && (true == mPreviewing) && !mMediaRecorderRecording){
+ setFlipValue();
+ mCameraDevice.setParameters(mParameters);
}
}
@@ -1919,6 +1921,53 @@ public class VideoModule implements CameraModule,
return supported == null ? false : supported.indexOf(value) >= 0;
}
+ private void setFlipValue() {
+
+ // Read Flip mode from adb command
+ //value: 0(default) - FLIP_MODE_OFF
+ //value: 1 - FLIP_MODE_H
+ //value: 2 - FLIP_MODE_V
+ //value: 3 - FLIP_MODE_VH
+ int preview_flip_value = SystemProperties.getInt("debug.camera.preview.flip", 0);
+ int video_flip_value = SystemProperties.getInt("debug.camera.video.flip", 0);
+ int picture_flip_value = SystemProperties.getInt("debug.camera.picture.flip", 0);
+ int rotation = CameraUtil.getJpegRotation(mCameraId, mOrientation);
+ mParameters.setRotation(rotation);
+ if (rotation == 90 || rotation == 270) {
+ // in case of 90 or 270 degree, V/H flip should reverse
+ if (preview_flip_value == 1) {
+ preview_flip_value = 2;
+ } else if (preview_flip_value == 2) {
+ preview_flip_value = 1;
+ }
+ if (video_flip_value == 1) {
+ video_flip_value = 2;
+ } else if (video_flip_value == 2) {
+ video_flip_value = 1;
+ }
+ if (picture_flip_value == 1) {
+ picture_flip_value = 2;
+ } else if (picture_flip_value == 2) {
+ picture_flip_value = 1;
+ }
+ }
+ String preview_flip = CameraUtil.getFilpModeString(preview_flip_value);
+ String video_flip = CameraUtil.getFilpModeString(video_flip_value);
+ String picture_flip = CameraUtil.getFilpModeString(picture_flip_value);
+
+ if(CameraUtil.isSupported(preview_flip, CameraSettings.getSupportedFlipMode(mParameters))){
+ mParameters.set(CameraSettings.KEY_QC_PREVIEW_FLIP, preview_flip);
+ }
+ if(CameraUtil.isSupported(video_flip, CameraSettings.getSupportedFlipMode(mParameters))){
+ mParameters.set(CameraSettings.KEY_QC_VIDEO_FLIP, video_flip);
+ }
+ if(CameraUtil.isSupported(picture_flip, CameraSettings.getSupportedFlipMode(mParameters))){
+ mParameters.set(CameraSettings.KEY_QC_SNAPSHOT_PICTURE_FLIP, picture_flip);
+ }
+
+
+ }
+
private void qcomSetCameraParameters(){
// add QCOM Parameters here
// Set color effect parameter.
@@ -1934,9 +1983,27 @@ public class VideoModule implements CameraModule,
CameraSettings.KEY_DIS,
mActivity.getString(R.string.pref_camera_dis_default));
Log.v(TAG, "DIS value =" + disMode);
- if (isSupported(disMode,
- CameraSettings.getSupportedDISModes(mParameters))) {
- mParameters.set(CameraSettings.KEY_QC_DIS_MODE, disMode);
+
+ if (is4KEnabled()) {
+ if (isSupported(mActivity.getString(R.string.pref_camera_dis_value_disable),
+ CameraSettings.getSupportedDISModes(mParameters))) {
+ mParameters.set(CameraSettings.KEY_QC_DIS_MODE,
+ mActivity.getString(R.string.pref_camera_dis_value_disable));
+ mUI.overrideSettings(CameraSettings.KEY_DIS,
+ mActivity.getString(R.string.pref_camera_dis_value_disable));
+ Toast.makeText(mActivity, R.string.video_quality_4k_disable_IS,
+ Toast.LENGTH_LONG).show();
+ } else {
+ Log.e(TAG, "Not supported IS mode = " +
+ mActivity.getString(R.string.pref_camera_dis_value_disable));
+ }
+ } else {
+ if (isSupported(disMode,
+ CameraSettings.getSupportedDISModes(mParameters))) {
+ mParameters.set(CameraSettings.KEY_QC_DIS_MODE, disMode);
+ } else {
+ Log.e(TAG, "Not supported IS mode = " + disMode);
+ }
}
if (mDefaultAntibanding == null) {
@@ -2058,48 +2125,7 @@ public class VideoModule implements CameraModule,
mParameters.setVideoHighFrameRate("off");
mParameters.set(CameraSettings.KEY_VIDEO_HSR, "off");
}
-
- // Read Flip mode from adb command
- //value: 0(default) - FLIP_MODE_OFF
- //value: 1 - FLIP_MODE_H
- //value: 2 - FLIP_MODE_V
- //value: 3 - FLIP_MODE_VH
- int preview_flip_value = SystemProperties.getInt("debug.camera.preview.flip", 0);
- int video_flip_value = SystemProperties.getInt("debug.camera.video.flip", 0);
- int picture_flip_value = SystemProperties.getInt("debug.camera.picture.flip", 0);
- int rotation = CameraUtil.getJpegRotation(mCameraId, mOrientation);
- mParameters.setRotation(rotation);
- if (rotation == 90 || rotation == 270) {
- // in case of 90 or 270 degree, V/H flip should reverse
- if (preview_flip_value == 1) {
- preview_flip_value = 2;
- } else if (preview_flip_value == 2) {
- preview_flip_value = 1;
- }
- if (video_flip_value == 1) {
- video_flip_value = 2;
- } else if (video_flip_value == 2) {
- video_flip_value = 1;
- }
- if (picture_flip_value == 1) {
- picture_flip_value = 2;
- } else if (picture_flip_value == 2) {
- picture_flip_value = 1;
- }
- }
- String preview_flip = CameraUtil.getFilpModeString(preview_flip_value);
- String video_flip = CameraUtil.getFilpModeString(video_flip_value);
- String picture_flip = CameraUtil.getFilpModeString(picture_flip_value);
-
- if(CameraUtil.isSupported(preview_flip, CameraSettings.getSupportedFlipMode(mParameters))){
- mParameters.set(CameraSettings.KEY_QC_PREVIEW_FLIP, preview_flip);
- }
- if(CameraUtil.isSupported(video_flip, CameraSettings.getSupportedFlipMode(mParameters))){
- mParameters.set(CameraSettings.KEY_QC_VIDEO_FLIP, video_flip);
- }
- if(CameraUtil.isSupported(picture_flip, CameraSettings.getSupportedFlipMode(mParameters))){
- mParameters.set(CameraSettings.KEY_QC_SNAPSHOT_PICTURE_FLIP, picture_flip);
- }
+ setFlipValue();
// Set video CDS
String video_cds = mPreferences.getString(
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-18 16:15:05 +0000