diff options
| author | Arne Coucheron <arco68@gmail.com> | 2016-11-01 06:07:40 +0100 |
|---|---|---|
| committer | Arne Coucheron <arco68@gmail.com> | 2017-03-10 07:19:32 +0100 |
| commit | b8b600e07b7ec4441a11826fdc8bf858d59ca8a6 (patch) | |
| tree | 2f4baba0a968a1707a64a5e2b8d2a96cc2338a1f | |
| parent | 9fa0473e5221928f97be471b8d699015183eee32 (diff) | |
| download | android_packages_apps_Gallery2-b8b600e07b7ec4441a11826fdc8bf858d59ca8a6.tar.gz android_packages_apps_Gallery2-b8b600e07b7ec4441a11826fdc8bf858d59ca8a6.tar.bz2 android_packages_apps_Gallery2-b8b600e07b7ec4441a11826fdc8bf858d59ca8a6.zip | |
Revert "Gallery2: enable beautification by default"
This reverts commit 9c76a779e7405d1670092ffae29ccbf8047c30c7.
Change-Id: If3abb0423d9a3c2300342d6b1ece34b6601a9c3f
| -rw-r--r-- | Android.mk | 4 | ||||
| -rw-r--r-- | src/com/android/gallery3d/filtershow/filters/SimpleMakeupImageFilter.java | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/Android.mk b/Android.mk index cf42b2f7c..b51be57fc 100644 --- a/Android.mk +++ b/Android.mk @@ -44,7 +44,9 @@ LOCAL_SDK_VERSION := current LOCAL_JNI_SHARED_LIBRARIES := libjni_gallery_eglfence libjni_gallery_filters libjni_gallery_jpegstream LOCAL_SHARED_LIBRARIES += libjni_dualcamera libjni_trueportrait -LOCAL_REQUIRED_MODULES := libts_detected_face_jni libts_face_beautify_jni +ifeq ($(TARGET_TS_MAKEUP), true) + LOCAL_REQUIRED_MODULES := libts_detected_face_jni libts_face_beautify_jni +endif 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 3a31b4bfa..6f639f3e7 100644 --- a/src/com/android/gallery3d/filtershow/filters/SimpleMakeupImageFilter.java +++ b/src/com/android/gallery3d/filtershow/filters/SimpleMakeupImageFilter.java @@ -28,7 +28,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 = SystemProperties.getBoolean("persist.ts.postmakeup", true); + public static final boolean HAS_TS_MAKEUP = SystemProperties.getBoolean("persist.ts.postmakeup", false); public SimpleMakeupImageFilter() { } |