summaryrefslogtreecommitdiffstats
path: root/src/com/android/gallery3d/filtershow/FilterShowActivity.java
diff options
context:
space:
mode:
authorRuben Brunk <rubenbrunk@google.com>2012-10-19 18:48:22 -0700
committerRuben Brunk <rubenbrunk@google.com>2012-10-22 11:18:50 -0700
commit7ccf0111d388bbaf963ace2ea9eeb37903bffb0a (patch)
tree33577181ec806d80fbd1bfc51cb486c1e10f463d /src/com/android/gallery3d/filtershow/FilterShowActivity.java
parent82da3e8e16187b8c13c1382b487b4735b7f1d94a (diff)
downloadandroid_packages_apps_Snap-7ccf0111d388bbaf963ace2ea9eeb37903bffb0a.tar.gz
android_packages_apps_Snap-7ccf0111d388bbaf963ace2ea9eeb37903bffb0a.tar.bz2
android_packages_apps_Snap-7ccf0111d388bbaf963ace2ea9eeb37903bffb0a.zip
Fix to ensure visible history adapter strings are from xml.
Bug: 7379327 Change-Id: I5fcb6fec1e9abe05689dd3b9f4e70e518a9e09d1
Diffstat (limited to 'src/com/android/gallery3d/filtershow/FilterShowActivity.java')
-rw-r--r--src/com/android/gallery3d/filtershow/FilterShowActivity.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/com/android/gallery3d/filtershow/FilterShowActivity.java b/src/com/android/gallery3d/filtershow/FilterShowActivity.java
index 3d968867f..7a7645a28 100644
--- a/src/com/android/gallery3d/filtershow/FilterShowActivity.java
+++ b/src/com/android/gallery3d/filtershow/FilterShowActivity.java
@@ -558,7 +558,7 @@ public class FilterShowActivity extends Activity implements OnItemClickListener,
R.string.ffx_x_process
};
- ImagePreset preset = new ImagePreset(); // empty
+ ImagePreset preset = new ImagePreset(getString(R.string.history_original)); // empty
preset.setImageLoader(mImageLoader);
ImageSmallFilter filter = new ImageSmallFilter(this);
@@ -614,6 +614,7 @@ public class FilterShowActivity extends Activity implements OnItemClickListener,
ImageSmallFilter previousFilter = null;
for (int i = 0; i < p; i++) {
ImageSmallBorder filter = new ImageSmallBorder(this);
+ borders[i].setName(getString(R.string.borders));
filter.setImageFilter(borders[i]);
filter.setController(this);
filter.setBorder(true);