summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJohn Reck <jreck@google.com>2013-05-16 13:54:41 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-05-16 13:54:41 -0700
commit03a49d85713be63a791ba7e4591aa72f3e2a13b1 (patch)
treee186bb16144f79da9cb0c57689ee059b119cc087 /src
parentb6ad64dce341b96a68eecca6cc6ceda633c1a521 (diff)
parent436a2bcaf47c32a2a1b1cee2871d936c062ce699 (diff)
downloadandroid_packages_apps_Snap-03a49d85713be63a791ba7e4591aa72f3e2a13b1.tar.gz
android_packages_apps_Snap-03a49d85713be63a791ba7e4591aa72f3e2a13b1.tar.bz2
android_packages_apps_Snap-03a49d85713be63a791ba7e4591aa72f3e2a13b1.zip
am 5a9716fe: Merge "Fix reset" into gb-ub-photos-bryce
* commit '5a9716fe6de7af4585a24dd1d749b38a4ab48195': Fix reset
Diffstat (limited to 'src')
-rw-r--r--src/com/android/gallery3d/filtershow/FilterShowActivity.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/com/android/gallery3d/filtershow/FilterShowActivity.java b/src/com/android/gallery3d/filtershow/FilterShowActivity.java
index ba374e665..4b653780e 100644
--- a/src/com/android/gallery3d/filtershow/FilterShowActivity.java
+++ b/src/com/android/gallery3d/filtershow/FilterShowActivity.java
@@ -867,6 +867,7 @@ public class FilterShowActivity extends FragmentActivity implements OnItemClickL
ImagePreset original = new ImagePreset(adapter.getItem(0));
mMasterImage.setPreset(original, true);
invalidateViews();
+ backToMain();
}
public void showDefaultImageView() {