From 9c76a779e7405d1670092ffae29ccbf8047c30c7 Mon Sep 17 00:00:00 2001 From: Jay Wang Date: Wed, 27 Jan 2016 16:47:50 -0800 Subject: Gallery2: enable beautification by default Enable beautification by default Change-Id: I0feab1b033aa5f575decbb52cd3956dbf4f2cc38 CRs-Fixed: 964264 --- Android.mk | 4 +--- .../android/gallery3d/filtershow/filters/SimpleMakeupImageFilter.java | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/Android.mk b/Android.mk index a0b12baa6..0363a5116 100644 --- a/Android.mk +++ b/Android.mk @@ -48,9 +48,7 @@ LOCAL_PROGUARD_ENABLED := disabled LOCAL_JNI_SHARED_LIBRARIES := libjni_eglfence libjni_filtershow_filters libjni_jpegstream LOCAL_SHARED_LIBRARIES += libjni_dualcamera -ifeq ($(TARGET_TS_MAKEUP), true) - LOCAL_REQUIRED_MODULES := libts_detected_face_jni libts_face_beautify_jni -endif +LOCAL_REQUIRED_MODULES := libts_detected_face_jni libts_face_beautify_jni LOCAL_PROGUARD_FLAG_FILES := proguard.flags diff --git a/src/com/android/gallery3d/filtershow/filters/SimpleMakeupImageFilter.java b/src/com/android/gallery3d/filtershow/filters/SimpleMakeupImageFilter.java index 584074c02..c8a05ae38 100644 --- a/src/com/android/gallery3d/filtershow/filters/SimpleMakeupImageFilter.java +++ b/src/com/android/gallery3d/filtershow/filters/SimpleMakeupImageFilter.java @@ -27,7 +27,7 @@ public abstract class SimpleMakeupImageFilter extends SimpleImageFilter { private static final String LOGTAG = "SimpleMakeupImageFilter"; protected static final int MAKEUP_INTENSITY = 50; - public static final boolean HAS_TS_MAKEUP = android.os.SystemProperties.getBoolean("persist.ts.postmakeup", false); + public static final boolean HAS_TS_MAKEUP = android.os.SystemProperties.getBoolean("persist.ts.postmakeup", true); public SimpleMakeupImageFilter() { } -- cgit v1.2.3