Fix sharing state in Gallery ActionBar

Bug: 7340067
Change-Id: I4ff9577315fc743f6b9fef0d325b0743546f108e

diff --git a/src/com/android/gallery3d/app/GalleryActionBar.java b/src/com/android/gallery3d/app/GalleryActionBar.java
index f0be01a..0fb5e51 100644 (file)
--- a/src/com/android/gallery3d/app/GalleryActionBar.java
+++ b/src/com/android/gallery3d/app/GalleryActionBar.java
@@ -392,6 +392,8 @@ public class GalleryActionBar implements OnNavigationListener {
     private Menu mActionBarMenu;
     private ShareActionProvider mSharePanoramaActionProvider;
     private ShareActionProvider mShareActionProvider;
+    private Intent mSharePanoramaIntent;
+    private Intent mShareIntent;
 
     public void createActionBarMenu(int menuRes, Menu menu) {
         mActivity.getMenuInflater().inflate(menuRes, menu);
@@ -403,6 +405,7 @@ public class GalleryActionBar implements OnNavigationListener {
                 item.getActionProvider();
             mSharePanoramaActionProvider
                 .setShareHistoryFileName("panorama_share_history.xml");
+            mSharePanoramaActionProvider.setShareIntent(mSharePanoramaIntent);
         }
 
         item = menu.findItem(R.id.action_share);
@@ -411,6 +414,7 @@ public class GalleryActionBar implements OnNavigationListener {
                 item.getActionProvider();
             mShareActionProvider
                 .setShareHistoryFileName("share_history.xml");
+            mShareActionProvider.setShareIntent(mShareIntent);
         }
     }
 
@@ -419,9 +423,11 @@ public class GalleryActionBar implements OnNavigationListener {
     }
 
     public void setShareIntents(Intent sharePanoramaIntent, Intent shareIntent) {
+        mSharePanoramaIntent = sharePanoramaIntent;
         if (mSharePanoramaActionProvider != null) {
             mSharePanoramaActionProvider.setShareIntent(sharePanoramaIntent);
         }
+        mShareIntent = shareIntent;
         if (mShareActionProvider != null) {
             mShareActionProvider.setShareIntent(shareIntent);
         }