From 1505d2f2e60a7dd38917aea7a8cec096093bee7c Mon Sep 17 00:00:00 2001 From: Hyunyoung Song Date: Wed, 15 Apr 2020 16:52:19 +0000 Subject: [PATCH] Revert "Use UiEvent for constants inside StatsLogManager" This reverts commit 6b99a7d3977e62c2555e8a2decbd2769d92179a1. Reason for revert: Launcher3 AOSP cannot link to uieventloggerlib because it's private API Change-Id: Id652b8a4cba54b97d1d8b8644c2939903cc0e88a --- Android.mk | 7 +---- .../android/quickstep/views/RecentsView.java | 10 +++---- .../com/android/quickstep/views/TaskView.java | 4 +-- .../launcher3/BaseDraggingActivity.java | 4 +-- .../launcher3/logging/LauncherUiEvent.java | 30 +++++++++++++++++++ .../launcher3/logging/StatsLogManager.java | 24 ++++++++------- 6 files changed, 52 insertions(+), 27 deletions(-) create mode 100644 src/com/android/launcher3/logging/LauncherUiEvent.java diff --git a/Android.mk b/Android.mk index 352885bcd9..9cfcf17b99 100644 --- a/Android.mk +++ b/Android.mk @@ -32,8 +32,7 @@ LOCAL_STATIC_ANDROID_LIBRARIES := \ LOCAL_STATIC_JAVA_LIBRARIES := \ LauncherPluginLib \ - launcher_log_protos_lite \ - uieventloggerlib + launcher_log_protos_lite LOCAL_SRC_FILES := \ $(call all-proto-files-under, protos) \ @@ -131,10 +130,8 @@ LOCAL_MODULE_TAGS := optional LOCAL_STATIC_JAVA_LIBRARIES := \ SystemUISharedLib \ - SystemUI-statsd \ launcherprotosnano \ launcher_log_protos_lite - ifneq (,$(wildcard frameworks/base)) LOCAL_PRIVATE_PLATFORM_APIS := true else @@ -205,10 +202,8 @@ LOCAL_MODULE_TAGS := optional LOCAL_STATIC_JAVA_LIBRARIES := \ SystemUISharedLib \ - SystemUI-statsd \ launcherprotosnano \ launcher_log_protos_lite - ifneq (,$(wildcard frameworks/base)) LOCAL_PRIVATE_PLATFORM_APIS := true else 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 5046f4b4b8..3e88ecb560 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 @@ -30,8 +30,8 @@ import static com.android.launcher3.anim.Interpolators.FAST_OUT_SLOW_IN; import static com.android.launcher3.anim.Interpolators.LINEAR; import static com.android.launcher3.config.FeatureFlags.ENABLE_OVERVIEW_ACTIONS; import static com.android.launcher3.config.FeatureFlags.ENABLE_QUICKSTEP_LIVE_TILE; -import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_TASK_DISMISS_SWIPE_UP; -import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_TASK_LAUNCH_SWIPE_DOWN; +import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.TASK_DISMISS_SWIPE_UP; +import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.TASK_LAUNCH_SWIPE_DOWN; import static com.android.launcher3.statehandlers.DepthController.DEPTH; import static com.android.launcher3.uioverrides.touchcontrollers.TaskViewTouchController.SUCCESS_TRANSITION_PROGRESS; import static com.android.launcher3.userevent.nano.LauncherLogProto.Action.Touch.TAP; @@ -1279,8 +1279,7 @@ 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.buildProto()); + mActivity.getStatsLogManager().log(TASK_DISMISS_SWIPE_UP, taskView.buildProto()); } } @@ -1830,8 +1829,7 @@ 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.buildProto() + mActivity.getStatsLogManager().log(TASK_LAUNCH_SWIPE_DOWN, tv.buildProto() ); } } else { 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 171c91df34..470b720f5e 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 @@ -29,7 +29,7 @@ import static com.android.launcher3.anim.Interpolators.FAST_OUT_SLOW_IN; import static com.android.launcher3.anim.Interpolators.LINEAR; import static com.android.launcher3.anim.Interpolators.TOUCH_RESPONSE_INTERPOLATOR; import static com.android.launcher3.config.FeatureFlags.ENABLE_QUICKSTEP_LIVE_TILE; -import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_TASK_LAUNCH_TAP; +import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.TASK_LAUNCH_TAP; import android.animation.Animator; import android.animation.AnimatorListenerAdapter; @@ -209,7 +209,7 @@ 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, buildProto()); + mActivity.getStatsLogManager().log(TASK_LAUNCH_TAP, buildProto()); }); mCornerRadius = TaskCornerRadius.get(context); mWindowCornerRadius = QuickStepContract.getWindowCornerRadius(context.getResources()); diff --git a/src/com/android/launcher3/BaseDraggingActivity.java b/src/com/android/launcher3/BaseDraggingActivity.java index 4732e73d17..6fa3c28b21 100644 --- a/src/com/android/launcher3/BaseDraggingActivity.java +++ b/src/com/android/launcher3/BaseDraggingActivity.java @@ -16,7 +16,7 @@ package com.android.launcher3; -import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_APP_LAUNCH_TAP; +import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.APP_LAUNCH_TAP; import static com.android.launcher3.util.DefaultDisplay.CHANGE_ROTATION; import android.app.ActivityOptions; @@ -182,7 +182,7 @@ public abstract class BaseDraggingActivity extends BaseActivity sourceContainer); } getUserEventDispatcher().logAppLaunch(v, intent, user); - getStatsLogManager().log(LAUNCHER_APP_LAUNCH_TAP, item.buildProto(null, null)); + getStatsLogManager().log(APP_LAUNCH_TAP, item.buildProto(null, null)); return true; } catch (NullPointerException|ActivityNotFoundException|SecurityException e) { Toast.makeText(this, R.string.activity_not_found, Toast.LENGTH_SHORT).show(); diff --git a/src/com/android/launcher3/logging/LauncherUiEvent.java b/src/com/android/launcher3/logging/LauncherUiEvent.java new file mode 100644 index 0000000000..4507ff7d76 --- /dev/null +++ b/src/com/android/launcher3/logging/LauncherUiEvent.java @@ -0,0 +1,30 @@ +/* + * Copyright (C) 2020 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.android.launcher3.logging; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.RetentionPolicy.SOURCE; + +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +@Retention(SOURCE) +@Target(FIELD) +public @interface LauncherUiEvent { + /** An explanation, suitable for Android analysts, of the UI event that this log represents. */ + String doc(); +} + diff --git a/src/com/android/launcher3/logging/StatsLogManager.java b/src/com/android/launcher3/logging/StatsLogManager.java index 60d790fd4b..2829951da2 100644 --- a/src/com/android/launcher3/logging/StatsLogManager.java +++ b/src/com/android/launcher3/logging/StatsLogManager.java @@ -17,8 +17,6 @@ package com.android.launcher3.logging; import android.content.Context; -import com.android.internal.logging.UiEvent; -import com.android.internal.logging.UiEventLogger; import com.android.launcher3.R; import com.android.launcher3.logger.LauncherAtom; import com.android.launcher3.logger.LauncherAtom.ItemInfo; @@ -30,15 +28,19 @@ import com.android.launcher3.util.ResourceBasedOverride; */ public class StatsLogManager implements ResourceBasedOverride { - public enum LauncherEvent implements UiEventLogger.UiEventEnum { - @UiEvent(doc = "App launched from workspace, hotseat or folder in launcher") - LAUNCHER_APP_LAUNCH_TAP(338), - @UiEvent(doc = "Task launched from overview using TAP") - LAUNCHER_TASK_LAUNCH_TAP(339), - @UiEvent(doc = "Task launched from overview using SWIPE DOWN") - LAUNCHER_TASK_LAUNCH_SWIPE_DOWN(340), - @UiEvent(doc = "TASK dismissed from overview using SWIPE UP") - LAUNCHER_TASK_DISMISS_SWIPE_UP(341); + interface EventEnum { + int getId(); + } + + public enum LauncherEvent implements EventEnum { + @LauncherUiEvent(doc = "App launched from workspace, hotseat or folder in launcher") + APP_LAUNCH_TAP(1), + @LauncherUiEvent(doc = "Task launched from overview using TAP") + TASK_LAUNCH_TAP(2), + @LauncherUiEvent(doc = "Task launched from overview using SWIPE DOWN") + TASK_LAUNCH_SWIPE_DOWN(2), + @LauncherUiEvent(doc = "TASK dismissed from overview using SWIPE UP") + TASK_DISMISS_SWIPE_UP(3); // ADD MORE private final int mId;