diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2015-03-19 14:21:17 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2015-03-19 14:21:17 -0700 |
| commit | 670d9b82ab300786cf24c6893f83b406e875ed5a (patch) | |
| tree | c2e299e8e7aadf45728eaf4b886c039864f5c02c | |
| parent | 7e7035eaf5d8d8a72f5f61f05beb79b842e4f358 (diff) | |
| parent | 692eabb9f888c384bb8520dfb9f5b3fe3ba02e24 (diff) | |
| download | android_packages_apps_Gallery2-670d9b82ab300786cf24c6893f83b406e875ed5a.tar.gz android_packages_apps_Gallery2-670d9b82ab300786cf24c6893f83b406e875ed5a.tar.bz2 android_packages_apps_Gallery2-670d9b82ab300786cf24c6893f83b406e875ed5a.zip | |
Merge "Gallery2: Move files to the correct location"
| -rwxr-xr-x | Android.mk | 6 | ||||
| -rw-r--r-- | src/com/android/gallery3d/filtershow/editors/EditorMakeup.java (renamed from Gallery2/src/com/android/gallery3d/filtershow/editors/EditorMakeup.java) | 0 | ||||
| -rw-r--r-- | src/com/android/gallery3d/filtershow/filters/ImageFilterMakeupBigeye.java (renamed from Gallery2/src/com/android/gallery3d/filtershow/filters/ImageFilterMakeupBigeye.java) | 0 | ||||
| -rw-r--r-- | src/com/android/gallery3d/filtershow/filters/ImageFilterMakeupSoften.java (renamed from Gallery2/src/com/android/gallery3d/filtershow/filters/ImageFilterMakeupSoften.java) | 0 | ||||
| -rw-r--r-- | src/com/android/gallery3d/filtershow/filters/ImageFilterMakeupTrimface.java (renamed from Gallery2/src/com/android/gallery3d/filtershow/filters/ImageFilterMakeupTrimface.java) | 0 | ||||
| -rw-r--r-- | src/com/android/gallery3d/filtershow/filters/ImageFilterMakeupWhiten.java (renamed from Gallery2/src/com/android/gallery3d/filtershow/filters/ImageFilterMakeupWhiten.java) | 0 | ||||
| -rw-r--r-- | src/com/android/gallery3d/filtershow/filters/SimpleMakeupImageFilter.java (renamed from Gallery2/src/com/android/gallery3d/filtershow/filters/SimpleMakeupImageFilter.java) | 0 | ||||
| -rw-r--r-- | src/com/thundersoft/hz/selfportrait/detect/FaceDetect.java (renamed from Gallery2/src/com/thundersoft/hz/selfportrait/detect/FaceDetect.java) | 0 | ||||
| -rw-r--r-- | src/com/thundersoft/hz/selfportrait/detect/FaceInfo.java (renamed from Gallery2/src/com/thundersoft/hz/selfportrait/detect/FaceInfo.java) | 0 | ||||
| -rw-r--r-- | src/com/thundersoft/hz/selfportrait/makeup/engine/MakeupEngine.java (renamed from Gallery2/src/com/thundersoft/hz/selfportrait/makeup/engine/MakeupEngine.java) | 0 |
10 files changed, 0 insertions, 6 deletions
diff --git a/Android.mk b/Android.mk index 661dac6ae..f515ac03f 100755 --- a/Android.mk +++ b/Android.mk @@ -52,12 +52,6 @@ include $(BUILD_PACKAGE) ifeq ($(strip $(LOCAL_PACKAGE_OVERRIDES)),) -ifeq ($(TARGET_TS_MAKEUP), true) -include $(CLEAR_VARS) - LOCAL_PREBUILT_LIBS := jni_makeup_libs/libts_detected_face_jni.so jni_makeup_libs/libts_face_beautify_jni.so -include $(BUILD_MULTI_PREBUILT) -endif - # Use the following include to make gallery test apk include $(call all-makefiles-under, $(LOCAL_PATH)) diff --git a/Gallery2/src/com/android/gallery3d/filtershow/editors/EditorMakeup.java b/src/com/android/gallery3d/filtershow/editors/EditorMakeup.java index 331d31b57..331d31b57 100644 --- a/Gallery2/src/com/android/gallery3d/filtershow/editors/EditorMakeup.java +++ b/src/com/android/gallery3d/filtershow/editors/EditorMakeup.java diff --git a/Gallery2/src/com/android/gallery3d/filtershow/filters/ImageFilterMakeupBigeye.java b/src/com/android/gallery3d/filtershow/filters/ImageFilterMakeupBigeye.java index 64067881e..64067881e 100644 --- a/Gallery2/src/com/android/gallery3d/filtershow/filters/ImageFilterMakeupBigeye.java +++ b/src/com/android/gallery3d/filtershow/filters/ImageFilterMakeupBigeye.java diff --git a/Gallery2/src/com/android/gallery3d/filtershow/filters/ImageFilterMakeupSoften.java b/src/com/android/gallery3d/filtershow/filters/ImageFilterMakeupSoften.java index 8587158c3..8587158c3 100644 --- a/Gallery2/src/com/android/gallery3d/filtershow/filters/ImageFilterMakeupSoften.java +++ b/src/com/android/gallery3d/filtershow/filters/ImageFilterMakeupSoften.java diff --git a/Gallery2/src/com/android/gallery3d/filtershow/filters/ImageFilterMakeupTrimface.java b/src/com/android/gallery3d/filtershow/filters/ImageFilterMakeupTrimface.java index 4b0499036..4b0499036 100644 --- a/Gallery2/src/com/android/gallery3d/filtershow/filters/ImageFilterMakeupTrimface.java +++ b/src/com/android/gallery3d/filtershow/filters/ImageFilterMakeupTrimface.java diff --git a/Gallery2/src/com/android/gallery3d/filtershow/filters/ImageFilterMakeupWhiten.java b/src/com/android/gallery3d/filtershow/filters/ImageFilterMakeupWhiten.java index e60be84d7..e60be84d7 100644 --- a/Gallery2/src/com/android/gallery3d/filtershow/filters/ImageFilterMakeupWhiten.java +++ b/src/com/android/gallery3d/filtershow/filters/ImageFilterMakeupWhiten.java diff --git a/Gallery2/src/com/android/gallery3d/filtershow/filters/SimpleMakeupImageFilter.java b/src/com/android/gallery3d/filtershow/filters/SimpleMakeupImageFilter.java index 584074c02..584074c02 100644 --- a/Gallery2/src/com/android/gallery3d/filtershow/filters/SimpleMakeupImageFilter.java +++ b/src/com/android/gallery3d/filtershow/filters/SimpleMakeupImageFilter.java diff --git a/Gallery2/src/com/thundersoft/hz/selfportrait/detect/FaceDetect.java b/src/com/thundersoft/hz/selfportrait/detect/FaceDetect.java index a5c7fb043..a5c7fb043 100644 --- a/Gallery2/src/com/thundersoft/hz/selfportrait/detect/FaceDetect.java +++ b/src/com/thundersoft/hz/selfportrait/detect/FaceDetect.java diff --git a/Gallery2/src/com/thundersoft/hz/selfportrait/detect/FaceInfo.java b/src/com/thundersoft/hz/selfportrait/detect/FaceInfo.java index eee51f71b..eee51f71b 100644 --- a/Gallery2/src/com/thundersoft/hz/selfportrait/detect/FaceInfo.java +++ b/src/com/thundersoft/hz/selfportrait/detect/FaceInfo.java diff --git a/Gallery2/src/com/thundersoft/hz/selfportrait/makeup/engine/MakeupEngine.java b/src/com/thundersoft/hz/selfportrait/makeup/engine/MakeupEngine.java index 8d58bcfef..8d58bcfef 100644 --- a/Gallery2/src/com/thundersoft/hz/selfportrait/makeup/engine/MakeupEngine.java +++ b/src/com/thundersoft/hz/selfportrait/makeup/engine/MakeupEngine.java |