Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 90b7a7a1 authored by Yuli Huang's avatar Yuli Huang
Browse files

Fix b/5510870 by persisting states of save/share buttons. 

Change-Id: Ida5c2868199b75a1a710ee5b92e0e3dffd71cec6
parent 738e82e1

src/com/android/gallery3d/photoeditor/FilterStack.java

+1 −1
Original line number Diff line number Diff line
@@ -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());

       }

    }

src/com/android/gallery3d/photoeditor/PhotoEditor.java

+8 −1
Original line number Diff line number Diff line
@@ -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