diff options
author | John Hoford <hoford@google.com> | 2013-04-19 01:41:44 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-04-19 01:41:44 +0000 |
commit | d81bba2275dc393278239aa1d5617d3d6a7bfe2a (patch) | |
tree | dc879babbcee83f5da487b992b648b3f09c214f5 /src/com/android/gallery3d/filtershow/filters | |
parent | 0c65f5f024b62c67293073afff3543d72a84a5d0 (diff) | |
parent | 1ffe73e1e757b3c658f24c151358bfb4163460ba (diff) | |
download | android_packages_apps_Snap-d81bba2275dc393278239aa1d5617d3d6a7bfe2a.tar.gz android_packages_apps_Snap-d81bba2275dc393278239aa1d5617d3d6a7bfe2a.tar.bz2 android_packages_apps_Snap-d81bba2275dc393278239aa1d5617d3d6a7bfe2a.zip |
Merge "fixed borders issues" into gb-ub-photos-bryce
Diffstat (limited to 'src/com/android/gallery3d/filtershow/filters')
-rw-r--r-- | src/com/android/gallery3d/filtershow/filters/BaseFiltersManager.java | 39 |
1 files changed, 35 insertions, 4 deletions
diff --git a/src/com/android/gallery3d/filtershow/filters/BaseFiltersManager.java b/src/com/android/gallery3d/filtershow/filters/BaseFiltersManager.java index 21bdf8dd9..ec9a4368c 100644 --- a/src/com/android/gallery3d/filtershow/filters/BaseFiltersManager.java +++ b/src/com/android/gallery3d/filtershow/filters/BaseFiltersManager.java @@ -15,7 +15,10 @@ */ package com.android.gallery3d.filtershow.filters; +import android.content.Context; import android.content.res.Resources; + +import com.android.gallery3d.R; import com.android.gallery3d.filtershow.presets.ImagePreset; import java.util.HashMap; @@ -109,12 +112,40 @@ public abstract class BaseFiltersManager { filters.add(ImageFilterGeometry.class); } - public void addBorders(Vector<FilterRepresentation> representations) { - // Override + public void addBorders(Context context, Vector<FilterRepresentation> representations) { + } - public void addLooks(Vector<FilterRepresentation> representations) { - // Override + public void addLooks(Context context, Vector<FilterRepresentation> representations) { + int[] drawid = { + R.drawable.filtershow_fx_0005_punch, + R.drawable.filtershow_fx_0000_vintage, + R.drawable.filtershow_fx_0004_bw_contrast, + R.drawable.filtershow_fx_0002_bleach, + R.drawable.filtershow_fx_0001_instant, + R.drawable.filtershow_fx_0007_washout, + R.drawable.filtershow_fx_0003_blue_crush, + R.drawable.filtershow_fx_0008_washout_color, + R.drawable.filtershow_fx_0006_x_process + }; + + int[] fxNameid = { + R.string.ffx_punch, + R.string.ffx_vintage, + R.string.ffx_bw_contrast, + R.string.ffx_bleach, + R.string.ffx_instant, + R.string.ffx_washout, + R.string.ffx_blue_crush, + R.string.ffx_washout_color, + R.string.ffx_x_process + }; + + for (int i = 0; i < drawid.length; i++) { + FilterFxRepresentation fx = new FilterFxRepresentation( + context.getString(fxNameid[i]), drawid[i], fxNameid[i]); + representations.add(fx); + } } public void addEffects(Vector<FilterRepresentation> representations) { |