summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorBobby Georgescu <georgescu@google.com>2013-03-13 21:21:32 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-03-13 21:21:32 +0000
commite0ebb91d3b5a740f04ec0d1339bd21a769e1a5c6 (patch)
tree4fedbe7aa2eb4994d770c46ab723fd544eddf3ac /src
parenta27f45a5c142ec752f68ba752542972476dae8eb (diff)
parent03fc4e9aa172e091134d9dec8f51087cb6581c0d (diff)
downloadandroid_packages_apps_Snap-e0ebb91d3b5a740f04ec0d1339bd21a769e1a5c6.tar.gz
android_packages_apps_Snap-e0ebb91d3b5a740f04ec0d1339bd21a769e1a5c6.tar.bz2
android_packages_apps_Snap-e0ebb91d3b5a740f04ec0d1339bd21a769e1a5c6.zip
Merge "Add coarse grained events for camera mode, filmstrip stats" into gb-ub-photos-bryce
Diffstat (limited to 'src')
-rw-r--r--src/com/android/camera/ui/CameraSwitcher.java1
-rw-r--r--src/com/android/gallery3d/app/PhotoPage.java4
2 files changed, 5 insertions, 0 deletions
diff --git a/src/com/android/camera/ui/CameraSwitcher.java b/src/com/android/camera/ui/CameraSwitcher.java
index 75906acbe..e9551ada2 100644
--- a/src/com/android/camera/ui/CameraSwitcher.java
+++ b/src/com/android/camera/ui/CameraSwitcher.java
@@ -107,6 +107,7 @@ public class CameraSwitcher extends RotateImageView
private void onCameraSelected(int ix) {
hidePopup();
if ((ix != mCurrentIndex) && (mListener != null)) {
+ UsageStatistics.onEvent("CameraModeSwitch", null, null);
UsageStatistics.setPendingTransitionCause(
UsageStatistics.TRANSITION_MENU_TAP);
setCurrentIndex(ix);
diff --git a/src/com/android/gallery3d/app/PhotoPage.java b/src/com/android/gallery3d/app/PhotoPage.java
index 84030896a..fe6840ecb 100644
--- a/src/com/android/gallery3d/app/PhotoPage.java
+++ b/src/com/android/gallery3d/app/PhotoPage.java
@@ -514,6 +514,10 @@ public abstract class PhotoPage extends ActivityState implements
if (oldIndex == 0 && mCurrentIndex > 0
&& !mPhotoView.getFilmMode()) {
mPhotoView.setFilmMode(true);
+ if (mAppBridge != null) {
+ UsageStatistics.onEvent("CameraToFilmstrip",
+ UsageStatistics.TRANSITION_SWIPE, null);
+ }
} else if (oldIndex == 2 && mCurrentIndex == 1) {
mCameraSwitchCutoff = SystemClock.uptimeMillis() +
CAMERA_SWITCH_CUTOFF_THRESHOLD_MS;