Move stats to new package.

Change-Id: Idfab1a24c91ff4c96515f3520283c7a0512d0514

10 files changed, 11 insertions, 14 deletions

diff --git a/src/com/android/camera/CameraActivity.java b/src/com/android/camera/CameraActivity.java
index 82ce47401..ffd580b5b 100644
--- a/src/com/android/camera/CameraActivity.java
+++ b/src/com/android/camera/CameraActivity.java
@@ -116,6 +116,7 @@ import com.android.camera.settings.ResolutionSetting;
 import com.android.camera.settings.ResolutionUtil;
 import com.android.camera.settings.SettingsManager;
 import com.android.camera.settings.SettingsUtil;
+import com.android.camera.stats.UsageStatistics;
 import com.android.camera.tinyplanet.TinyPlanetFragment;
 import com.android.camera.ui.AbstractTutorialOverlay;
 import com.android.camera.ui.DetailsDialog;
@@ -133,7 +134,6 @@ import com.android.camera.util.IntentHelper;
 import com.android.camera.util.PhotoSphereHelper.PanoramaViewHelper;
 import com.android.camera.util.QuickActivity;
 import com.android.camera.util.ReleaseHelper;
-import com.android.camera.util.UsageStatistics;
 import com.android.camera.widget.FilmstripView;
 import com.android.camera.widget.Preloader;
 import com.android.camera2.R;
diff --git a/src/com/android/camera/CaptureModule.java b/src/com/android/camera/CaptureModule.java
index a3b97929f..d6e4bcd92 100644
--- a/src/com/android/camera/CaptureModule.java
+++ b/src/com/android/camera/CaptureModule.java
@@ -79,7 +79,7 @@ import com.android.camera.ui.focus.FocusSound;
 import com.android.camera.util.CameraUtil;
 import com.android.camera.util.GcamHelper;
 import com.android.camera.util.Size;
-import com.android.camera.util.UsageStatistics;
+import com.android.camera.stats.UsageStatistics;
 import com.android.camera2.R;
 import com.android.ex.camera2.portability.CameraAgent.CameraProxy;
 
diff --git a/src/com/android/camera/FocusOverlayManager.java b/src/com/android/camera/FocusOverlayManager.java
index 92372e4d3..17dba4425 100644
--- a/src/com/android/camera/FocusOverlayManager.java
+++ b/src/com/android/camera/FocusOverlayManager.java
@@ -35,7 +35,7 @@ import com.android.camera.util.ApiHelper;
 import com.android.camera.ui.focus.CameraCoordinateTransformer;
 import com.android.camera.ui.focus.FocusRing;
 import com.android.camera.util.CameraUtil;
-import com.android.camera.util.UsageStatistics;
+import com.android.camera.stats.UsageStatistics;
 import com.android.ex.camera2.portability.CameraCapabilities;
 
 import java.lang.ref.WeakReference;
diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java
index ea85a0247..d50bcc7a1 100644
--- a/src/com/android/camera/PhotoModule.java
+++ b/src/com/android/camera/PhotoModule.java
@@ -63,15 +63,15 @@ import com.android.camera.settings.CameraPictureSizesCacher;
 import com.android.camera.settings.Keys;
 import com.android.camera.settings.ResolutionUtil;
 import com.android.camera.settings.SettingsManager;
+import com.android.camera.stats.UsageStatistics;
 import com.android.camera.ui.CountDownView;
 import com.android.camera.ui.TouchCoordinate;
 import com.android.camera.util.ApiHelper;
 import com.android.camera.util.CameraUtil;
 import com.android.camera.util.GcamHelper;
 import com.android.camera.util.GservicesHelper;
-import com.android.camera.util.SessionStatsCollector;
+import com.android.camera.stats.SessionStatsCollector;
 import com.android.camera.util.Size;
-import com.android.camera.util.UsageStatistics;
 import com.android.camera2.R;
 import com.android.ex.camera2.portability.CameraAgent;
 import com.android.ex.camera2.portability.CameraAgent.CameraAFCallback;
diff --git a/src/com/android/camera/VideoModule.java b/src/com/android/camera/VideoModule.java
index ba2395197..4709755aa 100644
--- a/src/com/android/camera/VideoModule.java
+++ b/src/com/android/camera/VideoModule.java
@@ -16,7 +16,6 @@
 
 package com.android.camera;
 
-import android.annotation.TargetApi;
 import android.app.Activity;
 import android.content.ActivityNotFoundException;
 import android.content.BroadcastReceiver;
@@ -66,7 +65,7 @@ import com.android.camera.settings.SettingsUtil;
 import com.android.camera.ui.TouchCoordinate;
 import com.android.camera.util.ApiHelper;
 import com.android.camera.util.CameraUtil;
-import com.android.camera.util.UsageStatistics;
+import com.android.camera.stats.UsageStatistics;
 import com.android.camera.util.Size;
 import com.android.camera2.R;
 import com.android.ex.camera2.portability.CameraAgent;
diff --git a/src/com/android/camera/app/CameraApp.java b/src/com/android/camera/app/CameraApp.java
index 3bcbf93d6..1427767db 100644
--- a/src/com/android/camera/app/CameraApp.java
+++ b/src/com/android/camera/app/CameraApp.java
@@ -35,8 +35,8 @@ import com.android.camera.session.StackSaverFactory;
 import com.android.camera.settings.SettingsManager;
 import com.android.camera.util.CameraUtil;
 import com.android.camera.util.RemoteShutterHelper;
-import com.android.camera.util.SessionStatsCollector;
-import com.android.camera.util.UsageStatistics;
+import com.android.camera.stats.SessionStatsCollector;
+import com.android.camera.stats.UsageStatistics;
 
 /**
  * The Camera application class containing important services and functionality
diff --git a/src/com/android/camera/ui/MainActivityLayout.java b/src/com/android/camera/ui/MainActivityLayout.java
index fdee0e527..2b6cf120e 100644
--- a/src/com/android/camera/ui/MainActivityLayout.java
+++ b/src/com/android/camera/ui/MainActivityLayout.java
@@ -29,10 +29,8 @@ import android.widget.FrameLayout;
 import com.android.camera.app.CameraAppUI;
 import com.android.camera.debug.Log;
 import com.android.camera.util.CameraUtil;
-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 {
 
diff --git a/src/com/android/camera/ui/ModeListView.java b/src/com/android/camera/ui/ModeListView.java
index 85ac06fa0..5c7e2b6d5 100644
--- a/src/com/android/camera/ui/ModeListView.java
+++ b/src/com/android/camera/ui/ModeListView.java
@@ -45,7 +45,7 @@ import com.android.camera.app.CameraAppUI;
 import com.android.camera.debug.Log;
 import com.android.camera.util.CameraUtil;
 import com.android.camera.util.Gusterpolator;
-import com.android.camera.util.UsageStatistics;
+import com.android.camera.stats.UsageStatistics;
 import com.android.camera.widget.AnimationEffects;
 import com.android.camera.widget.SettingsCling;
 import com.android.camera2.R;
diff --git a/src_pd/com/android/camera/util/SessionStatsCollector.java b/src_pd/com/android/camera/stats/SessionStatsCollector.java
index ef1453431..4974c679f 100644
--- a/src_pd/com/android/camera/util/SessionStatsCollector.java
+++ b/src_pd/com/android/camera/stats/SessionStatsCollector.java
@@ -1,4 +1,4 @@
-package com.android.camera.util;
+package com.android.camera.stats;
 
 import android.content.Context;
 
diff --git a/src_pd/com/android/camera/util/UsageStatistics.java b/src_pd/com/android/camera/stats/UsageStatistics.java
index 6c208dec7..b563d81a5 100644
--- a/src_pd/com/android/camera/util/UsageStatistics.java
+++ b/src_pd/com/android/camera/stats/UsageStatistics.java
@@ -15,7 +15,7 @@
  */
 
 
-package com.android.camera.util;
+package com.android.camera.stats;
 
 import android.content.Context;