commit 113e0fbd251966629719f390e43b320b84751304
author Ruben Brunk <rubenbrunk@google.com> Tue Apr 16 23:59:56 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Apr 16 23:59:56 2013 +0000
tree 2cad724454b7f9993dd0c2846bb52d754684dd37
parent 953f109b688477b086281fe09074d3886ef87fba
parent c08af6a3b2c466982fa54a69afd619586dd29391

Merge "Shows final set of filters in UI." into gb-ub-photos-bryce

src/com/android/gallery3d/filtershow/FilterShowActivity.java

diff --git a/src/com/android/gallery3d/filtershow/FilterShowActivity.java b/src/com/android/gallery3d/filtershow/FilterShowActivity.java
index e445a5d..da466f4 100644
--- a/src/com/android/gallery3d/filtershow/FilterShowActivity.java
+++ b/src/com/android/gallery3d/filtershow/FilterShowActivity.java
@@ -771,8 +771,8 @@
 
         int[] drawid = {
                 R.drawable.filtershow_fx_0005_punch,
-//                R.drawable.filtershow_fx_0000_vintage,
-//                R.drawable.filtershow_fx_0004_bw_contrast,
+                R.drawable.filtershow_fx_0000_vintage,
+                R.drawable.filtershow_fx_0004_bw_contrast,
                 R.drawable.filtershow_fx_0002_bleach,
                 R.drawable.filtershow_fx_0001_instant,
                 R.drawable.filtershow_fx_0007_washout,
@@ -783,8 +783,8 @@
 
         int[] fxNameid = {
                 R.string.ffx_punch,
-//                R.string.ffx_vintage,
-//                R.string.ffx_bw_contrast,
+                R.string.ffx_vintage,
+                R.string.ffx_bw_contrast,
                 R.string.ffx_bleach,
                 R.string.ffx_instant,
                 R.string.ffx_washout,