Update logging for new infrastructure
am: bd536c637a
Change-Id: I35e71d7bb3eb0c4ed59a14f1ac65d46d60fc4239
diff --git a/src/com/android/wallpaper/module/DailyLoggingAlarmReceiver.java b/src/com/android/wallpaper/module/DailyLoggingAlarmReceiver.java
index 9055907..ba925b4 100755
--- a/src/com/android/wallpaper/module/DailyLoggingAlarmReceiver.java
+++ b/src/com/android/wallpaper/module/DailyLoggingAlarmReceiver.java
@@ -58,7 +58,6 @@
logger.logNumDailyWallpaperRotationsInLastWeek();
logger.logNumDailyWallpaperRotationsPreviousDay();
logger.logWallpaperPresentationMode();
- logDailyActive(appContext);
preferences.setLastDailyLogTimestamp(System.currentTimeMillis());
@@ -68,42 +67,6 @@
DiskBasedLogger.clearOldLogs(appContext);
}
- private void logDailyActive(Context appContext) {
- Injector injector = InjectorProvider.getInjector();
- UserEventLogger logger = injector.getUserEventLogger(appContext);
- WallpaperPreferences preferences = injector.getPreferences(appContext);
-
- long lastAppLaunchTimestamp = preferences.getLastAppActiveTimestamp();
-
- Calendar calendar = Calendar.getInstance();
- // Subtract 28 days first to get a date 28 days ago to assess 28 day active, then add back
- // enough days to calculate 14 day active, 7 day active, and 1 day active.
- calendar.add(Calendar.DAY_OF_YEAR, -28);
- long twentyEightDaysAgo = calendar.getTimeInMillis();
-
- calendar.add(Calendar.DAY_OF_YEAR, 14);
- long fourteenDaysAgo = calendar.getTimeInMillis();
-
- calendar.add(Calendar.DAY_OF_YEAR, 7);
- long sevenDaysAgo = calendar.getTimeInMillis();
-
- calendar.add(Calendar.DAY_OF_YEAR, 6);
- long oneDayAgo = calendar.getTimeInMillis();
-
- if (lastAppLaunchTimestamp >= oneDayAgo) {
- logger.log1DayActive();
- }
- if (lastAppLaunchTimestamp >= sevenDaysAgo) {
- logger.log7DayActive();
- }
- if (lastAppLaunchTimestamp >= fourteenDaysAgo) {
- logger.log14DayActive();
- }
- if (lastAppLaunchTimestamp >= twentyEightDaysAgo) {
- logger.log28DayActive();
- }
- }
-
/**
* If daily wallpapers are currently in effect and were enabled more than 24 hours ago, then log
* the last-known rotation status as reported by the periodic background rotation components
diff --git a/src/com/android/wallpaper/module/NoOpUserEventLogger.java b/src/com/android/wallpaper/module/NoOpUserEventLogger.java
index 40c5d34..1d780fe 100755
--- a/src/com/android/wallpaper/module/NoOpUserEventLogger.java
+++ b/src/com/android/wallpaper/module/NoOpUserEventLogger.java
@@ -81,22 +81,6 @@
}
@Override
- public void log1DayActive() {
- }
-
- @Override
- public void log7DayActive() {
- }
-
- @Override
- public void log14DayActive() {
- }
-
- @Override
- public void log28DayActive() {
- }
-
- @Override
public void logDailyWallpaperDecodes(boolean decodes) {
}
@@ -149,8 +133,4 @@
@Override
public void logRestored() {
}
-
- @Override
- public void logWallpaperPosition(@WallpaperPosition int wallpaperPosition) {
- }
}
diff --git a/src/com/android/wallpaper/module/UserEventLogger.java b/src/com/android/wallpaper/module/UserEventLogger.java
index 0cd62aa..5952396 100755
--- a/src/com/android/wallpaper/module/UserEventLogger.java
+++ b/src/com/android/wallpaper/module/UserEventLogger.java
@@ -89,26 +89,6 @@
void logDailyWallpaperRotationHour(int hour);
/**
- * Logs that the user is a 1 day active.
- */
- void log1DayActive();
-
- /**
- * Logs that the user is a 7 day active.
- */
- void log7DayActive();
-
- /**
- * Logs that the user is a 14 day active.
- */
- void log14DayActive();
-
- /**
- * Logs that the user is a 28 day active.
- */
- void log28DayActive();
-
- /**
* Logs whether the image file for the daily wallpaper "rotating image wallpaper" is successfully
* decoded as a bitmap.
*
@@ -182,11 +162,6 @@
void logRestored();
/**
- * Logs the wallpaper position of a custom photo wallpaper set by the user on desktop.
- */
- void logWallpaperPosition(@WallpaperPosition int wallpaperPosition);
-
- /**
* Possible results of a "set wallpaper" operation.
*/
@IntDef({
diff --git a/src/com/android/wallpaper/picker/TopLevelPickerActivity.java b/src/com/android/wallpaper/picker/TopLevelPickerActivity.java
index 553a19a..7e0da5e 100755
--- a/src/com/android/wallpaper/picker/TopLevelPickerActivity.java
+++ b/src/com/android/wallpaper/picker/TopLevelPickerActivity.java
@@ -185,7 +185,7 @@
@Override
protected void onResume() {
super.onResume();
-
+ mUserEventLogger.logResumed();
// Show the staged 'load wallpaper' or 'set wallpaper' error dialog fragments if there is one
// that was unable to be shown earlier when this fragment's hosting activity didn't allow
// committing fragment transactions.
@@ -197,6 +197,12 @@
}
@Override
+ protected void onStop() {
+ mUserEventLogger.logStopped();
+ super.onStop();
+ }
+
+ @Override
protected void onDestroy() {
super.onDestroy();
mDelegate.cleanUp();
@@ -210,11 +216,6 @@
if (mSetWallpaperProgressDialog != null) {
mSetWallpaperProgressDialog.dismiss();
}
-
- if (mDelegate.getFormFactor() == FormFactorChecker.FORM_FACTOR_DESKTOP
- && mWasCustomPhotoWallpaperSet) {
- mUserEventLogger.logWallpaperPosition(mCustomPhotoWallpaperPosition);
- }
}
@Override