summaryrefslogtreecommitdiffstats
path: root/src/com/android/gallery3d/app
diff options
context:
space:
mode:
authorBobby Georgescu <georgescu@google.com>2013-03-12 22:45:17 -0700
committerBobby Georgescu <georgescu@google.com>2013-03-12 22:45:17 -0700
commit0a7dd573732a06879b35cdd07a8c0ee08b62a32e (patch)
tree620d78edaf9742b259130cc6612080822ac2b902 /src/com/android/gallery3d/app
parentb2edf4808b52024ca6f84bfa63e9d167407dc68d (diff)
downloadandroid_packages_apps_Snap-0a7dd573732a06879b35cdd07a8c0ee08b62a32e.tar.gz
android_packages_apps_Snap-0a7dd573732a06879b35cdd07a8c0ee08b62a32e.tar.bz2
android_packages_apps_Snap-0a7dd573732a06879b35cdd07a8c0ee08b62a32e.zip
Usage statistics collection for camera module, filmstrip
Change-Id: Ib3e7dfb8948e99541f6d492c7d7bd4bfbad1e53d
Diffstat (limited to 'src/com/android/gallery3d/app')
-rw-r--r--src/com/android/gallery3d/app/PhotoPage.java10
-rw-r--r--src/com/android/gallery3d/app/StateManager.java12
2 files changed, 19 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));