summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorjinwu <jinwu@codeaurora.org>2018-09-21 18:26:26 +0800
committerjinwu <jinwu@codeaurora.org>2018-09-21 18:26:26 +0800
commitd72fd5c7297c196984f3b835d75a23e4d2c8d008 (patch)
tree8b96fd000747f0847b0048149c9cfcd882026498 /src
parenta26301351c28e820f6c2346ebd07265cfed14c8b (diff)
downloadandroid_packages_apps_Snap-d72fd5c7297c196984f3b835d75a23e4d2c8d008.tar.gz
android_packages_apps_Snap-d72fd5c7297c196984f3b835d75a23e4d2c8d008.tar.bz2
android_packages_apps_Snap-d72fd5c7297c196984f3b835d75a23e4d2c8d008.zip
Disable beauty if no jni file
disable makeup icon if no jni_makeupV2.cpp Change-Id: Iaf92e5749b39173706b770080ecb0d048390102b CRs-Fixed: 2305148
Diffstat (limited to 'src')
-rwxr-xr-xsrc/com/android/camera/CaptureUI.java5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/com/android/camera/CaptureUI.java b/src/com/android/camera/CaptureUI.java
index ccb45e12d..0b738365c 100755
--- a/src/com/android/camera/CaptureUI.java
+++ b/src/com/android/camera/CaptureUI.java
@@ -67,6 +67,7 @@ import android.widget.RelativeLayout;
import android.widget.SeekBar;
import android.widget.TextView;
+import com.android.camera.imageprocessor.filter.BeautificationFilter;
import com.android.camera.imageprocessor.filter.DeepPortraitFilter;
import com.android.camera.ui.AutoFitSurfaceView;
import com.android.camera.ui.Camera2FaceView;
@@ -1361,7 +1362,9 @@ public class CaptureUI implements FocusOverlayManager.FocusUI,
enableMakeupMenu = false;
enableFilterMenu = false;
}
-
+ if(!BeautificationFilter.isSupportedStatic()) {
+ enableMakeupMenu = false;
+ }
mMakeupButton.setEnabled(enableMakeupMenu);
mFilterModeSwitcher.setEnabled(enableFilterMenu);
mSceneModeSwitcher.setEnabled(enableSceneMenu);