summaryrefslogtreecommitdiffstats
path: root/src/com/android/gallery3d/app/PhotoPage.java
diff options
context:
space:
mode:
Diffstat (limited to 'src/com/android/gallery3d/app/PhotoPage.java')
-rwxr-xr-xsrc/com/android/gallery3d/app/PhotoPage.java21
1 files changed, 3 insertions, 18 deletions
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";