From be8b2ad03d5ada20b8d22b8bfde8cfbcb34e1acf Mon Sep 17 00:00:00 2001 From: Thiru Ramasamy Date: Tue, 24 Aug 2021 14:32:10 -0700 Subject: [PATCH] Add TaskBarContainer to launcher_atom.proto Bug: 193009817 Test: Manual Change-Id: Ib69be2b2405ab38891dff34c4d366105cd2499c1 --- protos/launcher_atom.proto | 11 +++++++++++ .../quickstep/logging/StatsLogCompatManager.java | 4 ++++ 2 files changed, 15 insertions(+) diff --git a/protos/launcher_atom.proto b/protos/launcher_atom.proto index 6d49d75953..6dfb84ea2f 100644 --- a/protos/launcher_atom.proto +++ b/protos/launcher_atom.proto @@ -59,6 +59,7 @@ message ContainerInfo { SettingsContainer settings_container = 9; PredictedHotseatContainer predicted_hotseat_container = 10; TaskSwitcherContainer task_switcher_container = 11; + TaskBarContainer task_bar_container = 12; ExtendedContainers extended_containers = 20; } } @@ -100,6 +101,16 @@ message SettingsContainer { message TaskSwitcherContainer { } +// Container for taskbar. +// Configured to show up on large screens(tablet-sized) such as foldables in expanded state, within +// an app view(not in launcher screen). +message TaskBarContainer { + optional int32 index = 1; + + // Bit encoded value to capture pinned and predicted taskbar positions. + optional int32 cardinality = 2; +} + enum Attribute { UNKNOWN = 0; DEFAULT_LAYOUT = 1; // icon automatically placed in workspace, folder, hotseat diff --git a/quickstep/src/com/android/quickstep/logging/StatsLogCompatManager.java b/quickstep/src/com/android/quickstep/logging/StatsLogCompatManager.java index 6575996d69..38c299e493 100644 --- a/quickstep/src/com/android/quickstep/logging/StatsLogCompatManager.java +++ b/quickstep/src/com/android/quickstep/logging/StatsLogCompatManager.java @@ -375,6 +375,8 @@ public class StatsLogCompatManager extends StatsLogManager { switch (info.getContainerInfo().getContainerCase()) { case PREDICTED_HOTSEAT_CONTAINER: return info.getContainerInfo().getPredictedHotseatContainer().getCardinality(); + case TASK_BAR_CONTAINER: + return info.getContainerInfo().getTaskBarContainer().getCardinality(); case SEARCH_RESULT_CONTAINER: return info.getContainerInfo().getSearchResultContainer().getQueryLength(); case EXTENDED_CONTAINERS: @@ -461,6 +463,8 @@ public class StatsLogCompatManager extends StatsLogManager { return info.getContainerInfo().getHotseat().getIndex(); case PREDICTED_HOTSEAT_CONTAINER: return info.getContainerInfo().getPredictedHotseatContainer().getIndex(); + case TASK_BAR_CONTAINER: + return info.getContainerInfo().getTaskBarContainer().getIndex(); default: return info.getContainerInfo().getWorkspace().getPageIndex(); }