From 79efba935f393c16bff951c70157baee7abc1e13 Mon Sep 17 00:00:00 2001 From: Brian Isganitis Date: Wed, 24 Nov 2021 15:18:02 -0500 Subject: [PATCH] Adding support for logging wallpaper container info. Test: https://paste.googleplex.com/5350571797118976 shows logging carousel size and index of wallpaper tapped. If the wallpaper is a live wallpaper, we also log its application info. Bug: 188222480 Change-Id: I6dd7ac20af7afd675d8a886d5b838263680f773e Merged-In: I6dd7ac20af7afd675d8a886d5b838263680f773e --- protos/launcher_atom.proto | 7 +++++++ src/com/android/launcher3/model/data/ItemInfo.java | 6 ++++++ 2 files changed, 13 insertions(+) diff --git a/protos/launcher_atom.proto b/protos/launcher_atom.proto index d1bf15223b..c5599887dd 100644 --- a/protos/launcher_atom.proto +++ b/protos/launcher_atom.proto @@ -60,6 +60,7 @@ message ContainerInfo { PredictedHotseatContainer predicted_hotseat_container = 10; TaskSwitcherContainer task_switcher_container = 11; TaskBarContainer task_bar_container = 12; + WallpapersContainer wallpapers_container = 13; ExtendedContainers extended_containers = 20; } } @@ -247,6 +248,12 @@ message FolderContainer { } } +// Represents wallpapers container for quick switching. +message WallpapersContainer { + // Number of wallpapers in the container. + optional int32 cardinality = 1; +} + // Represents state of EditText field before update. enum FromState { // Default value. diff --git a/src/com/android/launcher3/model/data/ItemInfo.java b/src/com/android/launcher3/model/data/ItemInfo.java index b72f462a27..e30829ee1b 100644 --- a/src/com/android/launcher3/model/data/ItemInfo.java +++ b/src/com/android/launcher3/model/data/ItemInfo.java @@ -25,6 +25,7 @@ import static com.android.launcher3.LauncherSettings.Favorites.CONTAINER_SEARCH_ import static com.android.launcher3.LauncherSettings.Favorites.CONTAINER_SETTINGS; import static com.android.launcher3.LauncherSettings.Favorites.CONTAINER_SHORTCUTS; import static com.android.launcher3.LauncherSettings.Favorites.CONTAINER_TASKSWITCHER; +import static com.android.launcher3.LauncherSettings.Favorites.CONTAINER_WALLPAPERS; import static com.android.launcher3.LauncherSettings.Favorites.CONTAINER_WIDGETS_TRAY; import static com.android.launcher3.LauncherSettings.Favorites.EXTENDED_CONTAINERS; import static com.android.launcher3.LauncherSettings.Favorites.ITEM_TYPE_APPLICATION; @@ -55,6 +56,7 @@ import com.android.launcher3.logger.LauncherAtom.SettingsContainer; import com.android.launcher3.logger.LauncherAtom.Shortcut; import com.android.launcher3.logger.LauncherAtom.ShortcutsContainer; import com.android.launcher3.logger.LauncherAtom.TaskSwitcherContainer; +import com.android.launcher3.logger.LauncherAtom.WallpapersContainer; import com.android.launcher3.logger.LauncherAtomExtensions.ExtendedContainers; import com.android.launcher3.model.ModelWriter; import com.android.launcher3.util.ContentWriter; @@ -428,6 +430,10 @@ public class ItemInfo { return ContainerInfo.newBuilder() .setTaskSwitcherContainer(TaskSwitcherContainer.getDefaultInstance()) .build(); + case CONTAINER_WALLPAPERS: + return ContainerInfo.newBuilder() + .setWallpapersContainer(WallpapersContainer.getDefaultInstance()) + .build(); case EXTENDED_CONTAINERS: return ContainerInfo.newBuilder() .setExtendedContainers(getExtendedContainer())