diff options
| author | Ruben Brunk <rubenbrunk@google.com> | 2013-04-17 01:17:19 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-04-17 01:17:19 +0000 |
| commit | a40200389cc61d6164dcbce0299dbcb77b810c66 (patch) | |
| tree | a8fe715d762195b2495dc4e856a2c45710c0a47d /src/com/android/gallery3d/filtershow/FilterShowActivity.java | |
| parent | 766c7421f39f5f1aca13b83cca2d1be0c53b54fd (diff) | |
| parent | b25104efc5de8c72f5ec19a5aa231b7206525ef7 (diff) | |
| download | android_packages_apps_Snap-a40200389cc61d6164dcbce0299dbcb77b810c66.tar.gz android_packages_apps_Snap-a40200389cc61d6164dcbce0299dbcb77b810c66.tar.bz2 android_packages_apps_Snap-a40200389cc61d6164dcbce0299dbcb77b810c66.zip | |
Merge "Revert "Shows final set of filters in UI."" into gb-ub-photos-carlsbad
Diffstat (limited to 'src/com/android/gallery3d/filtershow/FilterShowActivity.java')
| -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 4133d8915..ee9ef07f7 100644 --- a/src/com/android/gallery3d/filtershow/FilterShowActivity.java +++ b/src/com/android/gallery3d/filtershow/FilterShowActivity.java @@ -746,8 +746,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, @@ -758,8 +758,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, |