Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 79efba93 authored by Brian Isganitis's avatar Brian Isganitis
Browse files

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
parent ed05712f

protos/launcher_atom.proto

+7 −0
Original line number Diff line number Diff line
@@ -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.

src/com/android/launcher3/model/data/ItemInfo.java

+6 −0
Original line number Diff line number Diff line
@@ -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())