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

Commit 24dc3a7a authored by Zhen Sun's avatar Zhen Sun Committed by Automerger Merge Worker
Browse files

Merge "Add atom of TvSettings and its enum" into rvc-dev am: e31edc21 am:...

Merge "Add atom of TvSettings and its enum" into rvc-dev am: e31edc21 am: 3cdcd62e am: 11a75c9e

Change-Id: I91a03acf41ccca2cc1f2184f5daba2ee23eac6c2
parents 3f778cc3 11a75c9e
Loading
Loading
Loading
Loading
+19 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ import "frameworks/base/cmds/statsd/src/atom_field_options.proto";
import "frameworks/base/core/proto/android/app/enums.proto";
import "frameworks/base/core/proto/android/app/job/enums.proto";
import "frameworks/base/core/proto/android/app/settings_enums.proto";
import "frameworks/base/core/proto/android/app/tvsettings_enums.proto";
import "frameworks/base/core/proto/android/bluetooth/a2dp/enums.proto";
import "frameworks/base/core/proto/android/bluetooth/enums.proto";
import "frameworks/base/core/proto/android/bluetooth/hci/enums.proto";
@@ -416,6 +417,7 @@ message Atom {
        AppStandbyBucketChanged app_standby_bucket_changed = 258 [(module) = "framework"];
        SharesheetStarted sharesheet_started = 259 [(module) = "framework"];
        RankingSelected ranking_selected = 260 [(module) = "framework"];
        TvSettingsUIInteracted tvsettings_ui_interacted = 261;
        SdkExtensionStatus sdk_extension_status = 354;
    }

@@ -9201,6 +9203,23 @@ message RankingSelected {
    optional int32 position_picked = 4;
}

/**
 * Logs when TvSettings UI is interacted at.
 *
 * Logged from: packages/apps/TvSettings
 */
message TvSettingsUIInteracted {

    /** The UI action category */
    optional android.app.tvsettings.Action action = 1;

    /** 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;
}

/**
 * Logs settings provider values.
 *
+917 −0

File added.

Preview size limit exceeded, changes collapsed.