diff options
| author | Ruben Brunk <rubenbrunk@google.com> | 2013-04-16 23:59:56 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-04-16 23:59:56 +0000 |
| commit | 7f6c95557c9b510bbb434a0714be49363975ddb5 (patch) | |
| tree | 43ad7a70f3abb1896c284cb4cc5a7c61ea3643d1 /src | |
| parent | cc41601e7344f948452013b4751b8b541c6f7432 (diff) | |
| parent | 095eefb3cc0cea8279ec9175ab0a9542af236eea (diff) | |
| download | android_packages_apps_Snap-7f6c95557c9b510bbb434a0714be49363975ddb5.tar.gz android_packages_apps_Snap-7f6c95557c9b510bbb434a0714be49363975ddb5.tar.bz2 android_packages_apps_Snap-7f6c95557c9b510bbb434a0714be49363975ddb5.zip | |
Merge "Shows final set of filters in UI." into gb-ub-photos-bryce
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/gallery3d/filtershow/FilterShowActivity.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/com/android/gallery3d/filtershow/FilterShowActivity.java b/src/com/android/gallery3d/filtershow/FilterShowActivity.java index e445a5d8d..da466f484 100644 --- a/src/com/android/gallery3d/filtershow/FilterShowActivity.java +++ b/src/com/android/gallery3d/filtershow/FilterShowActivity.java @@ -771,8 +771,8 @@ public class FilterShowActivity extends FragmentActivity implements OnItemClickL 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 @@ public class FilterShowActivity extends FragmentActivity implements OnItemClickL 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, |