summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlavio Lerda <flerda@google.com>2013-04-16 09:46:07 +0100
committerFlavio Lerda <flerda@google.com>2013-04-17 12:16:19 +0100
commit2251386437163898eb4b6f7546705d1365744fd1 (patch)
tree782b3ffaa6337b27c743d021aec70425bba037b4
parent83bd8d346d295e4fe06212da957feb77ee23c04d (diff)
downloadandroid_packages_apps_Gallery2-2251386437163898eb4b6f7546705d1365744fd1.tar.gz
android_packages_apps_Gallery2-2251386437163898eb4b6f7546705d1365744fd1.tar.bz2
android_packages_apps_Gallery2-2251386437163898eb4b6f7546705d1365744fd1.zip
Usage statistics for sharing.
Bug: 8433834 Change-Id: Iaec6150443258daa213395b6fb1e8d8d3e6123b3
-rw-r--r--src/com/android/gallery3d/app/GalleryActionBar.java5
-rw-r--r--src/com/android/gallery3d/app/PhotoPage.java33
-rw-r--r--src_pd/com/android/gallery3d/util/UsageStatistics.java1
3 files changed, 36 insertions, 3 deletions
diff --git a/src/com/android/gallery3d/app/GalleryActionBar.java b/src/com/android/gallery3d/app/GalleryActionBar.java
index 0fb5e51b4..588f5842a 100644
--- a/src/com/android/gallery3d/app/GalleryActionBar.java
+++ b/src/com/android/gallery3d/app/GalleryActionBar.java
@@ -422,7 +422,8 @@ public class GalleryActionBar implements OnNavigationListener {
return mActionBarMenu;
}
- public void setShareIntents(Intent sharePanoramaIntent, Intent shareIntent) {
+ public void setShareIntents(Intent sharePanoramaIntent, Intent shareIntent,
+ ShareActionProvider.OnShareTargetSelectedListener onShareListener) {
mSharePanoramaIntent = sharePanoramaIntent;
if (mSharePanoramaActionProvider != null) {
mSharePanoramaActionProvider.setShareIntent(sharePanoramaIntent);
@@ -430,6 +431,8 @@ public class GalleryActionBar implements OnNavigationListener {
mShareIntent = shareIntent;
if (mShareActionProvider != null) {
mShareActionProvider.setShareIntent(shareIntent);
+ mShareActionProvider.setOnShareTargetSelectedListener(
+ onShareListener);
}
}
}
diff --git a/src/com/android/gallery3d/app/PhotoPage.java b/src/com/android/gallery3d/app/PhotoPage.java
index 9b6f2b961..3e1835853 100644
--- a/src/com/android/gallery3d/app/PhotoPage.java
+++ b/src/com/android/gallery3d/app/PhotoPage.java
@@ -36,6 +36,7 @@ import android.os.SystemClock;
import android.view.Menu;
import android.view.MenuItem;
import android.widget.RelativeLayout;
+import android.widget.ShareActionProvider;
import android.widget.Toast;
import com.android.camera.CameraActivity;
@@ -71,8 +72,12 @@ import com.android.gallery3d.ui.SynchronizedHandler;
import com.android.gallery3d.util.GalleryUtils;
import com.android.gallery3d.util.UsageStatistics;
+import java.text.DateFormat;
+import java.text.ParseException;
+import java.util.Date;
+
public abstract class PhotoPage extends ActivityState implements
- PhotoView.Listener, AppBridge.Server,
+ PhotoView.Listener, AppBridge.Server, ShareActionProvider.OnShareTargetSelectedListener,
PhotoPageBottomControls.Delegate, GalleryActionBar.OnAlbumModeSelectedListener {
private static final String TAG = "PhotoPage";
@@ -391,7 +396,7 @@ public abstract class PhotoPage extends ActivityState implements
}
Intent shareIntent = createShareIntent(mCurrentPhoto);
- mActionBar.setShareIntents(panoramaIntent, shareIntent);
+ mActionBar.setShareIntents(panoramaIntent, shareIntent, PhotoPage.this);
setNfcBeamPushUri(contentUri);
}
break;
@@ -1540,4 +1545,28 @@ public abstract class PhotoPage extends ActivityState implements
public void onUndoBarVisibilityChanged(boolean visible) {
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";
+ } else if (item.getMediaType() == MediaObject.MEDIA_TYPE_IMAGE) {
+ return "Photo";
+ } else {
+ return "Unknown:" + item.getMediaType();
+ }
+ }
+
}
diff --git a/src_pd/com/android/gallery3d/util/UsageStatistics.java b/src_pd/com/android/gallery3d/util/UsageStatistics.java
index 9246ab10a..9549b8ff4 100644
--- a/src_pd/com/android/gallery3d/util/UsageStatistics.java
+++ b/src_pd/com/android/gallery3d/util/UsageStatistics.java
@@ -39,6 +39,7 @@ public class UsageStatistics {
public static final String ACTION_CAPTURE_START = "CaptureStart";
public static final String ACTION_CAPTURE_FAIL = "CaptureFail";
public static final String ACTION_CAPTURE_DONE = "CaptureDone";
+ public static final String ACTION_SHARE = "Share";
public static void initialize(Context context) {}
public static void showOptInDialogIfNeeded(Activity activity) {}