summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZhen Sun <zhensun@google.com>2020-05-15 16:02:06 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-05-15 16:02:06 +0000
commit1bd3d5754cab58f80deb23be2ea027eb87449acb (patch)
tree1097720bbf622f6ce31e8d23300d9d21ca0e643b
parentd89dda864f03a19f094beb0695f5e8a922177b5b (diff)
parentb049c5073c8a2589cebd7668e066e667de5479a5 (diff)
Merge "Update TvSettingsUIInteracted atom" into rvc-dev am: b049c5073c
Change-Id: I346cfc0a06663ff8d5986114dfb629cef035e5ee
-rw-r--r--cmds/statsd/src/atoms.proto3
-rw-r--r--core/proto/android/app/tvsettings_enums.proto18
2 files changed, 18 insertions, 3 deletions
diff --git a/cmds/statsd/src/atoms.proto b/cmds/statsd/src/atoms.proto
index 4db0f91ca871..8c5718d30c09 100644
--- a/cmds/statsd/src/atoms.proto
+++ b/cmds/statsd/src/atoms.proto
@@ -9461,9 +9461,6 @@ message TvSettingsUIInteracted {
/** The ID of the entry that the users actioned on */
optional android.app.tvsettings.ItemId item_id = 2;
-
- /** Additional information (e.g., navigation direction on page focused) */
- optional string additional_info = 3;
}
/**
diff --git a/core/proto/android/app/tvsettings_enums.proto b/core/proto/android/app/tvsettings_enums.proto
index 30d365c71308..31c5dd6b730a 100644
--- a/core/proto/android/app/tvsettings_enums.proto
+++ b/core/proto/android/app/tvsettings_enums.proto
@@ -44,6 +44,24 @@ enum Action {
/** Denotes that a toggle is clicked by a user. */
TOGGLE_INTERACTED = 3;
+ /**
+ * Denotes that a TvSettings page is being focused in the forward direction
+ * into the settings tree.
+ */
+ PAGE_FOCUSED_FORWARD = 4;
+
+ /**
+ * Denotes that a TvSettings page is being focused in the backward direction
+ * up the settings tree.
+ */
+ PAGE_FOCUSED_BACKWARD = 5;
+
+ /** Denotes that a toggle is turned on by a user. */
+ TOGGLED_ON = 6;
+
+ /** Denotes that a toggle is turned off by a user. */
+ TOGGLED_OFF = 7;
+
}
/**