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 | 1a4e2ec8f92716630c653f5cbb0c2ea9a154e030 (patch) | |
tree | 0c87ed5a5cef9788206b509231d2e410c2f88db9 /src/com/android | |
parent | 2ddb3e6dc31c9ebdae1962edf1ba3fa4d498bbc3 (diff) | |
parent | 2ef853833a2d7fed29b3a46e526fb8479422064e (diff) | |
download | android_packages_apps_Snap-1a4e2ec8f92716630c653f5cbb0c2ea9a154e030.tar.gz android_packages_apps_Snap-1a4e2ec8f92716630c653f5cbb0c2ea9a154e030.tar.bz2 android_packages_apps_Snap-1a4e2ec8f92716630c653f5cbb0c2ea9a154e030.zip |
resolved conflicts for merge of d6edcee3 to gb-ub-photos-carlsbad
Change-Id: I24057e85ca5b0409e9bcb92c85577fb9a763fbe4
Diffstat (limited to 'src/com/android')
-rw-r--r-- | src/com/android/gallery3d/filtershow/filters/FilterBasicRepresentation.java | 3 | ||||
-rw-r--r-- | src/com/android/gallery3d/filtershow/filters/FilterImageBorderRepresentation.java | 2 |
2 files changed, 3 insertions, 2 deletions
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() { |