summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjiaoyuan <jiaoyuan@codeaurora.org>2019-12-02 16:01:30 +0800
committerjiaoyuan <jiaoyuan@codeaurora.org>2019-12-02 16:01:53 +0800
commit078d6224f3b514846fc94ddbf6c3d29779f58f4e (patch)
treed81b176bba6609a193b8fc2aa1fd3bc064617a17
parentffec76b20605e741a922960b28e772bd3cc8cfa0 (diff)
downloadandroid_packages_apps_Snap-078d6224f3b514846fc94ddbf6c3d29779f58f4e.zip
android_packages_apps_Snap-078d6224f3b514846fc94ddbf6c3d29779f58f4e.tar.gz
android_packages_apps_Snap-078d6224f3b514846fc94ddbf6c3d29779f58f4e.tar.bz2
SnapdraongCamera: disable color filter when enable mfnr
Color filter menu shoud be disabled when enable MFNR in front camera Change-Id: I41689623f5221a14938deb5e65f55e91ae41bdc2
-rwxr-xr-xsrc/com/android/camera/CaptureModule.java2
-rwxr-xr-xsrc/com/android/camera/CaptureUI.java3
2 files changed, 4 insertions, 1 deletions
diff --git a/src/com/android/camera/CaptureModule.java b/src/com/android/camera/CaptureModule.java
index 93b6c6a..c8e644b 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 dcfd74b..fc6ebe3 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) {