OSDN > Developer > crni_pjotr > Chamber > packages-apps-Gallery2 > 提交

packages-apps-Gallery2
Fork

提交

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

--- a/src/com/android/gallery3d/app/GalleryActionBar.java

+++ b/src/com/android/gallery3d/app/GalleryActionBar.java

		@@ -27,9 +27,11 @@ import android.app.AlertDialog;
27	27	import android.app.FragmentTransaction;
28	28	import android.content.Context;
29	29	import android.content.DialogInterface;
	30	+import android.content.Intent;
30	31	import android.view.Menu;
31	32	import android.view.MenuItem;
32	33	import android.widget.ShareActionProvider;
	34	+import android.widget.ShareActionProvider.OnShareTargetSelectedListener;
33	35
34	36	public class GalleryActionBar implements ActionBar.TabListener {
35	37	private static final String TAG = "GalleryActionBar";

		@@ -153,8 +155,6 @@ public class GalleryActionBar implements ActionBar.TabListener {
153	155	ShareActionProvider shareActionProvider = null;
154	156	if (item != null) {
155	157	shareActionProvider = (ShareActionProvider) item.getActionProvider();
156		- shareActionProvider.setShareHistoryFileName(
157		- ShareActionProvider.DEFAULT_SHARE_HISTORY_FILE_NAME);
158	158	}
159	159	return shareActionProvider;
160	160	}

--- a/src/com/android/gallery3d/ui/ActionModeHandler.java

+++ b/src/com/android/gallery3d/ui/ActionModeHandler.java

		@@ -43,6 +43,7 @@ import android.view.MenuItem;
43	43	import android.view.View;
44	44	import android.widget.Button;
45	45	import android.widget.PopupMenu.OnMenuItemClickListener;
	46	+import android.widget.ShareActionProvider.OnShareTargetSelectedListener;
46	47	import android.widget.ShareActionProvider;
47	48
48	49	import java.util.ArrayList;

		@@ -139,7 +140,14 @@ public class ActionModeHandler implements ActionMode.Callback {
139	140	inflater.inflate(R.menu.operation, menu);
140	141
141	142	mShareActionProvider = GalleryActionBar.initializeShareActionProvider(menu);
	143	+ OnShareTargetSelectedListener listener = new OnShareTargetSelectedListener() {
	144	+ public boolean onShareTargetSelected(ShareActionProvider source, Intent intent) {
	145	+ mSelectionManager.leaveSelectionMode();
	146	+ return false;
	147	+ }
	148	+ };
142	149
	150	+ mShareActionProvider.setOnShareTargetSelectedListener(listener);
143	151	mMenu = menu;
144	152	return true;
145	153	}