diff options
author | John Hoford <hoford@google.com> | 2013-05-01 13:19:06 -0700 |
---|---|---|
committer | John Hoford <hoford@google.com> | 2013-05-01 13:19:06 -0700 |
commit | d16de2ee0d4abc6dc46b949f693b1a865344dfa3 (patch) | |
tree | 760425b4a30af0b510e0045d083200253f13ca7d /src/com/android/gallery3d/filtershow/filters | |
parent | 4f7fe16804568f9bcb189ab7916e403f8b1e2f90 (diff) | |
parent | b15919a1bccfcecd24c35001837626c73b0a4bdb (diff) | |
download | android_packages_apps_Snap-d16de2ee0d4abc6dc46b949f693b1a865344dfa3.tar.gz android_packages_apps_Snap-d16de2ee0d4abc6dc46b949f693b1a865344dfa3.tar.bz2 android_packages_apps_Snap-d16de2ee0d4abc6dc46b949f693b1a865344dfa3.zip |
resolved conflicts for merge of d6edcee3 to gb-ub-photos-carlsbad
Change-Id: I24057e85ca5b0409e9bcb92c85577fb9a763fbe4
Diffstat (limited to 'src/com/android/gallery3d/filtershow/filters')
3 files changed, 4 insertions, 3 deletions
diff --git a/src/com/android/gallery3d/filtershow/filters/BaseFiltersManager.java b/src/com/android/gallery3d/filtershow/filters/BaseFiltersManager.java index 1c7294c3a..42edbbbe9 100644 --- a/src/com/android/gallery3d/filtershow/filters/BaseFiltersManager.java +++ b/src/com/android/gallery3d/filtershow/filters/BaseFiltersManager.java @@ -120,7 +120,7 @@ public abstract class BaseFiltersManager implements FiltersManagerInterface { filters.add(ImageFilterVibrance.class); filters.add(ImageFilterSharpen.class); filters.add(ImageFilterCurves.class); - filters.add(ImageFilterDraw.class); + // filters.add(ImageFilterDraw.class); filters.add(ImageFilterHue.class); filters.add(ImageFilterSaturated.class); filters.add(ImageFilterBwFilter.class); diff --git a/src/com/android/gallery3d/filtershow/filters/FilterBasicRepresentation.java b/src/com/android/gallery3d/filtershow/filters/FilterBasicRepresentation.java index e0525e367..d45ed56f2 100644 --- a/src/com/android/gallery3d/filtershow/filters/FilterBasicRepresentation.java +++ b/src/com/android/gallery3d/filtershow/filters/FilterBasicRepresentation.java @@ -137,7 +137,8 @@ public class FilterBasicRepresentation extends FilterRepresentation implements P @Override public String getStateRepresentation() { - return "" + getValue(); + int val = getValue(); + return ((val > 0) ? "+" : "") + val; } @Override diff --git a/src/com/android/gallery3d/filtershow/filters/FilterImageBorderRepresentation.java b/src/com/android/gallery3d/filtershow/filters/FilterImageBorderRepresentation.java index 5257e7793..f67254c63 100644 --- a/src/com/android/gallery3d/filtershow/filters/FilterImageBorderRepresentation.java +++ b/src/com/android/gallery3d/filtershow/filters/FilterImageBorderRepresentation.java @@ -70,7 +70,7 @@ public class FilterImageBorderRepresentation extends FilterRepresentation { @Override public int getTextId() { - return R.string.borders; + return R.string.none; } public boolean allowsMultipleInstances() { |