diff options
author | Yuli Huang <yuli@google.com> | 2011-11-10 01:11:46 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2011-11-10 01:11:46 +0000 |
commit | 8b2e521b418e1a86d7644c8860dff6c8e9eb2b96 (patch) | |
tree | 0384fb61e8b5a5ae241c951c66580bf1ad32db85 | |
parent | c62e804a74df652881a0b6180412f1c1955c64b5 (diff) | |
parent | b69298a00f20f2a3b7ac8f5d3c350c3152d428c3 (diff) | |
download | android_packages_apps_Snap-8b2e521b418e1a86d7644c8860dff6c8e9eb2b96.tar.gz android_packages_apps_Snap-8b2e521b418e1a86d7644c8860dff6c8e9eb2b96.tar.bz2 android_packages_apps_Snap-8b2e521b418e1a86d7644c8860dff6c8e9eb2b96.zip |
am 90b7a7a1: Fix b/5510870 by persisting states of save/share buttons.
* commit '90b7a7a1fed287cab3500acdfaf4e82ec0a59dec':
Fix b/5510870 by persisting states of save/share buttons.
-rw-r--r-- | src/com/android/gallery3d/photoeditor/FilterStack.java | 2 | ||||
-rw-r--r-- | src/com/android/gallery3d/photoeditor/PhotoEditor.java | 9 |
2 files changed, 9 insertions, 2 deletions
diff --git a/src/com/android/gallery3d/photoeditor/FilterStack.java b/src/com/android/gallery3d/photoeditor/FilterStack.java index 7194575a3..fe6fb104d 100644 --- a/src/com/android/gallery3d/photoeditor/FilterStack.java +++ b/src/com/android/gallery3d/photoeditor/FilterStack.java @@ -60,7 +60,7 @@ public class FilterStack { appliedStack.addAll(getFilters(savedState, APPLIED_STACK_KEY)); redoStack.addAll(getFilters(savedState, REDO_STACK_KEY)); outputTopFilter = true; - stackChanged(); + stackListener.onStackChanged(!appliedStack.empty(), !redoStack.empty()); } } diff --git a/src/com/android/gallery3d/photoeditor/PhotoEditor.java b/src/com/android/gallery3d/photoeditor/PhotoEditor.java index 78d414d9f..7b53041ad 100644 --- a/src/com/android/gallery3d/photoeditor/PhotoEditor.java +++ b/src/com/android/gallery3d/photoeditor/PhotoEditor.java @@ -30,6 +30,8 @@ import com.android.gallery3d.R; */ public class PhotoEditor extends Activity { + private static final String SAVE_URI_KEY = "save_uri"; + private Uri sourceUri; private Uri saveUri; private FilterStack filterStack; @@ -54,6 +56,10 @@ public class PhotoEditor extends Activity { actionBar.updateButtons(canUndo, canRedo); } }, savedInstanceState); + if (savedInstanceState != null) { + saveUri = savedInstanceState.getParcelable(SAVE_URI_KEY); + actionBar.updateSave(saveUri == null); + } EffectsBar effectsBar = (EffectsBar) findViewById(R.id.effects_bar); effectsBar.initialize(filterStack); @@ -134,8 +140,8 @@ public class PhotoEditor extends Activity { @Override public void onComplete(Uri result) { progressDialog.dismiss(); - actionBar.updateSave(result == null); saveUri = result; + actionBar.updateSave(saveUri == null); } }; new SaveCopyTask(PhotoEditor.this, sourceUri, callback).execute( @@ -203,6 +209,7 @@ public class PhotoEditor extends Activity { protected void onSaveInstanceState(Bundle outState) { super.onSaveInstanceState(outState); filterStack.saveStacks(outState); + outState.putParcelable(SAVE_URI_KEY, saveUri); } @Override |