PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge "[AA+ Search] Add logging for header search icon tapping events." into sc-v2-dev am: c919e67a9b

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16223390

Change-Id: I3749eeff3e3f4399fb485f0c67962e74cb967c05
This commit is contained in:
Becky Qiu
2021-11-11 01:25:32 +00:00
committed by Automerger Merge Worker
parent 23b37b7ac4 c919e67a9b
commit 62c46757ce
3 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/android/launcher3/logging/StatsLogManager.java
+4 -1
View File
@@ -518,7 +518,10 @@ public class StatsLogManager implements ResourceBasedOverride {
LAUNCHER_TASKBAR_LONGPRESS_HIDE(896), LAUNCHER_TASKBAR_LONGPRESS_HIDE(896),
@UiEvent(doc = "User long pressed on the taskbar gesture handle to show the taskbar") @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 // ADD MORE
src/com/android/launcher3/model/data/SearchActionItemInfo.java
+1
View File
@@ -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_PRIMARY_ICON_FROM_TITLE = 1 << 4;
public static final int FLAG_BADGE_WITH_COMPONENT_NAME = 1 << 5; 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_ALLOW_PINNING = 1 << 6;
public static final int FLAG_SEARCH_IN_APP = 1 << 7;
private String mFallbackPackageName; private String mFallbackPackageName;
private int mFlags = 0; private int mFlags = 0;
src/com/android/launcher3/touch/ItemClickHandler.java
+8 -1
View File
@@ -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_BIND_PENDING_APPWIDGET;
import static com.android.launcher3.Launcher.REQUEST_RECONFIGURE_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_APP_LAUNCH_TAP;
import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_FOLDER_OPEN; import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_FOLDER_OPEN;
import static com.android.launcher3.model.data.ItemInfoWithIcon.FLAG_DISABLED_BY_PUBLISHER; import static com.android.launcher3.model.data.ItemInfoWithIcon.FLAG_DISABLED_BY_PUBLISHER;
@@ -286,7 +287,13 @@ public class ItemClickHandler {
Toast.LENGTH_SHORT).show(); 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) { private static void startAppShortcutOrInfoActivity(View v, ItemInfo item, Launcher launcher) {