summaryrefslogtreecommitdiffstats
path: root/src/com/android/gallery3d/filtershow/filters/FilterColorBorderRepresentation.java
diff options
context:
space:
mode:
authornicolasroard <nicolasroard@google.com>2013-09-11 17:56:45 -0700
committernicolasroard <nicolasroard@google.com>2013-09-11 18:10:00 -0700
commit521e94c88a371981142312c777a9842a55338901 (patch)
treef28ae687a3643005d2a0c5236ac59a25134a6687 /src/com/android/gallery3d/filtershow/filters/FilterColorBorderRepresentation.java
parent9346e7fdd448c5ddfc3e47c067618ca0ac9c72fa (diff)
downloadandroid_packages_apps_Gallery2-521e94c88a371981142312c777a9842a55338901.tar.gz
android_packages_apps_Gallery2-521e94c88a371981142312c777a9842a55338901.tar.bz2
android_packages_apps_Gallery2-521e94c88a371981142312c777a9842a55338901.zip
Add custom border text
bug:10705772 Change-Id: Idca8cb3179bf9ecc1b6eaef109f79077cf15ec3c
Diffstat (limited to 'src/com/android/gallery3d/filtershow/filters/FilterColorBorderRepresentation.java')
-rw-r--r--src/com/android/gallery3d/filtershow/filters/FilterColorBorderRepresentation.java5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/com/android/gallery3d/filtershow/filters/FilterColorBorderRepresentation.java b/src/com/android/gallery3d/filtershow/filters/FilterColorBorderRepresentation.java
index 4f625d7b4..516292749 100644
--- a/src/com/android/gallery3d/filtershow/filters/FilterColorBorderRepresentation.java
+++ b/src/com/android/gallery3d/filtershow/filters/FilterColorBorderRepresentation.java
@@ -126,7 +126,10 @@ public class FilterColorBorderRepresentation extends FilterRepresentation {
@Override
public int getTextId() {
- return R.string.borders;
+ if (super.getTextId() == 0) {
+ return R.string.borders;
+ }
+ return super.getTextId();
}
public int getColor() {