diff options
| author | Bobby Georgescu <georgescu@google.com> | 2013-04-02 20:09:50 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-04-02 20:09:50 +0000 |
| commit | 0235199a906f7cda3713a689018930912688b866 (patch) | |
| tree | b55cb76d576224996180dd3c0c99b93bea6d1502 | |
| parent | 187a09a330f9c62783741b85b86b12610b2f595d (diff) | |
| parent | 301b64679cfbd452060ac5b9595d315135550120 (diff) | |
| download | android_packages_apps_Snap-0235199a906f7cda3713a689018930912688b866.tar.gz android_packages_apps_Snap-0235199a906f7cda3713a689018930912688b866.tar.bz2 android_packages_apps_Snap-0235199a906f7cda3713a689018930912688b866.zip | |
Merge "Usage statistics for photo and video capture" into gb-ub-photos-bryce
| -rw-r--r-- | src/com/android/camera/PhotoModule.java | 2 | ||||
| -rw-r--r-- | src/com/android/camera/VideoModule.java | 8 | ||||
| -rw-r--r-- | src_pd/com/android/gallery3d/util/UsageStatistics.java | 4 |
3 files changed, 14 insertions, 0 deletions
diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java index f4bd4ce1d..22bd6503f 100644 --- a/src/com/android/camera/PhotoModule.java +++ b/src/com/android/camera/PhotoModule.java @@ -1013,6 +1013,8 @@ public class PhotoModule mFaceDetectionStarted = false; setCameraState(SNAPSHOT_IN_PROGRESS); + UsageStatistics.onEvent(UsageStatistics.COMPONENT_CAMERA, + UsageStatistics.ACTION_CAPTURE_DONE, "Photo"); return true; } diff --git a/src/com/android/camera/VideoModule.java b/src/com/android/camera/VideoModule.java index 1f31778df..09a406ce5 100644 --- a/src/com/android/camera/VideoModule.java +++ b/src/com/android/camera/VideoModule.java @@ -450,6 +450,8 @@ public class VideoModule implements CameraModule, mActivity.mCameraDevice.takePicture(null, null, null, new JpegPictureCallback(loc)); showVideoSnapshotUI(true); mSnapshotInProgress = true; + UsageStatistics.onEvent(UsageStatistics.COMPONENT_CAMERA, + UsageStatistics.ACTION_CAPTURE_DONE, "VideoSnapshot"); } @Override @@ -1547,6 +1549,8 @@ public class VideoModule implements CameraModule, updateRecordingTime(); keepScreenOn(); + UsageStatistics.onEvent(UsageStatistics.COMPONENT_CAMERA, + UsageStatistics.ACTION_CAPTURE_START, "Video"); } private void showCaptureResult() { @@ -1662,6 +1666,10 @@ public class VideoModule implements CameraModule, // Update the parameters here because the parameters might have been altered // by MediaRecorder. if (!mPaused) mParameters = mActivity.mCameraDevice.getParameters(); + UsageStatistics.onEvent(UsageStatistics.COMPONENT_CAMERA, + fail ? UsageStatistics.ACTION_CAPTURE_FAIL : + UsageStatistics.ACTION_CAPTURE_DONE, "Video", + SystemClock.uptimeMillis() - mRecordingStartTime); return fail; } diff --git a/src_pd/com/android/gallery3d/util/UsageStatistics.java b/src_pd/com/android/gallery3d/util/UsageStatistics.java index cf27ac58f..9246ab10a 100644 --- a/src_pd/com/android/gallery3d/util/UsageStatistics.java +++ b/src_pd/com/android/gallery3d/util/UsageStatistics.java @@ -36,6 +36,10 @@ public class UsageStatistics { public static final String TRANSITION_BUTTON_TAP = "ButtonTap"; public static final String TRANSITION_SWIPE = "Swipe"; + 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 void initialize(Context context) {} public static void showOptInDialogIfNeeded(Activity activity) {} public static void setPendingTransitionCause(String cause) {} |