commit 426901fb6adf728742ad2841ac595bc1414f3568
author Erin Dahlgren <edahlgren@google.com> Thu Jan 30 23:05:29 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jan 30 23:05:30 2014 +0000
tree 7634b409af97b8d02e2385cd2956f7c55cea6531
parent 1841b11d64fe17193331d3d091cff4a74a789548
parent 772951602f9cfccd097283e3b78d188838c82138

Merge "Add logging for swipe to filmstrip from camera." into gb-ub-photos-denali

src/com/android/camera/app/CameraAppUI.java

diff --git a/src/com/android/camera/app/CameraAppUI.java b/src/com/android/camera/app/CameraAppUI.java
index 889a0f0..9af34f4 100644
--- a/src/com/android/camera/app/CameraAppUI.java
+++ b/src/com/android/camera/app/CameraAppUI.java
@@ -49,11 +49,14 @@
 import com.android.camera.util.ApiHelper;
 import com.android.camera.util.CameraUtil;
 import com.android.camera.util.PhotoSphereHelper;
+import com.android.camera.util.UsageStatistics;
 import com.android.camera.widget.FilmstripLayout;
 import com.android.camera.widget.IndicatorIconController;
 import com.android.camera.widget.IndicatorOverlay;
 import com.android.camera2.R;
 
+import com.google.common.logging.eventprotos;
+
 /**
  * CameraAppUI centralizes control of views shared across modules. Whereas module
  * specific views will be handled in each Module UI. For example, we can now
@@ -627,6 +630,8 @@
             }
         } else if (swipeState == SWIPE_LEFT) {
             // Pass the touch sequence to filmstrip layout.
+            UsageStatistics.changeScreen(eventprotos.NavigationChange.Mode.FILMSTRIP,
+                eventprotos.CameraEvent.InteractionCause.SWIPE_LEFT);
             mAppRootView.redirectTouchEventsTo(mFilmstripLayout);
         } else if (swipeState == SWIPE_RIGHT) {
             // Pass the touch to mode switcher

src/com/android/camera/ui/MainActivityLayout.java

diff --git a/src/com/android/camera/ui/MainActivityLayout.java b/src/com/android/camera/ui/MainActivityLayout.java
index 4ea2aae..14bec95 100644
--- a/src/com/android/camera/ui/MainActivityLayout.java
+++ b/src/com/android/camera/ui/MainActivityLayout.java
@@ -27,9 +27,12 @@
 import android.view.ViewConfiguration;
 import android.widget.FrameLayout;
 
+import com.android.camera.util.UsageStatistics;
 import com.android.camera.widget.FilmstripLayout;
 import com.android.camera2.R;
 
+import com.google.common.logging.eventprotos;
+
 public class MainActivityLayout extends FrameLayout {
 
     // Only check for intercepting touch events within first 500ms
@@ -110,6 +113,8 @@
                 // Intercept left swipe
                 else if (deltaX < -Math.abs(deltaY) * 2) {
                     mTouchReceiver = mFilmstripLayout;
+                    UsageStatistics.changeScreen(eventprotos.NavigationChange.Mode.FILMSTRIP,
+                            eventprotos.CameraEvent.InteractionCause.SWIPE_LEFT);
                     onTouchEvent(mDown);
                     return true;
                 }

src/com/android/camera/widget/FilmstripView.java

diff --git a/src/com/android/camera/widget/FilmstripView.java b/src/com/android/camera/widget/FilmstripView.java
index 5aaddec..247c27a 100644
--- a/src/com/android/camera/widget/FilmstripView.java
+++ b/src/com/android/camera/widget/FilmstripView.java
@@ -41,9 +41,7 @@
 import com.android.camera.filmstrip.ImageData;
 import com.android.camera.ui.FilmstripGestureRecognizer;
 import com.android.camera.ui.ZoomView;
-import com.android.camera.util.UsageStatistics;
 import com.android.camera2.R;
-import com.google.common.logging.eventprotos;
 
 import java.util.Arrays;
 
@@ -1495,8 +1493,6 @@
                     && deltaX < mSlop * (-1)) {
                 // intercept left swipe
                 if (Math.abs(deltaX) >= Math.abs(deltaY) * 2) {
-                    UsageStatistics.changeScreen(eventprotos.NavigationChange.Mode.FILMSTRIP,
-                            eventprotos.CameraEvent.InteractionCause.SWIPE_LEFT);
                     return true;
                 }
             }