summaryrefslogtreecommitdiffstats
path: root/src/com/android/gallery3d/app
diff options
context:
space:
mode:
Diffstat (limited to 'src/com/android/gallery3d/app')
-rw-r--r--src/com/android/gallery3d/app/GalleryActionBar.java46
-rw-r--r--src/com/android/gallery3d/app/MovieActivity.java38
-rwxr-xr-xsrc/com/android/gallery3d/app/PhotoPage.java21
3 files changed, 47 insertions, 58 deletions
diff --git a/src/com/android/gallery3d/app/GalleryActionBar.java b/src/com/android/gallery3d/app/GalleryActionBar.java
index 6c6878f13..dcea7c48c 100644
--- a/src/com/android/gallery3d/app/GalleryActionBar.java
+++ b/src/com/android/gallery3d/app/GalleryActionBar.java
@@ -34,7 +34,6 @@ import android.view.MenuItem;
import android.view.View;
import android.view.ViewGroup;
import android.widget.BaseAdapter;
-import android.widget.ShareActionProvider;
import android.widget.TextView;
import android.widget.Toolbar;
import android.widget.TwoLineListItem;
@@ -405,8 +404,6 @@ public class GalleryActionBar {
// }
private Menu mActionBarMenu;
- private ShareActionProvider mSharePanoramaActionProvider;
- private ShareActionProvider mShareActionProvider;
private Intent mSharePanoramaIntent;
private Intent mShareIntent;
@@ -416,20 +413,32 @@ public class GalleryActionBar {
MenuItem item = menu.findItem(R.id.action_share_panorama);
if (item != null) {
- mSharePanoramaActionProvider = (ShareActionProvider)
- item.getActionProvider();
- mSharePanoramaActionProvider
- .setShareHistoryFileName("panorama_share_history.xml");
- mSharePanoramaActionProvider.setShareIntent(mSharePanoramaIntent);
+ item.setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener() {
+ @Override
+ public boolean onMenuItemClick(MenuItem item) {
+ if (mSharePanoramaIntent != null) {
+ Intent intent = Intent.createChooser(mSharePanoramaIntent, null);
+ intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+ mContext.startActivity(intent);
+ }
+ return true;
+ }
+ });
}
item = menu.findItem(R.id.action_share);
if (item != null) {
- mShareActionProvider = (ShareActionProvider)
- item.getActionProvider();
- mShareActionProvider
- .setShareHistoryFileName("share_history.xml");
- mShareActionProvider.setShareIntent(mShareIntent);
+ item.setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener() {
+ @Override
+ public boolean onMenuItemClick(MenuItem item) {
+ if (mShareIntent != null) {
+ Intent intent = Intent.createChooser(mShareIntent, null);
+ intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+ mContext.startActivity(intent);
+ }
+ return true;
+ }
+ });
}
}
@@ -437,18 +446,9 @@ public class GalleryActionBar {
return mActionBarMenu;
}
- public void setShareIntents(Intent sharePanoramaIntent, Intent shareIntent,
- ShareActionProvider.OnShareTargetSelectedListener onShareListener) {
+ public void setShareIntents(Intent sharePanoramaIntent, Intent shareIntent) {
mSharePanoramaIntent = sharePanoramaIntent;
- if (mSharePanoramaActionProvider != null) {
- mSharePanoramaActionProvider.setShareIntent(sharePanoramaIntent);
- }
mShareIntent = shareIntent;
- if (mShareActionProvider != null) {
- mShareActionProvider.setShareIntent(shareIntent);
- mShareActionProvider.setOnShareTargetSelectedListener(
- onShareListener);
- }
}
public void setBackGroundTransparent() {
diff --git a/src/com/android/gallery3d/app/MovieActivity.java b/src/com/android/gallery3d/app/MovieActivity.java
index 27f3d4ac1..22ab27292 100644
--- a/src/com/android/gallery3d/app/MovieActivity.java
+++ b/src/com/android/gallery3d/app/MovieActivity.java
@@ -61,7 +61,6 @@ import android.view.Window;
import android.view.WindowManager;
import android.widget.CompoundButton;
import android.widget.ImageView;
-import android.widget.ShareActionProvider;
import android.widget.ToggleButton;
import android.widget.Toast;
@@ -121,7 +120,6 @@ public class MovieActivity extends AbstractPermissionActivity {
private Knob mVirtualizerKnob;
private SharedPreferences mPrefs;
- private ShareActionProvider mShareProvider;
private IMovieItem mMovieItem;
private IActivityHooker mMovieHooker;
private KeyguardManager mKeyguardManager;
@@ -130,6 +128,8 @@ public class MovieActivity extends AbstractPermissionActivity {
private boolean mResumed = false;
private boolean mControlResumed = false;
+ private Intent mShareIntent;
+
private final BroadcastReceiver mReceiver = new BroadcastReceiver() {
@Override
public void onReceive(final Context context, final Intent intent) {
@@ -354,11 +354,18 @@ public class MovieActivity extends AbstractPermissionActivity {
getMenuInflater().inflate(R.menu.movie, menu);
MenuItem shareMenu = menu.findItem(R.id.action_share);
shareMenu.setVisible(false);
- ShareActionProvider provider = (ShareActionProvider) shareMenu.getActionProvider();
- mShareProvider = provider;
- if (mShareProvider != null) {
- // share provider is singleton, we should refresh our history file.
- mShareProvider.setShareHistoryFileName(SHARE_HISTORY_FILE);
+ if (shareMenu != null) {
+ shareMenu.setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener() {
+ @Override
+ public boolean onMenuItemClick(MenuItem item) {
+ if (mShareIntent != null) {
+ Intent intent = Intent.createChooser(mShareIntent, null);
+ intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+ getApplicationContext().startActivity(mShareIntent);
+ }
+ return true;
+ }
+ });
}
final MenuItem mi = menu.add(R.string.audio_effects);
@@ -793,16 +800,13 @@ public class MovieActivity extends AbstractPermissionActivity {
private void refreshShareProvider(IMovieItem info) {
// we only share the video if it's "content:".
- if (mShareProvider != null) {
- Intent intent = new Intent(Intent.ACTION_SEND);
- if (MovieUtils.isLocalFile(info.getUri(), info.getMimeType())) {
- intent.setType("video/*");
- intent.putExtra(Intent.EXTRA_STREAM, info.getUri());
- } else {
- intent.setType("text/plain");
- intent.putExtra(Intent.EXTRA_TEXT, String.valueOf(info.getUri()));
- }
- mShareProvider.setShareIntent(intent);
+ mShareIntent = new Intent(Intent.ACTION_SEND);
+ if (MovieUtils.isLocalFile(info.getUri(), info.getMimeType())) {
+ mShareIntent.setType("video/*");
+ mShareIntent.putExtra(Intent.EXTRA_STREAM, info.getUri());
+ } else {
+ mShareIntent.setType("text/plain");
+ mShareIntent.putExtra(Intent.EXTRA_TEXT, String.valueOf(info.getUri()));
}
}
diff --git a/src/com/android/gallery3d/app/PhotoPage.java b/src/com/android/gallery3d/app/PhotoPage.java
index 8ad53df22..8f657e0be 100755
--- a/src/com/android/gallery3d/app/PhotoPage.java
+++ b/src/com/android/gallery3d/app/PhotoPage.java
@@ -43,7 +43,6 @@ import android.view.ViewGroup;
import android.view.Window;
import android.view.WindowManager;
import android.widget.RelativeLayout;
-import android.widget.ShareActionProvider;
import android.widget.Toast;
import android.widget.Toolbar;
@@ -88,8 +87,8 @@ import java.util.Locale;
//import android.drm.DrmHelper;
public abstract class PhotoPage extends ActivityState implements
- PhotoView.Listener, AppBridge.Server, ShareActionProvider.OnShareTargetSelectedListener,
- PhotoPageBottomControls.Delegate, ThreeDButton.Delegate{
+ PhotoView.Listener, AppBridge.Server, PhotoPageBottomControls.Delegate,
+ ThreeDButton.Delegate {
private static final String TAG = "PhotoPage";
private static final int MSG_HIDE_BARS = 1;
@@ -207,7 +206,6 @@ public abstract class PhotoPage extends ActivityState implements
private int mLastSystemUiVis = 0;
- private ShareActionProvider mShareActionProvider;
private Intent mShareIntent;
//use for saving the original height and padding of toolbar
@@ -398,7 +396,7 @@ public abstract class PhotoPage extends ActivityState implements
}
Intent shareIntent = createShareIntent(mCurrentPhoto);
if (shareIntent != null) {
- mActionBar.setShareIntents(panoramaIntent, shareIntent, PhotoPage.this);
+ mActionBar.setShareIntents(panoramaIntent, shareIntent);
}
setNfcBeamPushUri(contentUri);
}
@@ -1788,19 +1786,6 @@ public abstract class PhotoPage extends ActivityState implements
refreshBottomControlsWhenReady();
}
- @Override
- public boolean onShareTargetSelected(ShareActionProvider source, Intent intent) {
- final long timestampMillis = mCurrentPhoto.getDateInMs();
- final String mediaType = getMediaTypeString(mCurrentPhoto);
- UsageStatistics.onEvent(UsageStatistics.COMPONENT_GALLERY,
- UsageStatistics.ACTION_SHARE,
- mediaType,
- timestampMillis > 0
- ? System.currentTimeMillis() - timestampMillis
- : -1);
- return false;
- }
-
private static String getMediaTypeString(MediaItem item) {
if (item.getMediaType() == MediaObject.MEDIA_TYPE_VIDEO) {
return "Video";
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-15 09:08:04 +0000