From c058e3fdfeda1c9836024ce135e567186bfeac35 Mon Sep 17 00:00:00 2001 From: xianming wang Date: Tue, 8 Oct 2019 16:11:11 +0800 Subject: SnapdragonCamera: Disable MPEG4 when enable EIS and less 720P Disable MPEG4 encoder when enable EIS and video quality less than 720P. CRs-Fixed: 2532891 Change-Id: I48c450c47b77500562aa53c31edbae5caf873a0b --- src/com/android/camera/SettingsActivity.java | 6 ++++++ src/com/android/camera/SettingsManager.java | 20 ++++++++++++++++++++ 2 files changed, 26 insertions(+) diff --git a/src/com/android/camera/SettingsActivity.java b/src/com/android/camera/SettingsActivity.java index ae7b48293..3fef92493 100755 --- a/src/com/android/camera/SettingsActivity.java +++ b/src/com/android/camera/SettingsActivity.java @@ -159,6 +159,12 @@ public class SettingsActivity extends PreferenceActivity { if ( (pref.getKey().equals(SettingsManager.KEY_MANUAL_WB)) ) { updateManualWBSettings(); } + + if (pref.getKey().equals(SettingsManager.KEY_VIDEO_QUALITY) || + pref.getKey().equals(SettingsManager.KEY_DIS) || + pref.getKey().equals(SettingsManager.KEY_EIS_VALUE)) { + updatePreference(SettingsManager.KEY_VIDEO_ENCODER); + } } } }; diff --git a/src/com/android/camera/SettingsManager.java b/src/com/android/camera/SettingsManager.java index 253108603..41e12af98 100755 --- a/src/com/android/camera/SettingsManager.java +++ b/src/com/android/camera/SettingsManager.java @@ -1091,6 +1091,9 @@ public class SettingsManager implements ListMenu.SettingsListener { filterVideoEncoderProfileOptions(); } else if (pref.getKey().equals(KEY_PICTURE_FORMAT)) { filterHeifSizeOptions(); + } else if (pref.getKey().equals(KEY_DIS) || + pref.getKey().equals(KEY_EIS_VALUE)) { + filterVideoEncoderOptions(); } } @@ -1941,6 +1944,23 @@ public class SettingsManager implements ListMenu.SettingsListener { } } } + + ListPreference videoQuality = mPreferenceGroup.findPreference(KEY_VIDEO_QUALITY); + String videoSize = videoQuality.getValue(); + int indexX = videoSize.indexOf('x'); + int width = Integer.parseInt(videoSize.substring(0, indexX)); + int height = Integer.parseInt(videoSize.substring(indexX + 1)); + // Video quality less than 720P + boolean isLess720P = width < 1280 && height < 720; + + ListPreference disPref = mPreferenceGroup.findPreference(KEY_DIS); + ListPreference eisPref = mPreferenceGroup.findPreference(KEY_EIS_VALUE); + if (isLess720P && + "on".equals(disPref.getValue()) && + !("disable".equals(eisPref.getValue()))) { + supported.remove("mpeg-4-sp"); + } + return supported; } -- cgit v1.2.3 From d07c58ce282c3e6a27d07ecb07c9f66e21f6e1ad Mon Sep 17 00:00:00 2001 From: jiaoyuan Date: Wed, 9 Oct 2019 10:11:10 +0800 Subject: SnapdraongCamera: mms do not need high speed mms do not support high speed Change-Id: Id0ec90ef7ff1b09bd8045300fd58fe65133e127f --- src/com/android/camera/CaptureModule.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/com/android/camera/CaptureModule.java b/src/com/android/camera/CaptureModule.java index 8aa654b21..d4db0b771 100755 --- a/src/com/android/camera/CaptureModule.java +++ b/src/com/android/camera/CaptureModule.java @@ -5502,12 +5502,12 @@ public class CaptureModule implements CameraModule, PhotoController, if (mCaptureTimeLapse) { size = CameraSettings.getTimeLapseQualityFor(size); } - Bundle myExtras = intent.getExtras(); if (mMediaRecorder == null) mMediaRecorder = new MediaRecorder(); updateHFRSetting(); + mHighSpeedCapture = mHighSpeedCapture && (myExtras == null); //MMS not support high speed boolean hfr = mHighSpeedCapture && !mHighSpeedRecordingMode; if (CamcorderProfile.hasProfile(cameraId, size)) { @@ -5640,7 +5640,6 @@ public class CaptureModule implements CameraModule, PhotoController, if (requestedSizeLimit > 0 && requestedSizeLimit < maxFileSize) { maxFileSize = requestedSizeLimit; } - if (Storage.isSaveSDCard() && maxFileSize > SDCARD_SIZE_LIMIT) { maxFileSize = SDCARD_SIZE_LIMIT; } -- cgit v1.2.3 From 3394ac3cf62f5277ba5c0fe2066025154d0f8bf0 Mon Sep 17 00:00:00 2001 From: jiaoyuan Date: Thu, 10 Oct 2019 15:40:32 +0800 Subject: SnapdragonCamera: hide navigation bar hide navigation bar Change-Id: I98c081cc4feaa7a8434bf2325c30daef98ce15ea --- src/com/android/camera/CameraActivity.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/com/android/camera/CameraActivity.java b/src/com/android/camera/CameraActivity.java index 9f225d1c7..2390afa8e 100755 --- a/src/com/android/camera/CameraActivity.java +++ b/src/com/android/camera/CameraActivity.java @@ -641,7 +641,8 @@ public class CameraActivity extends Activity View decorView = getWindow().getDecorView(); int currentSystemUIVisibility = decorView.getSystemUiVisibility(); int systemUIVisibility = DEFAULT_SYSTEM_UI_VISIBILITY; - int systemUINotVisible = View.SYSTEM_UI_FLAG_LOW_PROFILE | View.SYSTEM_UI_FLAG_FULLSCREEN; + int systemUINotVisible = View.SYSTEM_UI_FLAG_LOW_PROFILE | View.SYSTEM_UI_FLAG_FULLSCREEN | + View.SYSTEM_UI_FLAG_HIDE_NAVIGATION | View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY; int newSystemUIVisibility = systemUIVisibility | (visible ? View.SYSTEM_UI_FLAG_VISIBLE : systemUINotVisible); -- cgit v1.2.3 From 416558c5d8a2a36d78788e9c6772c943b2ccdcbc Mon Sep 17 00:00:00 2001 From: junjiez Date: Wed, 11 Sep 2019 16:10:01 +0800 Subject: SnapdraongCamera:Filter HEIF size Filter unsupported HEIF size according to the capabilities of heic encoder to avoid codec error. Change-Id: If68f517f768d04c27f1bd52def4d8fb492b74842 CRs-Fixed: 2525250 --- src/com/android/camera/SettingsManager.java | 46 ++++++++++++++++++++++++++--- 1 file changed, 42 insertions(+), 4 deletions(-) diff --git a/src/com/android/camera/SettingsManager.java b/src/com/android/camera/SettingsManager.java index 253108603..88fe2ec53 100755 --- a/src/com/android/camera/SettingsManager.java +++ b/src/com/android/camera/SettingsManager.java @@ -1670,10 +1670,26 @@ public class SettingsManager implements ListMenu.SettingsListener { res.add(getSupportedQcfaDimension(cameraId)); } + VideoCapabilities heifCap = null; + if (isHeifEnabled) { + MediaCodecList list = new MediaCodecList(MediaCodecList.REGULAR_CODECS); + for (MediaCodecInfo info :list.getCodecInfos()) { + if (info.isEncoder() && info.getName().contains("heic")){ + heifCap = info.getCapabilitiesForType( + MediaFormat.MIMETYPE_IMAGE_ANDROID_HEIC).getVideoCapabilities(); + Log.d(TAG,"supported heif height range ="+heifCap.getSupportedHeights().toString() + + " width range ="+heifCap.getSupportedWidths().toString()); + } + } + } + if (sizes != null) { for (int i = 0; i < sizes.length; i++) { - if (isHeifEnabled && (Math.min(sizes[i].getWidth(),sizes[i].getHeight()) < 512)) { - continue; + if (isHeifEnabled && heifCap != null ){ + if (!heifCap.getSupportedWidths().contains(sizes[i].getWidth()) || + !heifCap.getSupportedHeights().contains(sizes[i].getHeight())){ + continue; + } } if (isDeepportrait && (Math.min(sizes[i].getWidth(),sizes[i].getHeight()) < 720 || @@ -1686,8 +1702,15 @@ public class SettingsManager implements ListMenu.SettingsListener { } Size[] highResSizes = map.getHighResolutionOutputSizes(ImageFormat.JPEG); + if (highResSizes != null) { for (int i = 0; i < highResSizes.length; i++) { + if (isHeifEnabled && heifCap != null) { + if (!heifCap.getSupportedWidths().contains(highResSizes[i].getWidth()) || + !heifCap.getSupportedHeights().contains(highResSizes[i].getHeight())){ + continue; + } + } res.add(highResSizes[i].toString()); } } @@ -1735,10 +1758,25 @@ public class SettingsManager implements ListMenu.SettingsListener { CameraCharacteristics.SCALER_STREAM_CONFIGURATION_MAP); Size[] sizes = map.getOutputSizes(MediaRecorder.class); boolean isHeifEnabled = getSavePictureFormat() == HEIF_FORMAT; + VideoCapabilities heifCap = null; + if (isHeifEnabled) { + MediaCodecList list = new MediaCodecList(MediaCodecList.REGULAR_CODECS); + for (MediaCodecInfo info :list.getCodecInfos()) { + if (info.isEncoder() && info.getName().contains("heic")){ + heifCap = info.getCapabilitiesForType( + MediaFormat.MIMETYPE_IMAGE_ANDROID_HEIC).getVideoCapabilities(); + Log.d(TAG,"supported heif height range ="+heifCap.getSupportedHeights().toString() + + " width range ="+heifCap.getSupportedWidths().toString()); + } + } + } List res = new ArrayList<>(); for (int i = 0; i < sizes.length; i++) { - if (isHeifEnabled && (Math.min(sizes[i].getWidth(),sizes[i].getHeight()) < 512)) { - continue; + if (isHeifEnabled && heifCap != null ){ + if (!heifCap.getSupportedWidths().contains(sizes[i].getWidth()) || + !heifCap.getSupportedHeights().contains(sizes[i].getHeight())){ + continue; + } } if (CameraSettings.VIDEO_QUALITY_TABLE.containsKey(sizes[i].toString())) { Integer profile = CameraSettings.VIDEO_QUALITY_TABLE.get(sizes[i].toString()); -- cgit v1.2.3 From 075c578609a0024cef6057d4776f55275f097d62 Mon Sep 17 00:00:00 2001 From: jiaoyuan Date: Thu, 17 Oct 2019 15:24:53 +0800 Subject: SnapdragonCamera: options button missing in promode reset options button height Change-Id: I607c236fb6f2452f0024151027ad4afa420f54e8 --- src/com/android/camera/ui/OneUICameraControls.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/com/android/camera/ui/OneUICameraControls.java b/src/com/android/camera/ui/OneUICameraControls.java index fb7f9d6fd..20b1fa67f 100755 --- a/src/com/android/camera/ui/OneUICameraControls.java +++ b/src/com/android/camera/ui/OneUICameraControls.java @@ -593,6 +593,7 @@ public class OneUICameraControls extends RotatableLayout { mProModeCloseButton.setVisibility(INVISIBLE); return; } + setProModeParameters(); mProModeLayout.setVisibility(VISIBLE); mProModeCloseButton.setVisibility(VISIBLE); mProModeLayout.setY(mHeight - mBottom - mProModeLayout.getHeight()); -- cgit v1.2.3 From 9f72ab6653f5bc833d1c8a7fea2c307c5623eda9 Mon Sep 17 00:00:00 2001 From: jinwu Date: Thu, 17 Oct 2019 16:09:21 +0800 Subject: Update version number to 2.02.034 Change-Id: If8b54dd0aee479d5cbd8184835393a22cfe969d2 --- version.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.mk b/version.mk index e64719dee..972bb3ef0 100755 --- a/version.mk +++ b/version.mk @@ -40,7 +40,7 @@ # base_version_build is 3 digits and auto-increment for fixing CR. base_version_major := 2 base_version_minor := 02 -base_version_build := 033 +base_version_build := 034 ##################################################### ##################################################### -- cgit v1.2.3 From 358b5c9fb67a69bfe823c3f24543090308bc445b Mon Sep 17 00:00:00 2001 From: jiaoyuan Date: Fri, 18 Oct 2019 10:02:55 +0800 Subject: SnapdragonCamera: Flash icon appears after countdown Flash icon appears after snapshot with countdown timer in ProMode Change-Id: I21101397b617e8afc433118400bb4b07ae061801 --- src/com/android/camera/ui/FlashToggleButton.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) mode change 100644 => 100755 src/com/android/camera/ui/FlashToggleButton.java diff --git a/src/com/android/camera/ui/FlashToggleButton.java b/src/com/android/camera/ui/FlashToggleButton.java old mode 100644 new mode 100755 index fa766bfb8..fca76b7a1 --- a/src/com/android/camera/ui/FlashToggleButton.java +++ b/src/com/android/camera/ui/FlashToggleButton.java @@ -71,8 +71,16 @@ public class FlashToggleButton extends RotateImageView { String userSetting = mContext.getString( R.string.pref_camera_manual_exp_value_user_setting); String manualExposureMode = mSettingsManager.getValue(SettingsManager.KEY_MANUAL_EXPOSURE); + String scene = mSettingsManager.getValue(SettingsManager.KEY_SCENE_MODE); + boolean promode = false; + if (scene != null) { + int mode = Integer.parseInt(scene); + if (mode == SettingsManager.SCENE_MODE_PROMODE_INT) { + promode = true; + } + } if (mIndex == -1 || (redeye != null && redeye.equals("on")) || - manualExposureMode.equals(userSetting)) { + manualExposureMode.equals(userSetting) || promode) { setVisibility(GONE); return; } else { -- cgit v1.2.3 From 91c1d6a62f06fded27d4f4489f627d1ea3a0709f Mon Sep 17 00:00:00 2001 From: junjiez Date: Tue, 29 Oct 2019 11:04:21 +0800 Subject: SnapdraongCamera:APP-ZSL size Need to get max supported size as APP-ZSL size, then crop into picture size to avoid FOV issue Change-Id: I298544d849af6ba4944826f8960e47331b4abe34 CRs-Fixed: 2545491 --- src/com/android/camera/SettingsManager.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/com/android/camera/SettingsManager.java b/src/com/android/camera/SettingsManager.java index 253108603..5293ac3b0 100755 --- a/src/com/android/camera/SettingsManager.java +++ b/src/com/android/camera/SettingsManager.java @@ -1709,7 +1709,12 @@ public class SettingsManager implements ListMenu.SettingsListener { public Size[] getSupportedOutputSize(int cameraId, Class cl) { StreamConfigurationMap map = mCharacteristics.get(cameraId).get( CameraCharacteristics.SCALER_STREAM_CONFIGURATION_MAP); - return map.getOutputSizes(cl); + Size[] normal = map.getOutputSizes(cl); + Size[] high = map.getHighResolutionOutputSizes(ImageFormat.PRIVATE); + Size[] ret = new Size[normal.length+high.length]; + System.arraycopy(normal,0,ret,0,normal.length); + System.arraycopy(high,0,ret,normal.length,high.length); + return ret; } private List getSupportedVideoDuration() { -- cgit v1.2.3 From 5c0099676751ad4fdacc1b775751c712865959ee Mon Sep 17 00:00:00 2001 From: xianming wang Date: Wed, 30 Oct 2019 15:37:42 +0800 Subject: SnapdragonCamera: Correct the mBackCameraId and mFrontCameraId Correct the mBackCameraId and mFrontCameraId. Change-Id: I10904c601801c89b89f1fb21468d5c7a420bfb4a --- src/com/android/camera/CameraHolder.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/com/android/camera/CameraHolder.java b/src/com/android/camera/CameraHolder.java index d5167af5b..f7ee1af88 100755 --- a/src/com/android/camera/CameraHolder.java +++ b/src/com/android/camera/CameraHolder.java @@ -23,6 +23,7 @@ import android.hardware.Camera.CameraInfo; import android.hardware.Camera.Parameters; import android.hardware.camera2.CameraAccessException; import android.hardware.camera2.CameraCharacteristics; +import android.hardware.camera2.CameraMetadata; import android.os.Build; import android.os.Handler; import android.os.HandlerThread; @@ -182,10 +183,10 @@ public class CameraHolder { = manager.getCameraCharacteristics(cameraId); Log.d(TAG,"cameraIdList size ="+cameraIdList.length); int facing = characteristics.get(CameraCharacteristics.LENS_FACING); - if (facing == CameraCharacteristics.LENS_FACING_FRONT) { + if (mFrontCameraId == -1 && facing == CameraMetadata.LENS_FACING_FRONT) { CaptureModule.FRONT_ID = i; mFrontCameraId = i; - } else if (mBackCameraId != -1) { + } else if (mBackCameraId == -1 && facing == CameraMetadata.LENS_FACING_BACK) { mBackCameraId = i; } mCharacteristics.add(i, characteristics); -- cgit v1.2.3 From 39765335ed74d3b2ed5f4ad966c250b031821ae4 Mon Sep 17 00:00:00 2001 From: Divya Sharma Date: Fri, 13 Sep 2019 10:03:02 -0700 Subject: Removes all usages of ScriptC_* variables. Change-Id: I42386aac4e9f534637fe1a81f29c596341dc8077 --- src/com/android/camera/imageprocessor/FrameProcessor.java | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/src/com/android/camera/imageprocessor/FrameProcessor.java b/src/com/android/camera/imageprocessor/FrameProcessor.java index 6397229f0..cd1a5f8a2 100755 --- a/src/com/android/camera/imageprocessor/FrameProcessor.java +++ b/src/com/android/camera/imageprocessor/FrameProcessor.java @@ -81,8 +81,6 @@ public class FrameProcessor { private ListeningTask mListeningTask; private RenderScript mRs; private Activity mActivity; - ScriptC_YuvToRgb mRsYuvToRGB; - ScriptC_rotator mRsRotator; private Size mSize; private Object mAllocationLock = new Object(); private boolean mIsAllocationEverUsed; @@ -108,8 +106,6 @@ public class FrameProcessor { mFinalFilters = new ArrayList(); mRs = RenderScript.create(mActivity); - mRsYuvToRGB = new ScriptC_YuvToRgb(mRs); - mRsRotator = new ScriptC_rotator(mRs); } private void init(Size previewDim) { @@ -158,11 +154,6 @@ public class FrameProcessor { Type.Builder nv21TypeBuilder = new Type.Builder(mRs, Element.U8(mRs)); nv21TypeBuilder.setX(width * height * 3 / 2); mProcessAllocation = Allocation.createTyped(mRs, nv21TypeBuilder.create(), Allocation.USAGE_SCRIPT); - mRsRotator.set_gIn(mInputAllocation); - mRsRotator.set_gOut(mProcessAllocation); - mRsRotator.set_width(width); - mRsRotator.set_height(height); - mRsRotator.set_pad(stridePad); int degree = 90; if(mModule.getMainCameraCharacteristics() != null) { degree = mModule.getMainCameraCharacteristics(). @@ -171,10 +162,6 @@ public class FrameProcessor { degree = Math.abs(degree - 90); } } - mRsRotator.set_degree(degree); - mRsYuvToRGB.set_gIn(mProcessAllocation); - mRsYuvToRGB.set_width(height); - mRsYuvToRGB.set_height(width); } public ArrayList getFrameFilters() { @@ -491,8 +478,6 @@ public class FrameProcessor { createAllocation(stride, height, stride - width); } mInputAllocation.copyFrom(yvuBytes); - mRsRotator.forEach_rotate90andMerge(mInputAllocation); - mRsYuvToRGB.forEach_nv21ToRgb(mOutputAllocation); mOutputAllocation.ioSend(); if (mVideoOutputAllocation != null) { mVideoOutputAllocation.copyFrom(mOutputAllocation); -- cgit v1.2.3 From f3b7cacf2b53b3239fc29ffddc2028be6dba89a2 Mon Sep 17 00:00:00 2001 From: jinwu Date: Tue, 5 Nov 2019 18:40:39 +0800 Subject: Update version number to 2.02.035 Change-Id: I78b8bef52fff617a9f0d701cf3d9edb7dd172622 --- version.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.mk b/version.mk index 972bb3ef0..548001eaf 100755 --- a/version.mk +++ b/version.mk @@ -40,7 +40,7 @@ # base_version_build is 3 digits and auto-increment for fixing CR. base_version_major := 2 base_version_minor := 02 -base_version_build := 034 +base_version_build := 035 ##################################################### ##################################################### -- cgit v1.2.3 From 49861b80ec34389e5e900024d33030819568f8e4 Mon Sep 17 00:00:00 2001 From: jiaoyuan Date: Wed, 9 Oct 2019 10:25:45 +0800 Subject: SnapdraongCamera: set mLongshoting false set mLongshoting false when long capture finish Change-Id: If64153b17976552917ef82f04ba9baab4aaf61ee --- src/com/android/camera/CaptureModule.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/com/android/camera/CaptureModule.java b/src/com/android/camera/CaptureModule.java index d4db0b771..f2c3b987b 100755 --- a/src/com/android/camera/CaptureModule.java +++ b/src/com/android/camera/CaptureModule.java @@ -2375,6 +2375,7 @@ public class CaptureModule implements CameraModule, PhotoController, } }); } + mLongshoting = false; } @Override @@ -2408,6 +2409,7 @@ public class CaptureModule implements CameraModule, PhotoController, } }); } + mLongshoting = false; } @Override -- cgit v1.2.3 From c4f44d9bf3531b02b57ca69a02e6f0c0d9175905 Mon Sep 17 00:00:00 2001 From: junjiez Date: Thu, 10 Oct 2019 15:18:51 +0800 Subject: SnapdraongCamera:Disable HEIF when SelfieMirror SelfieMirror need to use app-zsl,but app-zsl is not supported,so disable heif when SelfieMirror is enabled. Change-Id: I31a5e482a73716521dd3bacd637db4df119a508d CRs-Fixed: 2534960 --- src/com/android/camera/SettingsActivity.java | 30 ++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/src/com/android/camera/SettingsActivity.java b/src/com/android/camera/SettingsActivity.java index 3fef92493..ffdb1a5db 100755 --- a/src/com/android/camera/SettingsActivity.java +++ b/src/com/android/camera/SettingsActivity.java @@ -156,6 +156,12 @@ public class SettingsActivity extends PreferenceActivity { pref, "Off", "0"); } + if ((pref.getKey().equals(SettingsManager.KEY_ZSL) || + pref.getKey().equals(SettingsManager.KEY_PICTURE_FORMAT)) || + pref.getKey().equals(SettingsManager.KEY_SELFIEMIRROR)) { + updateFormatPreference(); + } + if ( (pref.getKey().equals(SettingsManager.KEY_MANUAL_WB)) ) { updateManualWBSettings(); } @@ -169,6 +175,7 @@ public class SettingsActivity extends PreferenceActivity { } }; + /** * This method is to enable or disable the option which is conflict with changed setting * @param conflictKey key you want to change after setting is changed @@ -188,6 +195,29 @@ public class SettingsActivity extends PreferenceActivity { } } + private void updateFormatPreference() { + ListPreference formatPref = (ListPreference)findPreference(SettingsManager.KEY_PICTURE_FORMAT); + ListPreference ZSLPref = (ListPreference) findPreference(SettingsManager.KEY_ZSL); + ListPreference mfnrPref = (ListPreference) findPreference(SettingsManager.KEY_CAPTURE_MFNR_VALUE); + SwitchPreference selfiePref = (SwitchPreference) findPreference(SettingsManager.KEY_SELFIEMIRROR); + if (formatPref == null) { + return; + } + if((ZSLPref != null && "app-zsl".equals(ZSLPref.getValue())) || + (selfiePref != null && selfiePref.isChecked())){ + formatPref.setValue("0"); + formatPref.setEnabled(false); + if (mfnrPref != null) { + mfnrPref.setEnabled(false); + } + } else { + formatPref.setEnabled(true); + if (mfnrPref != null) { + mfnrPref.setEnabled(true); + } + } + } + private void UpdateManualExposureSettings() { //dismiss all popups first, because we need to show edit dialog int cameraId = mSettingsManager.getCurrentCameraId(); -- cgit v1.2.3 From 6bb719c84f7bc359bae05905aaffc571bdf6f056 Mon Sep 17 00:00:00 2001 From: junjiez Date: Fri, 15 Nov 2019 09:54:42 +0800 Subject: SnapdraongCamera:Fix recording pause Catch IllegalStateException when fails to pause video recording. Change-Id: Id1c4978db58bd040dd695313bf246202fd7357c7 CRs-Fixed: 2565211 --- src/com/android/camera/CaptureModule.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/com/android/camera/CaptureModule.java b/src/com/android/camera/CaptureModule.java index d4db0b771..6f5c8c8e7 100755 --- a/src/com/android/camera/CaptureModule.java +++ b/src/com/android/camera/CaptureModule.java @@ -3118,7 +3118,7 @@ public class CaptureModule implements CameraModule, PhotoController, } catch (InterruptedException e) { mCameraOpenCloseLock.release(); throw new RuntimeException("Interrupted while trying to lock camera closing.", e); - } catch (CameraAccessException e) { + } catch (CameraAccessException | IllegalStateException e) { e.printStackTrace(); } finally { mCameraOpenCloseLock.release(); @@ -5180,7 +5180,13 @@ public class CaptureModule implements CameraModule, PhotoController, boolean noNeedEndOfStreamInHFR = mHighSpeedCapture && ((int)mHighSpeedFPSRange.getUpper() >= HIGH_SESSION_MAX_FPS); if (noNeedEndofStreamWhenPause || noNeedEndOfStreamInHFR) { - mMediaRecorder.pause(); + try{ + mMediaRecorder.pause(); + } catch (IllegalStateException e){ + e.printStackTrace(); + mMediaRecorderPausing = false; + } + } else { setEndOfStream(false, false); } -- cgit v1.2.3 From cb87d9529a0fcafbd5c86dc56ee88f212e8413a8 Mon Sep 17 00:00:00 2001 From: jiaoyuan Date: Fri, 15 Nov 2019 14:41:07 +0800 Subject: SnapdraongCamera: fix exception when onCaptureSequenceCompleted, surface is not ready, catch exception Change-Id: Ia58afe18210bdbebdaf372b52e6234652cd4db33 --- src/com/android/camera/CaptureModule.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/com/android/camera/CaptureModule.java b/src/com/android/camera/CaptureModule.java index d4db0b771..3ab3d926d 100755 --- a/src/com/android/camera/CaptureModule.java +++ b/src/com/android/camera/CaptureModule.java @@ -2938,7 +2938,7 @@ public class CaptureModule implements CameraModule, PhotoController, CaptureRequest.CONTROL_AF_MODE_OFF : afMode); mTakingPicture[id] = false; enableShutterAndVideoOnUiThread(id); - } catch (NullPointerException | IllegalStateException | CameraAccessException e) { + } catch (NullPointerException | IllegalStateException | CameraAccessException | IllegalArgumentException e) { Log.w(TAG, "Session is already closed"); } } -- cgit v1.2.3 From 67e42d72cb72fdf178a9bdda35cf7527f90871f4 Mon Sep 17 00:00:00 2001 From: xianming wang Date: Fri, 15 Nov 2019 16:34:34 +0800 Subject: SnapdragonCamera: Filter less 720P videoSize when EIS enable Filter less than 720P video quality when EIS enable. Change-Id: I9dbcccceb9e17927eb46afb3a6210621aaa8bb60 --- src/com/android/camera/SettingsActivity.java | 7 ++-- src/com/android/camera/SettingsManager.java | 48 +++++++++++++++++----------- 2 files changed, 33 insertions(+), 22 deletions(-) diff --git a/src/com/android/camera/SettingsActivity.java b/src/com/android/camera/SettingsActivity.java index 3fef92493..9001fd712 100755 --- a/src/com/android/camera/SettingsActivity.java +++ b/src/com/android/camera/SettingsActivity.java @@ -160,11 +160,12 @@ public class SettingsActivity extends PreferenceActivity { updateManualWBSettings(); } - if (pref.getKey().equals(SettingsManager.KEY_VIDEO_QUALITY) || - pref.getKey().equals(SettingsManager.KEY_DIS) || + if (pref.getKey().equals(SettingsManager.KEY_DIS) || pref.getKey().equals(SettingsManager.KEY_EIS_VALUE)) { - updatePreference(SettingsManager.KEY_VIDEO_ENCODER); + mSettingsManager.filterEISVideQualityOptions(); + updatePreference(SettingsManager.KEY_VIDEO_QUALITY); } + } } }; diff --git a/src/com/android/camera/SettingsManager.java b/src/com/android/camera/SettingsManager.java index 532eae8ec..8e554594a 100755 --- a/src/com/android/camera/SettingsManager.java +++ b/src/com/android/camera/SettingsManager.java @@ -1091,9 +1091,6 @@ public class SettingsManager implements ListMenu.SettingsListener { filterVideoEncoderProfileOptions(); } else if (pref.getKey().equals(KEY_PICTURE_FORMAT)) { filterHeifSizeOptions(); - } else if (pref.getKey().equals(KEY_DIS) || - pref.getKey().equals(KEY_EIS_VALUE)) { - filterVideoEncoderOptions(); } } @@ -1264,6 +1261,27 @@ public class SettingsManager implements ListMenu.SettingsListener { } } + private boolean getEISEnabled() { + boolean result = false; + ListPreference disPref = mPreferenceGroup.findPreference(KEY_DIS); + ListPreference eisPref = mPreferenceGroup.findPreference(KEY_EIS_VALUE); + if (disPref != null && eisPref != null) { + result = ("on".equals(disPref.getValue()) && + !("disable".equals(eisPref.getValue()))); + } + return result; + } + + public void filterEISVideQualityOptions() { + ListPreference videoQualityPref = mPreferenceGroup.findPreference(KEY_VIDEO_QUALITY); + if (videoQualityPref == null) return; + videoQualityPref.reloadInitialEntriesAndEntryValues(); + if (filterUnsupportedOptions(videoQualityPref, getSupportedVideoSize( + getCurrentCameraId()))) { + mFilteredKeys.add(videoQualityPref.getKey()); + } + } + private void filterChromaflashPictureSizeOptions() { String scene = getValue(SettingsManager.KEY_SCENE_MODE); ListPreference picturePref = mPreferenceGroup.findPreference(KEY_PICTURE_SIZE); @@ -1765,6 +1783,7 @@ public class SettingsManager implements ListMenu.SettingsListener { StreamConfigurationMap map = mCharacteristics.get(cameraId).get( CameraCharacteristics.SCALER_STREAM_CONFIGURATION_MAP); Size[] sizes = map.getOutputSizes(MediaRecorder.class); + boolean eisEnabled = getEISEnabled(); boolean isHeifEnabled = getSavePictureFormat() == HEIF_FORMAT; VideoCapabilities heifCap = null; if (isHeifEnabled) { @@ -1786,6 +1805,13 @@ public class SettingsManager implements ListMenu.SettingsListener { continue; } } + if (eisEnabled) { + // eis didn`t support less than 720P + if (Math.min(sizes[i].getWidth(),sizes[i].getHeight()) < 720 || + Math.max(sizes[i].getWidth(),sizes[i].getHeight()) < 1280) { + continue; + } + } if (CameraSettings.VIDEO_QUALITY_TABLE.containsKey(sizes[i].toString())) { Integer profile = CameraSettings.VIDEO_QUALITY_TABLE.get(sizes[i].toString()); if (profile != null) { @@ -1988,22 +2014,6 @@ public class SettingsManager implements ListMenu.SettingsListener { } } - ListPreference videoQuality = mPreferenceGroup.findPreference(KEY_VIDEO_QUALITY); - String videoSize = videoQuality.getValue(); - int indexX = videoSize.indexOf('x'); - int width = Integer.parseInt(videoSize.substring(0, indexX)); - int height = Integer.parseInt(videoSize.substring(indexX + 1)); - // Video quality less than 720P - boolean isLess720P = width < 1280 && height < 720; - - ListPreference disPref = mPreferenceGroup.findPreference(KEY_DIS); - ListPreference eisPref = mPreferenceGroup.findPreference(KEY_EIS_VALUE); - if (isLess720P && - "on".equals(disPref.getValue()) && - !("disable".equals(eisPref.getValue()))) { - supported.remove("mpeg-4-sp"); - } - return supported; } -- cgit v1.2.3 From b1d05447afc30d1683980b42ae23aa2234e2b374 Mon Sep 17 00:00:00 2001 From: jiaoyuan Date: Tue, 19 Nov 2019 09:22:26 +0800 Subject: SnapdraongCamera: hide flash icon Flash icon should be hidden when SW MFNR enabled. Change-Id: I6dee92825d1b069f364a325457cf82ed9f649a68 --- src/com/android/camera/ui/FlashToggleButton.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/com/android/camera/ui/FlashToggleButton.java b/src/com/android/camera/ui/FlashToggleButton.java index fca76b7a1..abeedef21 100755 --- a/src/com/android/camera/ui/FlashToggleButton.java +++ b/src/com/android/camera/ui/FlashToggleButton.java @@ -72,6 +72,11 @@ public class FlashToggleButton extends RotateImageView { R.string.pref_camera_manual_exp_value_user_setting); String manualExposureMode = mSettingsManager.getValue(SettingsManager.KEY_MANUAL_EXPOSURE); String scene = mSettingsManager.getValue(SettingsManager.KEY_SCENE_MODE); + boolean mfnrEnable = false; + String mfnrValue = mSettingsManager.getValue(SettingsManager.KEY_CAPTURE_MFNR_VALUE); + if (mfnrValue != null) { + mfnrEnable = mfnrValue.equals("1"); + } boolean promode = false; if (scene != null) { int mode = Integer.parseInt(scene); @@ -80,7 +85,7 @@ public class FlashToggleButton extends RotateImageView { } } if (mIndex == -1 || (redeye != null && redeye.equals("on")) || - manualExposureMode.equals(userSetting) || promode) { + manualExposureMode.equals(userSetting) || promode || mfnrEnable) { setVisibility(GONE); return; } else { -- cgit v1.2.3 From 077ef297c8c8b379b2e8164afc2dd766e5659131 Mon Sep 17 00:00:00 2001 From: xianming wang Date: Wed, 20 Nov 2019 15:26:39 +0800 Subject: SnapdragonCamera: Add TextView for fix UI blured Add TextView for fix UI blured. CRs-Fixed: 2557406 Change-Id: I398d64129038367826569d615dac8df7c3ee6e1c --- res/layout/capture_module.xml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/res/layout/capture_module.xml b/res/layout/capture_module.xml index afc199547..2319b97c5 100755 --- a/res/layout/capture_module.xml +++ b/res/layout/capture_module.xml @@ -166,6 +166,19 @@ android:layout_width="match_parent" android:layout_height="match_parent" /> + Date: Thu, 21 Nov 2019 17:28:52 +0800 Subject: SnapdraongCamera:Add shutter logs Add logs for shutter button when click and release to indicate shot to shot latency Change-Id: Ie16c6341b396243164c03ecdf6f60a25023f5bef CRs-Fixed: 2515200 --- src/com/android/camera/CaptureModule.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/com/android/camera/CaptureModule.java b/src/com/android/camera/CaptureModule.java index d4db0b771..af96bfaea 100755 --- a/src/com/android/camera/CaptureModule.java +++ b/src/com/android/camera/CaptureModule.java @@ -2501,6 +2501,7 @@ public class CaptureModule implements CameraModule, PhotoController, } else { enableShutterAndVideoOnUiThread(id); } + Log.d(TAG,"onShutterButtonRelease"); if (mSettingsManager.getSavePictureFormat() == SettingsManager.HEIF_FORMAT) { if (mHeifImage != null) { try { @@ -5702,6 +5703,7 @@ public class CaptureModule implements CameraModule, PhotoController, + mActivity.getStorageSpaceBytes()); return; } + Log.d(TAG,"onShutterButtonClick"); if (mIsRecordingVideo) { if (mUI.isShutterEnabled()) { -- cgit v1.2.3 From 248f1bb18464895ccdb072f30d33172aef43473e Mon Sep 17 00:00:00 2001 From: jinwu Date: Fri, 22 Nov 2019 14:21:10 +0800 Subject: Update version number to 2.02.036 Change-Id: Ic07be9d88284b0c9e6a45c2f49c03eec158190ac --- version.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.mk b/version.mk index 548001eaf..7ec39db9f 100755 --- a/version.mk +++ b/version.mk @@ -40,7 +40,7 @@ # base_version_build is 3 digits and auto-increment for fixing CR. base_version_major := 2 base_version_minor := 02 -base_version_build := 035 +base_version_build := 036 ##################################################### ##################################################### -- cgit v1.2.3 From 55bd73452687a0153240af4e7e02cf4fec6fd86e Mon Sep 17 00:00:00 2001 From: jiaoyuan Date: Tue, 3 Sep 2019 13:03:36 +0800 Subject: SnapdraongCamera: hide AEB after restore hide AEB after restore Change-Id: I5f9b6222e2f14eab7a41da04f90bb1f5b87faabe --- src/com/android/camera/CaptureModule.java | 2 ++ src/com/android/camera/SettingsActivity.java | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/com/android/camera/CaptureModule.java b/src/com/android/camera/CaptureModule.java index d4db0b771..1edbb70e2 100755 --- a/src/com/android/camera/CaptureModule.java +++ b/src/com/android/camera/CaptureModule.java @@ -833,6 +833,8 @@ public class CaptureModule implements CameraModule, PhotoController, SettingsManager.KEY_STATS_VISUALIZER_VALUE); if (stats_visualizer != null) { updateStatsView(stats_visualizer,result); + } else { + mUI.updateAWBInfoVisibility(View.GONE); } } }; diff --git a/src/com/android/camera/SettingsActivity.java b/src/com/android/camera/SettingsActivity.java index 3fef92493..0658248c8 100755 --- a/src/com/android/camera/SettingsActivity.java +++ b/src/com/android/camera/SettingsActivity.java @@ -804,14 +804,14 @@ public class SettingsActivity extends PreferenceActivity { pref.setEntries(mSettingsManager.getEntries(key)); pref.setEntryValues(mSettingsManager.getEntryValues(key)); String values = mSettingsManager.getValue(key); + Set valueSet = new HashSet(); if (values != null) { - Set valueSet = new HashSet(); String[] splitValues = values.split(";"); for (String str : splitValues) { valueSet.add(str); } - pref.setValues(valueSet); } + pref.setValues(valueSet); } } } -- cgit v1.2.3 From 4a47aa1b2e601913a4ec97838ec64c445fec4872 Mon Sep 17 00:00:00 2001 From: jinwu Date: Thu, 28 Nov 2019 15:54:16 +0800 Subject: Fix issue of updating Flash in HFR It doesn't allow to change requests batch in high speed session, so when update flash mode in HFR, it should still send preview and video requests together. Change-Id: Id4092acca15e2bf465f1ebd632f2fa4799567594 --- src/com/android/camera/CaptureModule.java | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/com/android/camera/CaptureModule.java b/src/com/android/camera/CaptureModule.java index d4db0b771..6d85ca3c9 100755 --- a/src/com/android/camera/CaptureModule.java +++ b/src/com/android/camera/CaptureModule.java @@ -5042,17 +5042,16 @@ public class CaptureModule implements CameraModule, PhotoController, applyVideoFlash(mVideoPausePreviewRequestBuilder); CaptureRequest captureRequest = null; try { - if (mMediaRecorderPausing) { - captureRequest = mVideoPausePreviewRequestBuilder.build(); - } else { - captureRequest = mVideoRequestBuilder.build(); - } + captureRequest = mVideoRequestBuilder.build(); if (mCurrentSession instanceof CameraConstrainedHighSpeedCaptureSession) { CameraConstrainedHighSpeedCaptureSession session = (CameraConstrainedHighSpeedCaptureSession) mCurrentSession; List requestList = session.createHighSpeedRequestList(captureRequest); session.setRepeatingBurst(requestList, mCaptureCallback, mCameraHandler); } else { + if (mMediaRecorderPausing) { + captureRequest = mVideoPausePreviewRequestBuilder.build(); + } mCurrentSession.setRepeatingRequest(captureRequest, mCaptureCallback, mCameraHandler); } -- cgit v1.2.3 From d588e497f536471d0957ebea350f3c3228ff386f Mon Sep 17 00:00:00 2001 From: xianming wang Date: Wed, 27 Nov 2019 16:51:28 +0800 Subject: SnapdragonCamera: Fix NP on monkey case Fix NP on monkey case. Change-Id: Ia7e7a5bc5edab31adaf5e35668d12e77a4890257 --- src/com/android/camera/SettingsActivity.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/com/android/camera/SettingsActivity.java b/src/com/android/camera/SettingsActivity.java index 8d7d4887a..dc7ddd6ae 100755 --- a/src/com/android/camera/SettingsActivity.java +++ b/src/com/android/camera/SettingsActivity.java @@ -128,7 +128,10 @@ public class SettingsActivity extends PreferenceActivity { Map map = mSettingsManager.getValuesMap(); for( SettingsManager.SettingState state : settings) { SettingsManager.Values values = map.get(state.key); - boolean enabled = values.overriddenValue == null; + boolean enabled = false; + if (values != null) { + enabled = values.overriddenValue == null; + } Preference pref = findPreference(state.key); if ( pref == null ) return; -- cgit v1.2.3 From 078d6224f3b514846fc94ddbf6c3d29779f58f4e Mon Sep 17 00:00:00 2001 From: jiaoyuan Date: Mon, 2 Dec 2019 16:01:30 +0800 Subject: SnapdraongCamera: disable color filter when enable mfnr Color filter menu shoud be disabled when enable MFNR in front camera Change-Id: I41689623f5221a14938deb5e65f55e91ae41bdc2 --- src/com/android/camera/CaptureModule.java | 2 +- src/com/android/camera/CaptureUI.java | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/com/android/camera/CaptureModule.java b/src/com/android/camera/CaptureModule.java index 93b6c6acf..c8e644bd5 100755 --- a/src/com/android/camera/CaptureModule.java +++ b/src/com/android/camera/CaptureModule.java @@ -2981,7 +2981,7 @@ public class CaptureModule implements CameraModule, PhotoController, } } - private boolean isMFNREnabled() { + public boolean isMFNREnabled() { boolean mfnrEnable = false; if (mSettingsManager != null) { String mfnrValue = mSettingsManager.getValue(SettingsManager.KEY_CAPTURE_MFNR_VALUE); diff --git a/src/com/android/camera/CaptureUI.java b/src/com/android/camera/CaptureUI.java index dcfd74b6e..fc6ebe3ac 100755 --- a/src/com/android/camera/CaptureUI.java +++ b/src/com/android/camera/CaptureUI.java @@ -689,6 +689,9 @@ public class CaptureUI implements FocusOverlayManager.FocusUI, mSurfaceViewMono.setVisibility(View.GONE); } } + if(mModule.isMFNREnabled() && mModule.getMainCameraId() == android.hardware.Camera.CameraInfo.CAMERA_FACING_FRONT){ + mFilterModeSwitcher.setVisibility(View.INVISIBLE); + } } public void initializeProMode(boolean promode) { -- cgit v1.2.3 From c8682df75dd458e48ad020b766c73695c064c536 Mon Sep 17 00:00:00 2001 From: jinwu Date: Mon, 23 Dec 2019 14:12:32 +0800 Subject: Update version number to 2.02.037 Change-Id: Iffbbb899a4a57433c26f23664042f96c152f7c4e --- version.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.mk b/version.mk index 7ec39db9f..72d4ffb46 100755 --- a/version.mk +++ b/version.mk @@ -40,7 +40,7 @@ # base_version_build is 3 digits and auto-increment for fixing CR. base_version_major := 2 base_version_minor := 02 -base_version_build := 036 +base_version_build := 037 ##################################################### ##################################################### -- cgit v1.2.3 From 8c02c3f8d06dfd2babbfa4759855e9afb948e4a9 Mon Sep 17 00:00:00 2001 From: junjiez Date: Tue, 17 Dec 2019 14:58:38 +0800 Subject: SnapdraongCamera:Support GTS intent Get extra parameter from GTS intent to check if need to open front camera. Change-Id: I5803e2460f195524cbf139842f6e433e0a7321b4 CRs-Fixed: 2581193 --- src/com/android/camera/CaptureModule.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/com/android/camera/CaptureModule.java b/src/com/android/camera/CaptureModule.java index d8a5b75b5..a1c40aff5 100755 --- a/src/com/android/camera/CaptureModule.java +++ b/src/com/android/camera/CaptureModule.java @@ -1876,7 +1876,8 @@ public class CaptureModule implements CameraModule, PhotoController, if (myExtras != null) { mSaveUri = (Uri) myExtras.getParcelable(MediaStore.EXTRA_OUTPUT); mCropValue = myExtras.getString("crop"); - mUseFrontCamera = myExtras.getBoolean("android.intent.extra.USE_FRONT_CAMERA", false); + mUseFrontCamera = myExtras.getBoolean("android.intent.extra.USE_FRONT_CAMERA", false) || + myExtras.getBoolean("com.google.assistant.extra.USE_FRONT_CAMERA", false); mTimer = myExtras.getInt("android.intent.extra.TIMER_DURATION_SECONDS", 0); Log.d(TAG, "mUseFrontCamera :" + mUseFrontCamera + ", mTimer :" + mTimer); } -- cgit v1.2.3 From 9eb910a9138fffa1adf79c658a2d2a8add5485e8 Mon Sep 17 00:00:00 2001 From: junjiez Date: Wed, 11 Dec 2019 13:59:34 +0800 Subject: SnapdraongCamera:Allow voice launch Add android.intent.category.VOICE in the mainifest Change-Id: I061e8587b93db579ccde2006664fb274b12742a8 CRs-Fixed: 2581193 --- AndroidManifest.xml | 4 ++++ 1 file changed, 4 insertions(+) mode change 100644 => 100755 AndroidManifest.xml diff --git a/AndroidManifest.xml b/AndroidManifest.xml old mode 100644 new mode 100755 index c4441c81f..ef5d886f4 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -76,21 +76,25 @@ + + + + Date: Wed, 11 Dec 2019 13:59:34 +0800 Subject: SnapdraongCamera:Allow voice launch Add android.intent.category.VOICE in the mainifest Change-Id: Id4201c468a69529a26f9c819de5f27bfacec045e CRs-Fixed: 2581193 --- AndroidManifest.xml | 4 ++++ 1 file changed, 4 insertions(+) mode change 100644 => 100755 AndroidManifest.xml diff --git a/AndroidManifest.xml b/AndroidManifest.xml old mode 100644 new mode 100755 index c4441c81f..ef5d886f4 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -76,21 +76,25 @@ + + + + Date: Tue, 17 Dec 2019 14:58:38 +0800 Subject: SnapdraongCamera:Support GTS intent Get extra parameter from GTS intent to check if need to open front camera. Change-Id: Ide3d004ceb3626a246a45f9ec18db454628a6542 CRs-Fixed: 2581193 --- src/com/android/camera/CaptureModule.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/com/android/camera/CaptureModule.java b/src/com/android/camera/CaptureModule.java index d8a5b75b5..a1c40aff5 100755 --- a/src/com/android/camera/CaptureModule.java +++ b/src/com/android/camera/CaptureModule.java @@ -1876,7 +1876,8 @@ public class CaptureModule implements CameraModule, PhotoController, if (myExtras != null) { mSaveUri = (Uri) myExtras.getParcelable(MediaStore.EXTRA_OUTPUT); mCropValue = myExtras.getString("crop"); - mUseFrontCamera = myExtras.getBoolean("android.intent.extra.USE_FRONT_CAMERA", false); + mUseFrontCamera = myExtras.getBoolean("android.intent.extra.USE_FRONT_CAMERA", false) || + myExtras.getBoolean("com.google.assistant.extra.USE_FRONT_CAMERA", false); mTimer = myExtras.getInt("android.intent.extra.TIMER_DURATION_SECONDS", 0); Log.d(TAG, "mUseFrontCamera :" + mUseFrontCamera + ", mTimer :" + mTimer); } -- cgit v1.2.3 From dd0d24cc8b9148274eb942561ffaa18664530f8e Mon Sep 17 00:00:00 2001 From: xianming wang Date: Wed, 27 Nov 2019 14:48:03 +0800 Subject: SnapdragonCamera: Enable CAF function when HDR mode is ON. Enable CAF function when HDR mode is ON. Change-Id: I8a75c9b6fd5392d2385f40fccc7eae05a23a75d5 --- src/com/android/camera/CaptureModule.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/com/android/camera/CaptureModule.java b/src/com/android/camera/CaptureModule.java index a1c40aff5..24f103529 100755 --- a/src/com/android/camera/CaptureModule.java +++ b/src/com/android/camera/CaptureModule.java @@ -4001,7 +4001,8 @@ public class CaptureModule implements CameraModule, PhotoController, if (scene == null) return false; int mode = Integer.parseInt(scene); if (mode != CaptureRequest.CONTROL_SCENE_MODE_DISABLED - && mode < SettingsManager.SCENE_MODE_CUSTOM_START) + && mode < SettingsManager.SCENE_MODE_CUSTOM_START + && mode != SettingsManager.SCENE_MODE_HDR_INT) return true; return false; } -- cgit v1.2.3 From 7dafc0bea65f88b9f9ba707a317b371df53d32af Mon Sep 17 00:00:00 2001 From: jiaoyuan Date: Fri, 6 Sep 2019 09:30:01 +0800 Subject: SnapdraongCamera: cct mode wb is error when cct mode, should set CONTROL_AWB_MODE_OFF to CONTROL_AWB_MODE, then the wb will show Manual. Change-Id: Idb37e11f140181683ea72b58af50c31edb9abae2 --- src/com/android/camera/CaptureModule.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/com/android/camera/CaptureModule.java b/src/com/android/camera/CaptureModule.java index 24f103529..bd998493e 100755 --- a/src/com/android/camera/CaptureModule.java +++ b/src/com/android/camera/CaptureModule.java @@ -6088,6 +6088,7 @@ public class CaptureModule implements CameraModule, PhotoController, int colorTempValue = Integer.parseInt(pref.getString( SettingsManager.KEY_MANUAL_WB_TEMPERATURE_VALUE, "-1")); if (colorTempValue != -1) { + request.set(CaptureRequest.CONTROL_AWB_MODE, CaptureRequest.CONTROL_AWB_MODE_OFF); VendorTagUtil.setWbColorTemperatureValue(request, colorTempValue); } } else if (manualWBMode.equals(gainMode)) { -- cgit v1.2.3