4 files changed, 12 insertions, 0 deletions
diff --git a/src/com/android/camera/PanoramaModule.java b/src/com/android/camera/PanoramaModule.java
index 2703c3596..623d96dc6 100644
--- a/src/com/android/camera/PanoramaModule.java
+++ b/src/com/android/camera/PanoramaModule.java
@@ -66,6 +66,7 @@ import com.android.gallery3d.exif.ExifOutputStream;
 import com.android.gallery3d.exif.ExifReader;
 import com.android.gallery3d.exif.ExifTag;
 import com.android.gallery3d.ui.GLRootView;
+import com.android.gallery3d.util.UsageStatistics;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -1101,6 +1102,8 @@ public class PanoramaModule implements CameraModule,
         // Dismiss open menu if exists.
         PopupManager.getInstance(mActivity).notifyShowPopup(null);
         mRootView.requestLayout();
+        UsageStatistics.onContentViewChanged(
+                UsageStatistics.COMPONENT_CAMERA, "PanoramaModule");
     }
 
     /**
diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java
index 4c627c92c..037e0fdb3 100644
--- a/src/com/android/camera/PhotoModule.java
+++ b/src/com/android/camera/PhotoModule.java
@@ -58,6 +58,7 @@ import com.android.gallery3d.R;
 import com.android.gallery3d.common.ApiHelper;
 import com.android.gallery3d.filtershow.CropExtras;
 import com.android.gallery3d.filtershow.FilterShowActivity;
+import com.android.gallery3d.util.UsageStatistics;
 
 import java.io.File;
 import java.io.FileNotFoundException;
@@ -1255,6 +1256,8 @@ public class PhotoModule
 
         // Dismiss open menu if exists.
         PopupManager.getInstance(mActivity).notifyShowPopup(null);
+        UsageStatistics.onContentViewChanged(
+                UsageStatistics.COMPONENT_CAMERA, "PhotoModule");
     }
 
     void waitCameraStartUpThread() {
diff --git a/src/com/android/camera/VideoModule.java b/src/com/android/camera/VideoModule.java
index a168372d1..4ae46a897 100644
--- a/src/com/android/camera/VideoModule.java
+++ b/src/com/android/camera/VideoModule.java
@@ -77,6 +77,7 @@ import com.android.camera.ui.ZoomRenderer;
 import com.android.gallery3d.R;
 import com.android.gallery3d.common.ApiHelper;
 import com.android.gallery3d.util.AccessibilityUtils;
+import com.android.gallery3d.util.UsageStatistics;
 
 import java.io.File;
 import java.io.IOException;
@@ -866,6 +867,8 @@ public class VideoModule implements CameraModule,
         PopupManager.getInstance(mActivity).notifyShowPopup(null);
 
         mVideoNamer = new VideoNamer();
+        UsageStatistics.onContentViewChanged(
+                UsageStatistics.COMPONENT_CAMERA, "VideoModule");
     }
 
     private void setDisplayOrientation() {
diff --git a/src/com/android/camera/ui/CameraSwitcher.java b/src/com/android/camera/ui/CameraSwitcher.java
index ce4f85003..75906acbe 100644
--- a/src/com/android/camera/ui/CameraSwitcher.java
+++ b/src/com/android/camera/ui/CameraSwitcher.java
@@ -38,6 +38,7 @@ import android.widget.LinearLayout;
 import com.android.camera.Util;
 import com.android.gallery3d.R;
 import com.android.gallery3d.common.ApiHelper;
+import com.android.gallery3d.util.UsageStatistics;
 
 public class CameraSwitcher extends RotateImageView
         implements OnClickListener, OnTouchListener {
@@ -106,6 +107,8 @@ public class CameraSwitcher extends RotateImageView
     private void onCameraSelected(int ix) {
         hidePopup();
         if ((ix != mCurrentIndex) && (mListener != null)) {
+            UsageStatistics.setPendingTransitionCause(
+                    UsageStatistics.TRANSITION_MENU_TAP);
             setCurrentIndex(ix);
             mListener.onCameraSelected(mModuleIds[ix]);
         }