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