diff options
| author | John Hoford <hoford@google.com> | 2013-09-12 21:21:55 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-09-12 21:21:55 +0000 |
| commit | eb6a9b9cdd2ec4bd9139c32ace454c329f1f3147 (patch) | |
| tree | 58ca4fdf3a61ee6b8fd855b3381a338a00002453 /src | |
| parent | e10fd68874fa3cff0e5c3ca07f1e5b9d40be1299 (diff) | |
| parent | 46868d049a2b4b96c50559ad8a50a4104af15c80 (diff) | |
| download | android_packages_apps_Gallery2-eb6a9b9cdd2ec4bd9139c32ace454c329f1f3147.tar.gz android_packages_apps_Gallery2-eb6a9b9cdd2ec4bd9139c32ace454c329f1f3147.tar.bz2 android_packages_apps_Gallery2-eb6a9b9cdd2ec4bd9139c32ace454c329f1f3147.zip | |
Merge "fix Edit from filmstrip bug" into gb-ub-photos-carlsbad
Diffstat (limited to 'src')
| -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); |