diff options
| author | Ruben Brunk <rubenbrunk@google.com> | 2013-04-16 17:03:29 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-04-16 17:03:29 -0700 |
| commit | 5eab0b8e7a7b74d3b2d20a222312680591cb98b6 (patch) | |
| tree | c43a26cd36d6879f530fbeeb49e10680c2c118a3 /src/com/android/gallery3d | |
| parent | 409d9c36c3b6d8ff2128d50a391ce8617b632127 (diff) | |
| parent | 113e0fbd251966629719f390e43b320b84751304 (diff) | |
| download | android_packages_apps_Gallery2-5eab0b8e7a7b74d3b2d20a222312680591cb98b6.tar.gz android_packages_apps_Gallery2-5eab0b8e7a7b74d3b2d20a222312680591cb98b6.tar.bz2 android_packages_apps_Gallery2-5eab0b8e7a7b74d3b2d20a222312680591cb98b6.zip | |
am 113e0fbd: Merge "Shows final set of filters in UI." into gb-ub-photos-bryce
* commit '113e0fbd251966629719f390e43b320b84751304':
Shows final set of filters in UI.
Diffstat (limited to 'src/com/android/gallery3d')
| -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, |