diff options
| author | nicolasroard <nicolasroard@google.com> | 2013-09-12 01:52:53 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-09-12 01:52:54 +0000 |
| commit | b08324d588baaebd01a8acd83428f3862c15e7f9 (patch) | |
| tree | 7ce315ffa9a132b9c311c4a530c02c2025700239 | |
| parent | 2d9330020b929cc75bbdfd645d3dc9278ca78779 (diff) | |
| parent | 521e94c88a371981142312c777a9842a55338901 (diff) | |
| download | android_packages_apps_Gallery2-b08324d588baaebd01a8acd83428f3862c15e7f9.tar.gz android_packages_apps_Gallery2-b08324d588baaebd01a8acd83428f3862c15e7f9.tar.bz2 android_packages_apps_Gallery2-b08324d588baaebd01a8acd83428f3862c15e7f9.zip | |
Merge "Add custom border text" into gb-ub-photos-carlsbad
| -rw-r--r-- | res/values/filtershow_strings.xml | 2 | ||||
| -rw-r--r-- | src/com/android/gallery3d/filtershow/filters/FilterColorBorderRepresentation.java | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/res/values/filtershow_strings.xml b/res/values/filtershow_strings.xml index 75e23b0fc..4093c4892 100644 --- a/res/values/filtershow_strings.xml +++ b/res/values/filtershow_strings.xml @@ -38,6 +38,8 @@ <string name="saved">Saved</string> <!-- Text for filters that apply a border to a picture [CHAR LIMIT=20] --> <string name="borders" msgid="4461692156695893616">Borders</string> + <!-- Text for the custom border filter [CHAR LIMIT=20] --> + <string name="custom_border">Custom</string> <!-- actionbar menu --> 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() { |