Merge "Logging for Everglades release." into ub-camera-everglades

2 files changed, 25 insertions, 8 deletions

diff --git a/src/com/android/camera/CameraActivity.java b/src/com/android/camera/CameraActivity.java
index 5e438d198..684463891 100644
--- a/src/com/android/camera/CameraActivity.java
+++ b/src/com/android/camera/CameraActivity.java
@@ -315,7 +315,8 @@ public class CameraActivity extends Activity
                     final int currentDataId = getCurrentDataId();
                     UsageStatistics.instance().mediaInteraction(fileNameFromDataID(currentDataId),
                             MediaInteraction.InteractionType.EDIT,
-                            NavigationChange.InteractionCause.BUTTON);
+                            NavigationChange.InteractionCause.BUTTON,
+                            fileAgeFromDataID(currentDataId));
                     launchEditor(data);
                 }
 
@@ -333,7 +334,8 @@ public class CameraActivity extends Activity
                     final int currentDataId = getCurrentDataId();
                     UsageStatistics.instance().mediaInteraction(fileNameFromDataID(currentDataId),
                             MediaInteraction.InteractionType.DELETE,
-                            NavigationChange.InteractionCause.BUTTON);
+                            NavigationChange.InteractionCause.BUTTON,
+                            fileAgeFromDataID(currentDataId));
                     removeData(currentDataId);
                 }
 
@@ -343,7 +345,8 @@ public class CameraActivity extends Activity
                     final int currentDataId = getCurrentDataId();
                     UsageStatistics.instance().mediaInteraction(fileNameFromDataID(currentDataId),
                             MediaInteraction.InteractionType.SHARE,
-                            NavigationChange.InteractionCause.BUTTON);
+                            NavigationChange.InteractionCause.BUTTON,
+                            fileAgeFromDataID(currentDataId));
                     // If applicable, show release information before this item
                     // is shared.
                     if (ReleaseDialogHelper.shouldShowReleaseInfoDialogOnShare(data)) {
@@ -548,6 +551,13 @@ public class CameraActivity extends Activity
         return localFile.getName();
     }
 
+    private float fileAgeFromDataID(int dataID) {
+        final LocalData localData = mDataAdapter.getLocalData(dataID);
+
+        File localFile = new File(localData.getPath());
+        return 0.001f * (System.currentTimeMillis() - localFile.lastModified());
+    }
+
     private final FilmstripContentPanel.Listener mFilmstripListener =
             new FilmstripContentPanel.Listener() {
 
@@ -592,7 +602,7 @@ public class CameraActivity extends Activity
                 public void onFocusedDataPromoted(int dataID) {
                     UsageStatistics.instance().mediaInteraction(fileNameFromDataID(dataID),
                             MediaInteraction.InteractionType.DELETE,
-                            NavigationChange.InteractionCause.SWIPE_UP);
+                            NavigationChange.InteractionCause.SWIPE_UP, fileAgeFromDataID(dataID));
                     removeData(dataID);
                 }
 
@@ -600,7 +610,8 @@ public class CameraActivity extends Activity
                 public void onFocusedDataDemoted(int dataID) {
                     UsageStatistics.instance().mediaInteraction(fileNameFromDataID(dataID),
                             MediaInteraction.InteractionType.DELETE,
-                            NavigationChange.InteractionCause.SWIPE_DOWN);
+                            NavigationChange.InteractionCause.SWIPE_DOWN,
+                            fileAgeFromDataID(dataID));
                     removeData(dataID);
                 }
 
@@ -786,7 +797,7 @@ public class CameraActivity extends Activity
         }
         UsageStatistics.instance().mediaInteraction(fileNameFromDataID(currentDataId),
                 MediaInteraction.InteractionType.SHARE,
-                NavigationChange.InteractionCause.BUTTON);
+                NavigationChange.InteractionCause.BUTTON, fileAgeFromDataID(currentDataId));
         // TODO add intent.getComponent().getPackageName()
         return true;
     }
@@ -1487,6 +1498,9 @@ public class CameraActivity extends Activity
         mLocalVideosObserver.setActivityPaused(true);
         mPreloader.cancelAllLoads();
         resetScreenOn();
+
+        UsageStatistics.instance().backgrounded();
+
         super.onPause();
     }
 
@@ -1854,10 +1868,11 @@ public class CameraActivity extends Activity
                 mStorageHint.setText(message);
             }
             mStorageHint.show();
+            UsageStatistics.instance().storageWarning(storageSpace);
         } else if (mStorageHint != null) {
             mStorageHint.cancel();
             mStorageHint = null;
-       }
+        }
     }
 
     protected void setResultEx(int resultCode) {
@@ -2526,7 +2541,7 @@ public class CameraActivity extends Activity
         detailDialog.show();
         UsageStatistics.instance().mediaInteraction(
                 fileNameFromDataID(dataId), MediaInteraction.InteractionType.DETAILS,
-                NavigationChange.InteractionCause.BUTTON);
+                NavigationChange.InteractionCause.BUTTON, fileAgeFromDataID(dataId));
     }
 
     /**
diff --git a/src/com/android/camera/app/CameraApp.java b/src/com/android/camera/app/CameraApp.java
index 7c1a9c67e..df2bb4fcf 100644
--- a/src/com/android/camera/app/CameraApp.java
+++ b/src/com/android/camera/app/CameraApp.java
@@ -53,6 +53,8 @@ public class CameraApp extends Application implements CameraServices {
         Context context = getApplicationContext();
         LogHelper.initialize(context);
 
+        // It is important that this gets called early in execution before the app has had
+        // the opportunity to create any shared preferences.
         UsageStatistics.instance().initialize(this);
         SessionStatsCollector.instance().initialize(this);
         CameraUtil.initialize(this);