diff options
author | Yuli Huang <yuli@google.com> | 2011-11-10 16:50:31 +0800 |
---|---|---|
committer | Yuli Huang <yuli@google.com> | 2011-11-10 16:50:31 +0800 |
commit | fd3d9dab304d66f2f7d995440d996c688b6d9a31 (patch) | |
tree | 14c37da540cd5b250d5f5338f8e63f4fe220d789 /src/com/android/gallery3d/photoeditor/PhotoEditor.java | |
parent | 669f5b8aed366c59c8c062e1049bc287ff73babf (diff) | |
download | android_packages_apps_Snap-fd3d9dab304d66f2f7d995440d996c688b6d9a31.tar.gz android_packages_apps_Snap-fd3d9dab304d66f2f7d995440d996c688b6d9a31.tar.bz2 android_packages_apps_Snap-fd3d9dab304d66f2f7d995440d996c688b6d9a31.zip |
Fix b/5518211 by disabling effects when photo cannot be loaded.
Change-Id: I9e5ae9cfaf9bee52cd63a0e77a3b083e47b59335
Diffstat (limited to 'src/com/android/gallery3d/photoeditor/PhotoEditor.java')
-rw-r--r-- | src/com/android/gallery3d/photoeditor/PhotoEditor.java | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/src/com/android/gallery3d/photoeditor/PhotoEditor.java b/src/com/android/gallery3d/photoeditor/PhotoEditor.java index 7b53041ad..dba7e6258 100644 --- a/src/com/android/gallery3d/photoeditor/PhotoEditor.java +++ b/src/com/android/gallery3d/photoeditor/PhotoEditor.java @@ -36,6 +36,7 @@ public class PhotoEditor extends Activity { private Uri saveUri; private FilterStack filterStack; private ActionBar actionBar; + private EffectsBar effectsBar; @Override public void onCreate(Bundle savedInstanceState) { @@ -61,14 +62,16 @@ public class PhotoEditor extends Activity { actionBar.updateSave(saveUri == null); } - EffectsBar effectsBar = (EffectsBar) findViewById(R.id.effects_bar); + // Effects-bar is initially disabled until photo is successfully loaded. + effectsBar = (EffectsBar) findViewById(R.id.effects_bar); effectsBar.initialize(filterStack); + effectsBar.setEnabled(false); - actionBar.setClickRunnable(R.id.undo_button, createUndoRedoRunnable(true, effectsBar)); - actionBar.setClickRunnable(R.id.redo_button, createUndoRedoRunnable(false, effectsBar)); - actionBar.setClickRunnable(R.id.save_button, createSaveRunnable(effectsBar)); - actionBar.setClickRunnable(R.id.share_button, createShareRunnable(effectsBar)); - actionBar.setClickRunnable(R.id.action_bar_back, createBackRunnable(effectsBar)); + actionBar.setClickRunnable(R.id.undo_button, createUndoRedoRunnable(true)); + actionBar.setClickRunnable(R.id.redo_button, createUndoRedoRunnable(false)); + actionBar.setClickRunnable(R.id.save_button, createSaveRunnable()); + actionBar.setClickRunnable(R.id.share_button, createShareRunnable()); + actionBar.setClickRunnable(R.id.action_bar_back, createBackRunnable()); } private SpinnerProgressDialog createProgressDialog() { @@ -86,6 +89,7 @@ public class PhotoEditor extends Activity { @Override public void onDone() { progressDialog.dismiss(); + effectsBar.setEnabled(result != null); } }); } @@ -93,7 +97,7 @@ public class PhotoEditor extends Activity { new LoadScreennailTask(this, callback).execute(sourceUri); } - private Runnable createUndoRedoRunnable(final boolean undo, final EffectsBar effectsBar) { + private Runnable createUndoRedoRunnable(final boolean undo) { return new Runnable() { @Override @@ -121,7 +125,7 @@ public class PhotoEditor extends Activity { }; } - private Runnable createSaveRunnable(final EffectsBar effectsBar) { + private Runnable createSaveRunnable() { return new Runnable() { @Override @@ -154,7 +158,7 @@ public class PhotoEditor extends Activity { }; } - private Runnable createShareRunnable(final EffectsBar effectsBar) { + private Runnable createShareRunnable() { return new Runnable() { @Override @@ -175,7 +179,7 @@ public class PhotoEditor extends Activity { }; } - private Runnable createBackRunnable(final EffectsBar effectsBar) { + private Runnable createBackRunnable() { return new Runnable() { @Override |