Snap for 11063562 from a37a3793c0b5c5e3a50b714b6d58d709c3045af2 to mainline-art-release
Change-Id: Ia48694e51053bce14898a1c9458776887fb97dd0
diff --git a/stats/atoms.proto b/stats/atoms.proto
index 3e11345..f3b0515 100644
--- a/stats/atoms.proto
+++ b/stats/atoms.proto
@@ -23401,6 +23401,8 @@
RECONSENT_NOTIFICATION_CHANNEL = 5;
// consent notification reset channel.
CONSENT_NOTIFICATION_RESET_CHANNEL = 6;
+ // 2nd GA notification post R OTA.
+ RVC_POST_OTA_NOTIFICATION_CHANNEL = 7;
}
// Type of privacy sandbox enrollment channel.
diff --git a/stats/enums/healthfitness/ui/enums.proto b/stats/enums/healthfitness/ui/enums.proto
index 479a9eb..670795d 100644
--- a/stats/enums/healthfitness/ui/enums.proto
+++ b/stats/enums/healthfitness/ui/enums.proto
@@ -246,8 +246,6 @@
ERROR_PAGE_STATE = 151;
WITH_DATA_PAGE_STATE = 152;
- // Next available: 160;
-
// Manage data page
BACKUP_DATA_BUTTON = 5;
DATA_SOURCES_AND_PRIORITY_BUTTON = 154;
@@ -258,6 +256,14 @@
DATA_TOTALS_CARD = 157;
APP_SOURCE_BUTTON = 158;
ADD_AN_APP_BUTTON = 159;
+ EDIT_SOURCE_LIST_BUTTON = 160;
+ REORDER_APP_SOURCE_BUTTON = 162;
+ REMOVE_APP_SOURCE_BUTTON = 163;
+
+ // Add an app page
+ POTENTIAL_PRIORITY_APP_BUTTON = 161;
+
+ // Next available: 162;
}
@@ -293,8 +299,10 @@
MIGRATION_MODULE_UPDATE_NEEDED_PAGE = 23;
MIGRATION_MORE_SPACE_NEEDED_PAGE = 24;
MIGRATION_PAUSED_PAGE = 25;
+ // New IA and Source controls
MANAGE_DATA_PAGE = 26;
DATA_SOURCES_PAGE = 27;
+ ADD_AN_APP_PAGE = 28;
}
enum Action {
