From a05860421f22e6111a24cddbfaed812ecf5b8250 Mon Sep 17 00:00:00 2001 From: Hyunyoung Song Date: Tue, 1 May 2018 16:46:59 -0700 Subject: Log OVERVIEW_ACTIVITY via MetricsLogger in quickstep Bug: 77920179 Change-Id: Id4c7dc3d535c7a8009d340183e640b04ab07408a --- quickstep/libs/sysui_shared.jar | Bin 124099 -> 124254 bytes quickstep/res/values/config.xml | 2 ++ .../logging/UserEventDispatcherExtension.java | 35 +++++++++++++++++++++ .../launcher3/logging/UserEventDispatcher.java | 2 +- 4 files changed, 38 insertions(+), 1 deletion(-) create mode 100644 quickstep/src/com/android/quickstep/logging/UserEventDispatcherExtension.java diff --git a/quickstep/libs/sysui_shared.jar b/quickstep/libs/sysui_shared.jar index 70e545f4f..120d6f98d 100644 Binary files a/quickstep/libs/sysui_shared.jar and b/quickstep/libs/sysui_shared.jar differ diff --git a/quickstep/res/values/config.xml b/quickstep/res/values/config.xml index 37929b65e..7673f6994 100644 --- a/quickstep/res/values/config.xml +++ b/quickstep/res/values/config.xml @@ -17,4 +17,6 @@ + + com.google.quickstep.logging.UserEventDispatcherExtension diff --git a/quickstep/src/com/android/quickstep/logging/UserEventDispatcherExtension.java b/quickstep/src/com/android/quickstep/logging/UserEventDispatcherExtension.java new file mode 100644 index 000000000..d4cdd3556 --- /dev/null +++ b/quickstep/src/com/android/quickstep/logging/UserEventDispatcherExtension.java @@ -0,0 +1,35 @@ +/* + * Copyright (C) 2018 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.quickstep.logging; + +import com.android.launcher3.logging.UserEventDispatcher; +import com.android.launcher3.userevent.nano.LauncherLogProto; +import com.android.systemui.shared.system.MetricsLoggerCompat; + +/** + * This class handles AOSP MetricsLogger function calls. + */ +public class UserEventDispatcherExtension extends UserEventDispatcher { + + public void logStateChangeAction(int action, int dir, int srcChildTargetType, + int srcParentContainerType, int dstContainerType, + int pageIndex) { + new MetricsLoggerCompat().visibility(MetricsLoggerCompat.OVERVIEW_ACTIVITY, + dstContainerType == LauncherLogProto.ContainerType.TASKSWITCHER); + super.logStateChangeAction(action, dir, srcChildTargetType, srcParentContainerType, + dstContainerType, pageIndex); + } +} diff --git a/src/com/android/launcher3/logging/UserEventDispatcher.java b/src/com/android/launcher3/logging/UserEventDispatcher.java index bf870cca0..2c1eb3287 100644 --- a/src/com/android/launcher3/logging/UserEventDispatcher.java +++ b/src/com/android/launcher3/logging/UserEventDispatcher.java @@ -285,7 +285,7 @@ public class UserEventDispatcher { * Used primarily for swipe up and down when state changes when swipe up happens from the * navbar bezel, the {@param srcChildContainerType} is NAVBAR and * {@param srcParentContainerType} is either one of the two - * (1) WORKSPACE: if the launcher the foreground activity + * (1) WORKSPACE: if the launcher is the foreground activity * (2) APP: if another app was the foreground activity */ public void logStateChangeAction(int action, int dir, int srcChildTargetType, -- cgit v1.2.3