diff options
| author | Zhang Zhenzhen <zhangzz6687@thundersoft.com> | 2015-03-10 16:40:13 +0800 |
|---|---|---|
| committer | Jay Wang <jaywang@codeaurora.org> | 2015-03-18 22:18:11 -0700 |
| commit | 38478f2cfc651b58dd88274c9a3bb7526c91116b (patch) | |
| tree | 2d38112715d53f79e75015ebd985f283affe99f5 /src/com/android/gallery3d/filtershow/pipeline | |
| parent | d51734fb007055835d706170650aa6765ac32899 (diff) | |
| download | android_packages_apps_Gallery2-38478f2cfc651b58dd88274c9a3bb7526c91116b.tar.gz android_packages_apps_Gallery2-38478f2cfc651b58dd88274c9a3bb7526c91116b.tar.bz2 android_packages_apps_Gallery2-38478f2cfc651b58dd88274c9a3bb7526c91116b.zip | |
Modify:Gallery2 for branch Gallery2
Conflicts:
res/values-zh-rCN/strings.xml
res/values/strings.xml
Change-Id: I6b760469290ca154f223f94a3c284fca7a513121
Diffstat (limited to 'src/com/android/gallery3d/filtershow/pipeline')
| -rw-r--r-- | src/com/android/gallery3d/filtershow/pipeline/ProcessingService.java | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/com/android/gallery3d/filtershow/pipeline/ProcessingService.java b/src/com/android/gallery3d/filtershow/pipeline/ProcessingService.java index e5736d43c..e334e8798 100644 --- a/src/com/android/gallery3d/filtershow/pipeline/ProcessingService.java +++ b/src/com/android/gallery3d/filtershow/pipeline/ProcessingService.java @@ -304,12 +304,14 @@ public class ProcessingService extends Service { filtersManager.addBorders(this); filtersManager.addTools(this); filtersManager.addEffects(); + filtersManager.addMakeups(this); FiltersManager highresFiltersManager = FiltersManager.getHighresManager(); highresFiltersManager.addLooks(this); highresFiltersManager.addBorders(this); highresFiltersManager.addTools(this); highresFiltersManager.addEffects(); +// highresFiltersManager.addMakeups(this); } private void tearDownPipeline() { |