diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2018-09-24 19:52:30 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2018-09-24 19:52:31 -0700 |
| commit | bb1d239944f9c684fb381444f5b694bcf326646a (patch) | |
| tree | af95a108371f00a3eb9c03bc77606841b90f9ad7 | |
| parent | 9f4c5fa739df79b665a35f5eb68e5e57079f0729 (diff) | |
| parent | d72fd5c7297c196984f3b835d75a23e4d2c8d008 (diff) | |
| download | android_packages_apps_Snap-bb1d239944f9c684fb381444f5b694bcf326646a.tar.gz android_packages_apps_Snap-bb1d239944f9c684fb381444f5b694bcf326646a.tar.bz2 android_packages_apps_Snap-bb1d239944f9c684fb381444f5b694bcf326646a.zip | |
Merge "Disable beauty if no jni file" into camera-SnapdragonCamera.lnx.2.0
| -rwxr-xr-x | src/com/android/camera/CaptureUI.java | 5 |
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); |