Usage statistics collection for camera module, filmstrip

Change-Id: Ib3e7dfb8948e99541f6d492c7d7bd4bfbad1e53d

3 files changed, 28 insertions, 3 deletions

diff --git a/src/com/android/gallery3d/app/PhotoPage.java b/src/com/android/gallery3d/app/PhotoPage.java
index 44ff62feb..84030896a 100644
--- a/src/com/android/gallery3d/app/PhotoPage.java
+++ b/src/com/android/gallery3d/app/PhotoPage.java
@@ -69,6 +69,7 @@ import com.android.gallery3d.ui.PhotoView;
 import com.android.gallery3d.ui.SelectionManager;
 import com.android.gallery3d.ui.SynchronizedHandler;
 import com.android.gallery3d.util.GalleryUtils;
+import com.android.gallery3d.util.UsageStatistics;
 
 public abstract class PhotoPage extends ActivityState implements
         PhotoView.Listener, AppBridge.Server,
@@ -1338,8 +1339,17 @@ public abstract class PhotoPage extends ActivityState implements
         }
         if (enabled) {
             mHandler.removeMessages(MSG_HIDE_BARS);
+            UsageStatistics.onContentViewChanged(
+                    UsageStatistics.COMPONENT_GALLERY, "FilmstripPage");
         } else {
             refreshHidingMessage();
+            if (mAppBridge == null || mCurrentIndex > 0) {
+                UsageStatistics.onContentViewChanged(
+                        UsageStatistics.COMPONENT_GALLERY, "SinglePhotoPage");
+            } else {
+                UsageStatistics.onContentViewChanged(
+                        UsageStatistics.COMPONENT_CAMERA, "Unknown"); // TODO
+            }
         }
     }
 
diff --git a/src/com/android/gallery3d/app/StateManager.java b/src/com/android/gallery3d/app/StateManager.java
index b4b5d4b05..c0c84c950 100644
--- a/src/com/android/gallery3d/app/StateManager.java
+++ b/src/com/android/gallery3d/app/StateManager.java
@@ -24,6 +24,7 @@ import android.os.Parcelable;
 import android.view.Menu;
 import android.view.MenuItem;
 
+import com.android.camera.CameraActivity;
 import com.android.gallery3d.anim.StateTransitionAnimation;
 import com.android.gallery3d.common.Utils;
 import com.android.gallery3d.util.UsageStatistics;
@@ -63,9 +64,14 @@ public class StateManager {
                     StateTransitionAnimation.Transition.Incoming);
             if (mIsResumed) top.onPause();
         }
-        UsageStatistics.onContentViewChanged(
-                UsageStatistics.COMPONENT_GALLERY,
-                klass.getSimpleName());
+        // Ignore the filmstrip used for the root of the camera app
+        boolean ignoreHit = (mActivity instanceof CameraActivity)
+                && mStack.isEmpty();
+        if (!ignoreHit) {
+            UsageStatistics.onContentViewChanged(
+                    UsageStatistics.COMPONENT_GALLERY,
+                    klass.getSimpleName());
+        }
         state.initialize(mActivity, data);
 
         mStack.push(new StateEntry(data, state));
diff --git a/src/com/android/gallery3d/ui/PhotoView.java b/src/com/android/gallery3d/ui/PhotoView.java
index 40e01ab07..5c8ac1c3e 100644
--- a/src/com/android/gallery3d/ui/PhotoView.java
+++ b/src/com/android/gallery3d/ui/PhotoView.java
@@ -42,6 +42,7 @@ import com.android.gallery3d.glrenderer.StringTexture;
 import com.android.gallery3d.glrenderer.Texture;
 import com.android.gallery3d.util.GalleryUtils;
 import com.android.gallery3d.util.RangeArray;
+import com.android.gallery3d.util.UsageStatistics;
 
 public class PhotoView extends GLView {
     @SuppressWarnings("unused")
@@ -1180,8 +1181,16 @@ public class PhotoView extends GLView {
                     // Removing the touch down flag allows snapback to happen
                     // for film mode change.
                     mHolding &= ~HOLD_TOUCH_DOWN;
+                    if (mFilmMode) {
+                        UsageStatistics.setPendingTransitionCause(
+                                UsageStatistics.TRANSITION_PINCH_OUT);
+                    } else {
+                        UsageStatistics.setPendingTransitionCause(
+                                UsageStatistics.TRANSITION_PINCH_IN);
+                    }
                     setFilmMode(!mFilmMode);
 
+
                     // We need to call onScaleEnd() before setting mModeChanged
                     // to true.
                     onScaleEnd();