diff options
| author | Mangesh Ghiware <mghiware@google.com> | 2012-09-28 13:48:13 -0700 |
|---|---|---|
| committer | Mangesh Ghiware <mghiware@google.com> | 2012-09-28 13:48:13 -0700 |
| commit | f98aafb7eb65b889b0f831d607828ca4f8af64b6 (patch) | |
| tree | b098a4dcf9341e95d9b4fcc82d5f4f3f72350938 /src | |
| parent | 5e91df3d56be743664c1a4a760f1668ec1de17dd (diff) | |
| download | android_packages_apps_Gallery2-f98aafb7eb65b889b0f831d607828ca4f8af64b6.tar.gz android_packages_apps_Gallery2-f98aafb7eb65b889b0f831d607828ca4f8af64b6.tar.bz2 android_packages_apps_Gallery2-f98aafb7eb65b889b0f831d607828ca4f8af64b6.zip | |
Fix NPE in GalleryActionBar
Bug: 7252666
Change-Id: Ide3c8e0d609743b34a3c53f3bb48dbeddb3f98c0
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/gallery3d/app/GalleryActionBar.java | 28 | ||||
| -rw-r--r-- | src/com/android/gallery3d/ui/ActionModeHandler.java | 2 |
2 files changed, 17 insertions, 13 deletions
diff --git a/src/com/android/gallery3d/app/GalleryActionBar.java b/src/com/android/gallery3d/app/GalleryActionBar.java index 867ca6b3b..2630c3e4a 100644 --- a/src/com/android/gallery3d/app/GalleryActionBar.java +++ b/src/com/android/gallery3d/app/GalleryActionBar.java @@ -324,18 +324,22 @@ public class GalleryActionBar implements OnNavigationListener { public void setShareIntents(Intent sharePanoramaIntent, Intent shareIntent) { // if panorama sharing is enabled, rename share to share as photo, // and move it to overflow - if (sharePanoramaIntent != null) { - mActivity.invalidateOptionsMenu(); - mShareMenuItem.setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER); - mShareMenuItem.setTitle( - mContext.getResources().getString(R.string.share_as_photo)); - } else { - mSharePanoramaMenuItem.setVisible(false); - mShareMenuItem.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM); - mShareMenuItem.setTitle( - mContext.getResources().getString(R.string.share)); + if (mSharePanoramaMenuItem != null) { + if (sharePanoramaIntent != null) { + mActivity.invalidateOptionsMenu(); + mShareMenuItem.setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER); + mShareMenuItem.setTitle( + mContext.getResources().getString(R.string.share_as_photo)); + } else { + mSharePanoramaMenuItem.setVisible(false); + mShareMenuItem.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM); + mShareMenuItem.setTitle( + mContext.getResources().getString(R.string.share)); + } + mSharePanoramaActionProvider.setShareIntent(sharePanoramaIntent); + } + if (mShareMenuItem != null) { + mShareActionProvider.setShareIntent(shareIntent); } - mSharePanoramaActionProvider.setShareIntent(sharePanoramaIntent); - mShareActionProvider.setShareIntent(shareIntent); } } diff --git a/src/com/android/gallery3d/ui/ActionModeHandler.java b/src/com/android/gallery3d/ui/ActionModeHandler.java index f0ddde839..e4b3b4125 100644 --- a/src/com/android/gallery3d/ui/ActionModeHandler.java +++ b/src/com/android/gallery3d/ui/ActionModeHandler.java @@ -358,7 +358,7 @@ public class ActionModeHandler implements Callback, PopupList.OnPopupItemClickLi mSharePanoramaMenuItem.setEnabled(true); if ((operation & MediaObject.SUPPORT_PANORAMA) != 0) { mActivity.invalidateOptionsMenu(); - mShareMenuItem.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM); + mShareMenuItem.setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER); mShareMenuItem.setTitle( mActivity.getResources().getString(R.string.share_as_photo)); } else { |