diff options
| author | John Hoford <hoford@google.com> | 2013-09-12 16:45:02 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-09-12 16:45:02 -0700 |
| commit | 6f18e245e31415cb186d7ce071a5a1a8984af8f8 (patch) | |
| tree | a976730870e437cfe3c257ff5ea03fb63172eaaa | |
| parent | 8d1f09ce6848f384d2040482c275284fec3301f8 (diff) | |
| parent | 1844b200986e4e69455d25d9304b44ed04073379 (diff) | |
| download | android_packages_apps_Gallery2-6f18e245e31415cb186d7ce071a5a1a8984af8f8.tar.gz android_packages_apps_Gallery2-6f18e245e31415cb186d7ce071a5a1a8984af8f8.tar.bz2 android_packages_apps_Gallery2-6f18e245e31415cb186d7ce071a5a1a8984af8f8.zip | |
am 1844b200: am 75974071: am eb6a9b9c: Merge "fix Edit from filmstrip bug" into gb-ub-photos-carlsbad
* commit '1844b200986e4e69455d25d9304b44ed04073379':
fix Edit from filmstrip bug
| -rw-r--r-- | src/com/android/gallery3d/filtershow/FilterShowActivity.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/com/android/gallery3d/filtershow/FilterShowActivity.java b/src/com/android/gallery3d/filtershow/FilterShowActivity.java index 32de174dc..74c4570e5 100644 --- a/src/com/android/gallery3d/filtershow/FilterShowActivity.java +++ b/src/com/android/gallery3d/filtershow/FilterShowActivity.java @@ -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); |