From 1fc202867e0cd6cebdac69ce669eadb8956d3c75 Mon Sep 17 00:00:00 2001 From: Becky Qiu Date: Tue, 9 Nov 2021 11:23:31 -0800 Subject: [PATCH] [AA+ Search] Add logging for header search icon tapping events. Logging example for the search icon tapping event: https://paste.googleplex.com/4809431536631808 Bug: 198507048 Test: tested with AiAi apk with search icon sent as child of header. Change-Id: Ibbaec61b93c30a99ea2ffef8d7342490ba37335d --- src/com/android/launcher3/logging/StatsLogManager.java | 5 ++++- .../launcher3/model/data/SearchActionItemInfo.java | 1 + src/com/android/launcher3/touch/ItemClickHandler.java | 9 ++++++++- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/src/com/android/launcher3/logging/StatsLogManager.java b/src/com/android/launcher3/logging/StatsLogManager.java index d987212e22..8b7bebc621 100644 --- a/src/com/android/launcher3/logging/StatsLogManager.java +++ b/src/com/android/launcher3/logging/StatsLogManager.java @@ -518,7 +518,10 @@ public class StatsLogManager implements ResourceBasedOverride { LAUNCHER_TASKBAR_LONGPRESS_HIDE(896), @UiEvent(doc = "User long pressed on the taskbar gesture handle to show the taskbar") - LAUNCHER_TASKBAR_LONGPRESS_SHOW(897); + LAUNCHER_TASKBAR_LONGPRESS_SHOW(897), + + @UiEvent(doc = "User clicks on the search icon on header to launch search in app.") + LAUNCHER_ALLAPPS_SEARCHINAPP_LAUNCH(913); // ADD MORE diff --git a/src/com/android/launcher3/model/data/SearchActionItemInfo.java b/src/com/android/launcher3/model/data/SearchActionItemInfo.java index 293c095f49..c6e5e8a98f 100644 --- a/src/com/android/launcher3/model/data/SearchActionItemInfo.java +++ b/src/com/android/launcher3/model/data/SearchActionItemInfo.java @@ -46,6 +46,7 @@ public class SearchActionItemInfo extends ItemInfoWithIcon { public static final int FLAG_PRIMARY_ICON_FROM_TITLE = 1 << 4; public static final int FLAG_BADGE_WITH_COMPONENT_NAME = 1 << 5; public static final int FLAG_ALLOW_PINNING = 1 << 6; + public static final int FLAG_SEARCH_IN_APP = 1 << 7; private String mFallbackPackageName; private int mFlags = 0; diff --git a/src/com/android/launcher3/touch/ItemClickHandler.java b/src/com/android/launcher3/touch/ItemClickHandler.java index 5e907a4da9..8d57d695fa 100644 --- a/src/com/android/launcher3/touch/ItemClickHandler.java +++ b/src/com/android/launcher3/touch/ItemClickHandler.java @@ -17,6 +17,7 @@ package com.android.launcher3.touch; import static com.android.launcher3.Launcher.REQUEST_BIND_PENDING_APPWIDGET; import static com.android.launcher3.Launcher.REQUEST_RECONFIGURE_APPWIDGET; +import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_ALLAPPS_SEARCHINAPP_LAUNCH; import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_APP_LAUNCH_TAP; import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_FOLDER_OPEN; import static com.android.launcher3.model.data.ItemInfoWithIcon.FLAG_DISABLED_BY_PUBLISHER; @@ -286,7 +287,13 @@ public class ItemClickHandler { Toast.LENGTH_SHORT).show(); } } - launcher.getStatsLogManager().logger().withItemInfo(itemInfo).log(LAUNCHER_APP_LAUNCH_TAP); + if (itemInfo.hasFlags(SearchActionItemInfo.FLAG_SEARCH_IN_APP)) { + launcher.getStatsLogManager().logger().withItemInfo(itemInfo).log( + LAUNCHER_ALLAPPS_SEARCHINAPP_LAUNCH); + } else { + launcher.getStatsLogManager().logger().withItemInfo(itemInfo).log( + LAUNCHER_APP_LAUNCH_TAP); + } } private static void startAppShortcutOrInfoActivity(View v, ItemInfo item, Launcher launcher) {