summaryrefslogtreecommitdiffstats
path: root/src/com/android/gallery3d/photoeditor/EffectsBar.java
diff options
context:
space:
mode:
authorYuli Huang <yuli@google.com>2012-03-07 01:18:08 +0800
committerYuli Huang <yuli@google.com>2012-03-07 01:18:08 +0800
commitd67ec74304219b3e70caae32fbfaadfb9c3c76f4 (patch)
tree3d4d0dea24a68878b29292350bb0bccaaf0e540b /src/com/android/gallery3d/photoeditor/EffectsBar.java
parentcb05834cedb8223fc59456afcd62fa7448f2b3b8 (diff)
downloadandroid_packages_apps_Gallery2-d67ec74304219b3e70caae32fbfaadfb9c3c76f4.tar.gz
android_packages_apps_Gallery2-d67ec74304219b3e70caae32fbfaadfb9c3c76f4.tar.bz2
android_packages_apps_Gallery2-d67ec74304219b3e70caae32fbfaadfb9c3c76f4.zip
Fix b/5885342: Multiple PhotoEditor activities cause exceptions.
Avoid using a static variable to keep tracking views across activities. Change-Id: Ia53444502d476d37b64344e5aea5f58a06ee3b03
Diffstat (limited to 'src/com/android/gallery3d/photoeditor/EffectsBar.java')
-rw-r--r--src/com/android/gallery3d/photoeditor/EffectsBar.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/gallery3d/photoeditor/EffectsBar.java b/src/com/android/gallery3d/photoeditor/EffectsBar.java
index de47159a3..ccf684a4c 100644
--- a/src/com/android/gallery3d/photoeditor/EffectsBar.java
+++ b/src/com/android/gallery3d/photoeditor/EffectsBar.java
@@ -116,7 +116,7 @@ public class EffectsBar extends LinearLayout {
private boolean exitActiveEffect(final Runnable runnableOnDone) {
if (activeEffect != null) {
- SpinnerProgressDialog.showDialog();
+ SpinnerProgressDialog.showDialog((Toolbar) getRootView().findViewById(R.id.toolbar));
activeEffect.end(new Runnable() {
@Override