Merge "Fix 5205456 After sharing multiple images, the selection should be cleared"

1 files changed, 8 insertions, 0 deletions

diff --git a/src/com/android/gallery3d/ui/ActionModeHandler.java b/src/com/android/gallery3d/ui/ActionModeHandler.java
index 6c81a3f6a..493c7c5b2 100644
--- a/src/com/android/gallery3d/ui/ActionModeHandler.java
+++ b/src/com/android/gallery3d/ui/ActionModeHandler.java
@@ -43,6 +43,7 @@ import android.view.MenuItem;
 import android.view.View;
 import android.widget.Button;
 import android.widget.PopupMenu.OnMenuItemClickListener;
+import android.widget.ShareActionProvider.OnShareTargetSelectedListener;
 import android.widget.ShareActionProvider;
 
 import java.util.ArrayList;
@@ -139,7 +140,14 @@ public class ActionModeHandler implements ActionMode.Callback {
         inflater.inflate(R.menu.operation, menu);
 
         mShareActionProvider = GalleryActionBar.initializeShareActionProvider(menu);
+        OnShareTargetSelectedListener listener = new OnShareTargetSelectedListener() {
+            public boolean onShareTargetSelected(ShareActionProvider source, Intent intent) {
+                mSelectionManager.leaveSelectionMode();
+                return false;
+            }
+        };
 
+        mShareActionProvider.setOnShareTargetSelectedListener(listener);
         mMenu = menu;
         return true;
     }