From c6a38ba5d8a3fbc1ac49f84cbfe635a6a1feaf76 Mon Sep 17 00:00:00 2001 From: thiruram Date: Tue, 16 Jun 2020 18:58:13 -0700 Subject: [PATCH] Replaces StatsLogManager.log with StatsLogManager.logger() Bug: 159170445 Change-Id: Ice6c8a9ae30d8e6b3843bfe42926053849bf9fe0 --- .../hybridhotseat/HotseatEduController.java | 2 +- .../hybridhotseat/HotseatEduDialog.java | 6 +-- .../quickstep/TaskShortcutFactory.java | 7 +-- .../quickstep/views/AllAppsEduView.java | 2 +- .../android/quickstep/views/RecentsView.java | 8 ++-- .../com/android/quickstep/views/TaskView.java | 6 ++- .../logging/StatsLogCompatManager.java | 43 ------------------- .../launcher3/BaseDraggingActivity.java | 3 +- .../android/launcher3/DeleteDropTarget.java | 8 ++-- .../launcher3/SecondaryDropTarget.java | 12 ++++-- src/com/android/launcher3/Workspace.java | 39 ++++++----------- src/com/android/launcher3/folder/Folder.java | 6 +-- .../android/launcher3/folder/FolderIcon.java | 4 +- .../launcher3/logging/StatsLogManager.java | 43 ------------------- .../notification/NotificationInfo.java | 4 +- .../launcher3/popup/RemoteActionShortcut.java | 4 +- .../launcher3/popup/SystemShortcut.java | 7 +-- .../launcher3/touch/ItemClickHandler.java | 3 +- .../touch/WorkspaceTouchListener.java | 2 +- .../launcher3/views/OptionsPopupView.java | 2 +- 20 files changed, 61 insertions(+), 150 deletions(-) diff --git a/quickstep/recents_ui_overrides/src/com/android/launcher3/hybridhotseat/HotseatEduController.java b/quickstep/recents_ui_overrides/src/com/android/launcher3/hybridhotseat/HotseatEduController.java index 5d807d33f8..522a2dc969 100644 --- a/quickstep/recents_ui_overrides/src/com/android/launcher3/hybridhotseat/HotseatEduController.java +++ b/quickstep/recents_ui_overrides/src/com/android/launcher3/hybridhotseat/HotseatEduController.java @@ -265,7 +265,7 @@ public class HotseatEduController { requiresMigration ? R.string.hotseat_tip_no_empty_slots : R.string.hotseat_auto_enrolled), mHotseat.getTop()); - mLauncher.getStatsLogManager().log(LAUNCHER_HOTSEAT_EDU_ONLY_TIP); + mLauncher.getStatsLogManager().logger().log(LAUNCHER_HOTSEAT_EDU_ONLY_TIP); finishOnboarding(); } } diff --git a/quickstep/recents_ui_overrides/src/com/android/launcher3/hybridhotseat/HotseatEduDialog.java b/quickstep/recents_ui_overrides/src/com/android/launcher3/hybridhotseat/HotseatEduDialog.java index 96be5dfe11..2b3f3953ea 100644 --- a/quickstep/recents_ui_overrides/src/com/android/launcher3/hybridhotseat/HotseatEduDialog.java +++ b/quickstep/recents_ui_overrides/src/com/android/launcher3/hybridhotseat/HotseatEduDialog.java @@ -112,13 +112,13 @@ public class HotseatEduDialog extends AbstractSlideInView implements Insettable mHotseatEduController.moveHotseatItems(); mHotseatEduController.finishOnboarding(); - mLauncher.getStatsLogManager().log(LAUNCHER_HOTSEAT_EDU_ACCEPT); + mLauncher.getStatsLogManager().logger().log(LAUNCHER_HOTSEAT_EDU_ACCEPT); } private void onDismiss(View v) { mHotseatEduController.showDimissTip(); mHotseatEduController.finishOnboarding(); - mLauncher.getStatsLogManager().log(LAUNCHER_HOTSEAT_EDU_DENY); + mLauncher.getStatsLogManager().logger().log(LAUNCHER_HOTSEAT_EDU_DENY); handleClose(true); } @@ -212,7 +212,7 @@ public class HotseatEduDialog extends AbstractSlideInView implements Insettable } AbstractFloatingView.closeAllOpenViews(mLauncher); attachToContainer(); - mLauncher.getStatsLogManager().log(LAUNCHER_HOTSEAT_EDU_SEEN); + mLauncher.getStatsLogManager().logger().log(LAUNCHER_HOTSEAT_EDU_SEEN); animateOpen(); populatePreview(predictions); } diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/TaskShortcutFactory.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/TaskShortcutFactory.java index 4eae437f8d..ff051b6db7 100644 --- a/quickstep/recents_ui_overrides/src/com/android/quickstep/TaskShortcutFactory.java +++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/TaskShortcutFactory.java @@ -196,7 +196,8 @@ public interface TaskShortcutFactory { WindowManagerWrapper.getInstance().overridePendingAppTransitionMultiThumbFuture( future, animStartedListener, mHandler, true /* scaleUp */, taskKey.displayId); - mTarget.getStatsLogManager().log(mLauncherEvent, mTaskView.getItemInfo()); + mTarget.getStatsLogManager().logger().withItemInfo(mTaskView.getItemInfo()) + .log(mLauncherEvent); } } } @@ -296,8 +297,8 @@ public interface TaskShortcutFactory { }; mTaskView.launchTask(true, resultCallback, Executors.MAIN_EXECUTOR.getHandler()); dismissTaskMenuView(mTarget); - mTarget.getStatsLogManager().log(LauncherEvent.LAUNCHER_SYSTEM_SHORTCUT_PIN_TAP, - mTaskView.getItemInfo()); + mTarget.getStatsLogManager().logger().withItemInfo(mTaskView.getItemInfo()) + .log(LauncherEvent.LAUNCHER_SYSTEM_SHORTCUT_PIN_TAP); } } diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/views/AllAppsEduView.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/views/AllAppsEduView.java index 6b99f904c3..0979c071bb 100644 --- a/quickstep/recents_ui_overrides/src/com/android/quickstep/views/AllAppsEduView.java +++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/views/AllAppsEduView.java @@ -232,7 +232,7 @@ public class AllAppsEduView extends AbstractFloatingView { launcher, parent); view.init(launcher); launcher.getDragLayer().addView(view); - launcher.getStatsLogManager().log(LAUNCHER_ALL_APPS_EDU_SHOWN); + launcher.getStatsLogManager().logger().log(LAUNCHER_ALL_APPS_EDU_SHOWN); view.requestLayout(); view.playAnimation(); diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/views/RecentsView.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/views/RecentsView.java index 43e9660ba6..bdfc15c63b 100644 --- a/quickstep/recents_ui_overrides/src/com/android/quickstep/views/RecentsView.java +++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/views/RecentsView.java @@ -1347,8 +1347,8 @@ public abstract class RecentsView extends PagedView impl ComponentKey compKey = TaskUtils.getLaunchComponentKeyForTask(taskView.getTask().key); mActivity.getUserEventDispatcher().logTaskLaunchOrDismiss( endState.logAction, Direction.UP, index, compKey); - mActivity.getStatsLogManager().log( - LAUNCHER_TASK_DISMISS_SWIPE_UP, taskView.getItemInfo()); + mActivity.getStatsLogManager().logger().withItemInfo(taskView.getItemInfo()) + .log(LAUNCHER_TASK_DISMISS_SWIPE_UP); } } @@ -1942,8 +1942,8 @@ public abstract class RecentsView extends PagedView impl mActivity.getUserEventDispatcher().logTaskLaunchOrDismiss( endState.logAction, Direction.DOWN, indexOfChild(tv), TaskUtils.getLaunchComponentKeyForTask(task.key)); - mActivity.getStatsLogManager().log( - LAUNCHER_TASK_LAUNCH_SWIPE_DOWN, tv.getItemInfo()); + mActivity.getStatsLogManager().logger().withItemInfo(tv.getItemInfo()) + .log(LAUNCHER_TASK_LAUNCH_SWIPE_DOWN); } } else { onTaskLaunched(false); diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/views/TaskView.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/views/TaskView.java index f2e4127537..411bab49e9 100644 --- a/quickstep/recents_ui_overrides/src/com/android/quickstep/views/TaskView.java +++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/views/TaskView.java @@ -214,7 +214,8 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable { mActivity.getUserEventDispatcher().logTaskLaunchOrDismiss( Touch.TAP, Direction.NONE, getRecentsView().indexOfChild(this), TaskUtils.getLaunchComponentKeyForTask(getTask().key)); - mActivity.getStatsLogManager().log(LAUNCHER_TASK_LAUNCH_TAP, getItemInfo()); + mActivity.getStatsLogManager().logger().withItemInfo(getItemInfo()) + .log(LAUNCHER_TASK_LAUNCH_TAP); }); mCurrentFullscreenParams = new FullscreenDrawParams(context); @@ -432,7 +433,8 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable { getRecentsView().snapToPage(getRecentsView().indexOfChild(this)); } else { mMenuView = TaskMenuView.showForTask(this); - mActivity.getStatsLogManager().log(LAUNCHER_TASK_ICON_TAP_OR_LONGPRESS, getItemInfo()); + mActivity.getStatsLogManager().logger().withItemInfo(getItemInfo()) + .log(LAUNCHER_TASK_ICON_TAP_OR_LONGPRESS); UserEventDispatcher.newInstance(getContext()).logActionOnItem(action, Direction.NONE, LauncherLogProto.ItemType.TASK_ICON); if (mMenuView != null) { diff --git a/quickstep/src/com/android/quickstep/logging/StatsLogCompatManager.java b/quickstep/src/com/android/quickstep/logging/StatsLogCompatManager.java index 3dd9e8bd47..0863aa2820 100644 --- a/quickstep/src/com/android/quickstep/logging/StatsLogCompatManager.java +++ b/quickstep/src/com/android/quickstep/logging/StatsLogCompatManager.java @@ -30,7 +30,6 @@ import android.util.Log; import androidx.annotation.Nullable; import com.android.launcher3.LauncherAppState; -import com.android.launcher3.LauncherState; import com.android.launcher3.Utilities; import com.android.launcher3.logger.LauncherAtom; import com.android.launcher3.logging.InstanceId; @@ -79,30 +78,6 @@ public class StatsLogCompatManager extends StatsLogManager { return new StatsCompatLogger(); } - /** - * Logs a {@link EventEnum}. - */ - @Override - public void log(EventEnum event) { - logger().log(event); - } - - /** - * Logs an event and accompanying {@link InstanceId}. - */ - @Override - public void log(EventEnum event, InstanceId instanceId) { - logger().withInstanceId(instanceId).log(event); - } - - /** - * Logs an event and accompanying {@link ItemInfo}. - */ - @Override - public void log(EventEnum event, @Nullable ItemInfo info) { - logger().withItemInfo(info).log(event); - } - /** * Logs an event. * @@ -135,15 +110,6 @@ public class StatsLogCompatManager extends StatsLogManager { srcState, dstState, OptionalInt.empty()); } - /** - * Logs an event and accompanying {@link InstanceId} and {@link LauncherAtom.ItemInfo}. - */ - @Override - public void log(EventEnum event, InstanceId instanceId, - @Nullable ItemInfo info) { - logger().withItemInfo(info).withInstanceId(instanceId).log(event); - } - /** * Logs a ranking event and accompanying {@link InstanceId} and package name. */ @@ -157,15 +123,6 @@ public class StatsLogCompatManager extends StatsLogManager { position /* position_picked = 4; */); } - /** - * Logs an event and accompanying {@link LauncherState}s. If either of the state refers - * to workspace state, then use pageIndex to pass in index of workspace. - */ - @Override - public void log(EventEnum event, int srcState, int dstState, int pageIndex) { - logger().withSrcState(srcState).withDstState(dstState).log(event); - } - private void write(EventEnum event, InstanceId instanceId, LauncherAtom.ItemInfo atomInfo, int srcState, int dstState, OptionalInt mRank) { diff --git a/src/com/android/launcher3/BaseDraggingActivity.java b/src/com/android/launcher3/BaseDraggingActivity.java index 61ecdd7da6..9cb8cf2c51 100644 --- a/src/com/android/launcher3/BaseDraggingActivity.java +++ b/src/com/android/launcher3/BaseDraggingActivity.java @@ -202,7 +202,8 @@ public abstract class BaseDraggingActivity extends BaseActivity } protected void logAppLaunch(ItemInfo info, InstanceId instanceId) { - getStatsLogManager().log(LAUNCHER_APP_LAUNCH_TAP, instanceId, info); + getStatsLogManager().logger().withItemInfo(info).withInstanceId(instanceId) + .log(LAUNCHER_APP_LAUNCH_TAP); } private void startShortcutIntentSafely(Intent intent, Bundle optsBundle, ItemInfo info, diff --git a/src/com/android/launcher3/DeleteDropTarget.java b/src/com/android/launcher3/DeleteDropTarget.java index d75d712280..28574972ad 100644 --- a/src/com/android/launcher3/DeleteDropTarget.java +++ b/src/com/android/launcher3/DeleteDropTarget.java @@ -126,11 +126,9 @@ public class DeleteDropTarget extends ButtonDropTarget { d.dragInfo.container = NO_ID; } super.onDrop(d, options); - mStatsLogManager.log( - mControlType == ControlType.REMOVE_TARGET - ? LAUNCHER_ITEM_DROPPED_ON_REMOVE - : LAUNCHER_ITEM_DROPPED_ON_CANCEL, - d.logInstanceId); + mStatsLogManager.logger().withInstanceId(d.logInstanceId) + .log(mControlType == ControlType.REMOVE_TARGET ? LAUNCHER_ITEM_DROPPED_ON_REMOVE + : LAUNCHER_ITEM_DROPPED_ON_CANCEL); } @Override diff --git a/src/com/android/launcher3/SecondaryDropTarget.java b/src/com/android/launcher3/SecondaryDropTarget.java index fbac0bd32a..499b54f6d2 100644 --- a/src/com/android/launcher3/SecondaryDropTarget.java +++ b/src/com/android/launcher3/SecondaryDropTarget.java @@ -220,9 +220,11 @@ public class SecondaryDropTarget extends ButtonDropTarget implements OnAlarmList d.dragSource = new DeferredOnComplete(d.dragSource, getContext()); super.onDrop(d, options); if (mCurrentAccessibilityAction == UNINSTALL) { - mStatsLogManager.log(LAUNCHER_ITEM_DROPPED_ON_UNINSTALL, d.logInstanceId); + mStatsLogManager.logger().withInstanceId(d.logInstanceId) + .log(LAUNCHER_ITEM_DROPPED_ON_UNINSTALL); } else if (mCurrentAccessibilityAction == DISMISS_PREDICTION) { - mStatsLogManager.log(LAUNCHER_ITEM_DROPPED_ON_DONT_SUGGEST, d.logInstanceId); + mStatsLogManager.logger().withInstanceId(d.logInstanceId) + .log(LAUNCHER_ITEM_DROPPED_ON_DONT_SUGGEST); } } @@ -348,10 +350,12 @@ public class SecondaryDropTarget extends ButtonDropTarget implements OnAlarmList mDragObject.dragInfo.user, PackageManager.MATCH_UNINSTALLED_PACKAGES) == null) { mDragObject.dragSource = mOriginal; mOriginal.onDropCompleted(SecondaryDropTarget.this, mDragObject, true); - mStatsLogManager.log(LAUNCHER_ITEM_UNINSTALL_COMPLETED, mDragObject.logInstanceId); + mStatsLogManager.logger().withInstanceId(mDragObject.logInstanceId) + .log(LAUNCHER_ITEM_UNINSTALL_COMPLETED); } else { sendFailure(); - mStatsLogManager.log(LAUNCHER_ITEM_UNINSTALL_CANCELLED, mDragObject.logInstanceId); + mStatsLogManager.logger().withInstanceId(mDragObject.logInstanceId) + .log(LAUNCHER_ITEM_UNINSTALL_CANCELLED); } } diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java index 4198e9f6e9..fb58f21344 100644 --- a/src/com/android/launcher3/Workspace.java +++ b/src/com/android/launcher3/Workspace.java @@ -415,11 +415,9 @@ public class Workspace extends PagedView // Always enter the spring loaded mode mLauncher.getStateManager().goToState(SPRING_LOADED); - mStatsLogManager.log( - LauncherEvent.LAUNCHER_ITEM_DRAG_STARTED, - dragObject.logInstanceId, - dragObject.originalDragInfo - ); + mStatsLogManager.logger().withItemInfo(dragObject.originalDragInfo) + .withInstanceId(dragObject.logInstanceId) + .log(LauncherEvent.LAUNCHER_ITEM_DRAG_STARTED); } public void deferRemoveExtraEmptyScreen() { @@ -1646,10 +1644,8 @@ public class Workspace extends PagedView Rect folderLocation = new Rect(); float scale = mLauncher.getDragLayer().getDescendantRectRelativeToSelf(v, folderLocation); target.removeView(v); - mStatsLogManager.log( - LauncherEvent.LAUNCHER_ITEM_DROP_FOLDER_CREATED, - d.logInstanceId, - destInfo); + mStatsLogManager.logger().withItemInfo(destInfo).withInstanceId(d.logInstanceId) + .log(LauncherEvent.LAUNCHER_ITEM_DROP_FOLDER_CREATED); FolderIcon fi = mLauncher.addFolder(target, container, screenId, targetCell[0], targetCell[1]); destInfo.cellX = -1; @@ -1687,10 +1683,8 @@ public class Workspace extends PagedView if (dropOverView instanceof FolderIcon) { FolderIcon fi = (FolderIcon) dropOverView; if (fi.acceptDrop(d.dragInfo)) { - mStatsLogManager.log( - LauncherEvent.LAUNCHER_ITEM_DROP_COMPLETED, - d.logInstanceId, - fi.mInfo); + mStatsLogManager.logger().withItemInfo(fi.mInfo).withInstanceId(d.logInstanceId) + .log(LauncherEvent.LAUNCHER_ITEM_DROP_COMPLETED); fi.onDrop(d, false /* itemReturnedOnFailedDrop */); // if the drag started here, we need to remove it from the workspace @@ -1893,10 +1887,8 @@ public class Workspace extends PagedView mLauncher.getStateManager().goToState( NORMAL, SPRING_LOADED_EXIT_DELAY, onCompleteRunnable); - mStatsLogManager.log( - LauncherEvent.LAUNCHER_ITEM_DROP_COMPLETED, - d.logInstanceId, - d.dragInfo); + mStatsLogManager.logger().withItemInfo(d.dragInfo).withInstanceId(d.logInstanceId) + .log(LauncherEvent.LAUNCHER_ITEM_DROP_COMPLETED); } if (d.stateAnnouncer != null && !droppedOnOriginalCell) { @@ -2434,10 +2426,9 @@ public class Workspace extends PagedView // widgets/shortcuts/folders in a slightly different way mLauncher.addPendingItem(pendingInfo, container, screenId, mTargetCell, item.spanX, item.spanY); - mStatsLogManager.log( - LauncherEvent.LAUNCHER_ITEM_DROP_COMPLETED, - d.logInstanceId, - d.dragInfo); + mStatsLogManager.logger().withItemInfo(d.dragInfo) + .withInstanceId(d.logInstanceId) + .log(LauncherEvent.LAUNCHER_ITEM_DROP_COMPLETED); } }; boolean isWidget = pendingInfo.itemType == LauncherSettings.Favorites.ITEM_TYPE_APPWIDGET @@ -2526,10 +2517,8 @@ public class Workspace extends PagedView mLauncher.getDragLayer().animateViewIntoPosition(d.dragView, view, this); resetTransitionTransform(); } - mStatsLogManager.log( - LauncherEvent.LAUNCHER_ITEM_DROP_COMPLETED, - d.logInstanceId, - d.dragInfo); + mStatsLogManager.logger().withItemInfo(d.dragInfo).withInstanceId(d.logInstanceId) + .log(LauncherEvent.LAUNCHER_ITEM_DROP_COMPLETED); } } diff --git a/src/com/android/launcher3/folder/Folder.java b/src/com/android/launcher3/folder/Folder.java index 530010e948..7998c2d50e 100644 --- a/src/com/android/launcher3/folder/Folder.java +++ b/src/com/android/launcher3/folder/Folder.java @@ -1337,8 +1337,8 @@ public class Folder extends AbstractFloatingView implements ClipPathView, DragSo if (d.stateAnnouncer != null) { d.stateAnnouncer.completeAction(R.string.item_moved); } - mStatsLogManager - .log(LAUNCHER_ITEM_DROP_COMPLETED, d.logInstanceId, d.dragInfo); + mStatsLogManager.logger().withItemInfo(d.dragInfo).withInstanceId(d.logInstanceId) + .log(LAUNCHER_ITEM_DROP_COMPLETED); } // This is used so the item doesn't immediately appear in the folder when added. In one case @@ -1443,7 +1443,7 @@ public class Folder extends AbstractFloatingView implements ClipPathView, DragSo if (hasFocus) { startEditingFolderName(); } else { - mStatsLogManager.log(LAUNCHER_FOLDER_LABEL_UPDATED, mInfo); + mStatsLogManager.logger().withItemInfo(mInfo).log(LAUNCHER_FOLDER_LABEL_UPDATED); logFolderLabelState(); mFolderName.dispatchBackKey(); } diff --git a/src/com/android/launcher3/folder/FolderIcon.java b/src/com/android/launcher3/folder/FolderIcon.java index 2be5883e4a..b40b1e2ebc 100644 --- a/src/com/android/launcher3/folder/FolderIcon.java +++ b/src/com/android/launcher3/folder/FolderIcon.java @@ -448,8 +448,8 @@ public class FolderIcon extends FrameLayout implements FolderListener, IconLabel return; } mInfo.setTitle(nameInfos[0].getLabel()); - StatsLogManager.newInstance(getContext()) - .log(LAUNCHER_FOLDER_LABEL_UPDATED, instanceId, mInfo); + StatsLogManager.newInstance(getContext()).logger().withItemInfo(mInfo) + .withInstanceId(instanceId).log(LAUNCHER_FOLDER_LABEL_UPDATED); onTitleChanged(mInfo.title); mFolder.mFolderName.setText(mInfo.title); mFolder.mLauncher.getModelWriter().updateItemInDatabase(mInfo); diff --git a/src/com/android/launcher3/logging/StatsLogManager.java b/src/com/android/launcher3/logging/StatsLogManager.java index fac5bf4ea3..8fd779d924 100644 --- a/src/com/android/launcher3/logging/StatsLogManager.java +++ b/src/com/android/launcher3/logging/StatsLogManager.java @@ -253,32 +253,6 @@ public class StatsLogManager implements ResourceBasedOverride { return mgr; } - /** - * Logs an event. - * - * @param event an enum implementing EventEnum interface. - */ - public void log(EventEnum event) { - } - - /** - * Logs an event. - * - * @param event an enum implementing EventEnum interface. - * @param instanceId an identifier obtained from an InstanceIdSequence. - */ - public void log(EventEnum event, InstanceId instanceId) { - } - - /** - * Logs an event. - * - * @param event an enum implementing EventEnum interface. - * @param itemInfo item typically containing app or task launch related information. - */ - public void log(EventEnum event, @Nullable ItemInfo itemInfo) { - } - /** * Logs an event. * @@ -298,16 +272,6 @@ public class StatsLogManager implements ResourceBasedOverride { int srcState, int dstState) { } - /** - * Logs an event. - * - * @param event an enum implementing EventEnum interface. - * @param instanceId an identifier obtained from an InstanceIdSequence. - * @param itemInfo item typically containing app or task launch related information. - */ - public void log(EventEnum event, InstanceId instanceId, @Nullable ItemInfo itemInfo) { - } - /** * Log an event with ranked-choice information along with package. Does nothing if event.getId() * <= 0. @@ -321,13 +285,6 @@ public class StatsLogManager implements ResourceBasedOverride { int position) { } - /** - * Logs an event and accompanying {@link LauncherState}s. If either of the state refers - * to workspace state, then use pageIndex to pass in index of workspace. - */ - public void log(EventEnum event, int srcState, int dstState, int pageIndex) { - } - /** * Logs snapshot, or impression of the current workspace. */ diff --git a/src/com/android/launcher3/notification/NotificationInfo.java b/src/com/android/launcher3/notification/NotificationInfo.java index f1b63f28f9..835f72d5be 100644 --- a/src/com/android/launcher3/notification/NotificationInfo.java +++ b/src/com/android/launcher3/notification/NotificationInfo.java @@ -107,8 +107,8 @@ public class NotificationInfo implements View.OnClickListener { try { intent.send(null, 0, null, null, null, null, activityOptions); launcher.getUserEventDispatcher().logNotificationLaunch(view, intent); - launcher.getStatsLogManager() - .log(LAUNCHER_NOTIFICATION_LAUNCH_TAP, mItemInfo); + launcher.getStatsLogManager().logger().withItemInfo(mItemInfo) + .log(LAUNCHER_NOTIFICATION_LAUNCH_TAP); } catch (PendingIntent.CanceledException e) { e.printStackTrace(); } diff --git a/src/com/android/launcher3/popup/RemoteActionShortcut.java b/src/com/android/launcher3/popup/RemoteActionShortcut.java index 8e60c27e66..61829c002b 100644 --- a/src/com/android/launcher3/popup/RemoteActionShortcut.java +++ b/src/com/android/launcher3/popup/RemoteActionShortcut.java @@ -77,8 +77,8 @@ public class RemoteActionShortcut extends SystemShortcut { @Override public void onClick(View view) { AbstractFloatingView.closeAllOpenViews(mTarget); - mTarget.getStatsLogManager() - .log(LAUNCHER_SYSTEM_SHORTCUT_PAUSE_TAP, mItemInfo); + mTarget.getStatsLogManager().logger().withItemInfo(mItemInfo) + .log(LAUNCHER_SYSTEM_SHORTCUT_PAUSE_TAP); final String actionIdentity = mAction.getTitle() + ", " + mItemInfo.getTargetComponent().getPackageName(); diff --git a/src/com/android/launcher3/popup/SystemShortcut.java b/src/com/android/launcher3/popup/SystemShortcut.java index 59d24dee77..fd292a3714 100644 --- a/src/com/android/launcher3/popup/SystemShortcut.java +++ b/src/com/android/launcher3/popup/SystemShortcut.java @@ -119,7 +119,8 @@ public abstract class SystemShortcut extends Ite widgetsBottomSheet.populateAndShow(mItemInfo); mTarget.getUserEventDispatcher().logActionOnControl(Action.Touch.TAP, ControlType.WIDGETS_BUTTON, view); - mTarget.getStatsLogManager().log(LAUNCHER_SYSTEM_SHORTCUT_WIDGETS_TAP, mItemInfo); + mTarget.getStatsLogManager().logger().withItemInfo(mItemInfo) + .log(LAUNCHER_SYSTEM_SHORTCUT_WIDGETS_TAP); } } @@ -140,8 +141,8 @@ public abstract class SystemShortcut extends Ite mItemInfo, sourceBounds, ActivityOptions.makeBasic().toBundle()); mTarget.getUserEventDispatcher().logActionOnControl(Action.Touch.TAP, ControlType.APPINFO_TARGET, view); - mTarget.getStatsLogManager() - .log(LAUNCHER_SYSTEM_SHORTCUT_APP_INFO_TAP, mItemInfo); + mTarget.getStatsLogManager().logger().withItemInfo(mItemInfo) + .log(LAUNCHER_SYSTEM_SHORTCUT_APP_INFO_TAP); } } diff --git a/src/com/android/launcher3/touch/ItemClickHandler.java b/src/com/android/launcher3/touch/ItemClickHandler.java index de16941864..848666674d 100644 --- a/src/com/android/launcher3/touch/ItemClickHandler.java +++ b/src/com/android/launcher3/touch/ItemClickHandler.java @@ -113,7 +113,8 @@ public class ItemClickHandler { if (!folder.isOpen() && !folder.isDestroyed()) { // Open the requested folder folder.animateOpen(); - StatsLogManager.newInstance(v.getContext()).log(LAUNCHER_FOLDER_OPEN, folder.mInfo); + StatsLogManager.newInstance(v.getContext()).logger().withItemInfo(folder.mInfo) + .log(LAUNCHER_FOLDER_OPEN); } } diff --git a/src/com/android/launcher3/touch/WorkspaceTouchListener.java b/src/com/android/launcher3/touch/WorkspaceTouchListener.java index 7270ce28fb..4fa658e7d5 100644 --- a/src/com/android/launcher3/touch/WorkspaceTouchListener.java +++ b/src/com/android/launcher3/touch/WorkspaceTouchListener.java @@ -174,7 +174,7 @@ public class WorkspaceTouchListener extends GestureDetector.SimpleOnGestureListe mWorkspace.performHapticFeedback(HapticFeedbackConstants.LONG_PRESS, HapticFeedbackConstants.FLAG_IGNORE_VIEW_SETTING); - mLauncher.getStatsLogManager().log(LAUNCHER_WORKSPACE_LONGPRESS); + mLauncher.getStatsLogManager().logger().log(LAUNCHER_WORKSPACE_LONGPRESS); OptionsPopupView.showDefaultOptions(mLauncher, mTouchDownPoint.x, mTouchDownPoint.y); } else { cancelLongPress(); diff --git a/src/com/android/launcher3/views/OptionsPopupView.java b/src/com/android/launcher3/views/OptionsPopupView.java index 5431ba1894..d558781be8 100644 --- a/src/com/android/launcher3/views/OptionsPopupView.java +++ b/src/com/android/launcher3/views/OptionsPopupView.java @@ -86,7 +86,7 @@ public class OptionsPopupView extends ArrowPopup return false; } if (item.mEventId.getId() > 0) { - mLauncher.getStatsLogManager().log(item.mEventId); + mLauncher.getStatsLogManager().logger().log(item.mEventId); } if (item.mClickListener.onLongClick(view)) { close(true);