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

Commit eb6a9b9c authored by John Hoford's avatar John Hoford Committed by Android (Google) Code Review
Browse files

Merge "fix Edit from filmstrip bug" into gb-ub-photos-carlsbad

parents e10fd688 46868d04

src/com/android/gallery3d/filtershow/FilterShowActivity.java

+4 −0
Original line number Diff line number Diff line
@@ -935,10 +935,14 @@ public class FilterShowActivity extends FragmentActivity implements OnItemClickL 
        mShareActionProvider.setShareIntent(getDefaultShareIntent());

        mShareActionProvider.setOnShareTargetSelectedListener(this);

        mMenu = menu;

        setupMenu();

        return true;

    }



    private void setupMenu(){

        if (mMenu == null || mMasterImage == null) {

            return;

        }

        MenuItem undoItem = mMenu.findItem(R.id.undoButton);

        MenuItem redoItem = mMenu.findItem(R.id.redoButton);

        MenuItem resetItem = mMenu.findItem(R.id.resetHistoryButton);