2 files changed, 9 insertions, 10 deletions
diff --git a/src/com/android/gallery3d/app/PhotoPage.java b/src/com/android/gallery3d/app/PhotoPage.java
index a84a5cca6..deb3b855c 100644
--- a/src/com/android/gallery3d/app/PhotoPage.java
+++ b/src/com/android/gallery3d/app/PhotoPage.java
@@ -914,7 +914,7 @@ public abstract class PhotoPage extends ActivityState implements
         mShowBars = true;
         mOrientationManager.unlockOrientation();
         mActionBar.show();
-        mActivity.getGLRoot().setLightsOutMode(false);
+        mActivity.getGLRoot().setLightsOutMode(true);
         refreshHidingMessage();
         refreshBottomControlsWhenReady();
     }
diff --git a/src/com/android/gallery3d/ui/ActionModeHandler.java b/src/com/android/gallery3d/ui/ActionModeHandler.java
index 226dcea10..301d2e4e4 100644
--- a/src/com/android/gallery3d/ui/ActionModeHandler.java
+++ b/src/com/android/gallery3d/ui/ActionModeHandler.java
@@ -74,8 +74,8 @@ public class ActionModeHandler implements Callback, PopupList.OnPopupItemClickLi
     private Menu mMenu;
     private MenuItem mSharePanoramaMenuItem;
     private MenuItem mShareMenuItem;
+    private Intent shareIntent;
     private ShareActionProvider mSharePanoramaActionProvider;
-    private ShareActionProvider mShareActionProvider;
     private SelectionMenu mSelectionMenu;
     private ActionModeListener mListener;
     private Future<?> mMenuTask;
@@ -191,6 +191,12 @@ public class ActionModeHandler implements Callback, PopupList.OnPopupItemClickLi
                             "Gallery Delete Progress Listener");
                 }
                 listener = mDeleteProgressListener;
+            } else if (action == R.id.action_share) {
+                String shareTitle = mActivity.getResources().
+                        getString(R.string.share_dialogue_title);
+                mActivity.startActivity(Intent.createChooser(
+                        shareIntent, shareTitle));
+                return true;
             }
             mMenuExecutor.onMenuClicked(item, confirmMsg, listener);
         } finally {
@@ -258,13 +264,6 @@ public class ActionModeHandler implements Callback, PopupList.OnPopupItemClickLi
             mSharePanoramaActionProvider.setShareHistoryFileName("panorama_share_history.xml");
         }
         mShareMenuItem = menu.findItem(R.id.action_share);
-        if (mShareMenuItem != null) {
-            mShareActionProvider = (ShareActionProvider) mShareMenuItem
-                .getActionProvider();
-            mShareActionProvider.setOnShareTargetSelectedListener(
-                    mShareTargetSelectedListener);
-            mShareActionProvider.setShareHistoryFileName("share_history.xml");
-        }
         return true;
     }
 
@@ -527,7 +526,7 @@ public class ActionModeHandler implements Callback, PopupList.OnPopupItemClickLi
                             }
 
                             mShareMenuItem.setEnabled(canShare);
-                            mShareActionProvider.setShareIntent(share_intent);
+                            shareIntent = share_intent;
                         }
                     }
                 });