Merge "Add a Settings atom" (74494b51) · Commits · e / os / android_frameworks_base

cmds/statsd/src/atoms.proto

+56 −0

Original line number	Original line	Diff line number	Diff line
	@@ -144,6 +144,7 @@ message Atom {
	PhoneServiceStateChanged phone_service_state_changed = 94;		PhoneServiceStateChanged phone_service_state_changed = 94;
	PhoneStateChanged phone_state_changed = 95;		PhoneStateChanged phone_state_changed = 95;
	UserRestrictionChanged user_restriction_changed = 96;		UserRestrictionChanged user_restriction_changed = 96;
			SettingsUIChanged settings_ui_changed = 97;
	}		}

	// Pulled events will start at field 10000.		// Pulled events will start at field 10000.
	@@ -1436,6 +1437,61 @@ message PhoneStateChanged {
	optional State state = 1;		optional State state = 1;
	}		}

			/**
			* Logs when Settings UI has changed.
			*
			* Logged from:
			* packages/apps/Settings
			*/
			message SettingsUIChanged {
			/**
			* The action performed in this event
			*/
			enum Action {
			ACTION_UNKNOWN = 0;
			PAGE_VISIBLE = 1;
			PAGE_HIDE = 2;
			PREF_CHANGE = 3;
			}

			/**
			* Id for Settings pages. Each page must have its own unique Id.
			*/
			enum PageId {
			// Unknown page. Should not be used in production code.
			PAGE_UNKNOWN = 0;

			// Settings > Display > Lock screen display > On lock screen
			LOCK_SCREEN_NOTIFICATION_CONTENT = 1584;
			}

			/**
			* Where this SettingsUIChange event comes from. For example, if
			* it's a PAGE_VISIBLE event, where the page is opened from.
			*/
			optional PageId attribution = 1;

			/**
			* What the UI action is.
			*/
			optional Action action = 2;

			/**
			* Where the action is happening
			*/
			optional PageId pageId = 3;

			/**
			* What preference changed in this event.
			*/
			optional string changedPreferenceKey = 4;

			/**
			* The new value of the changed preference.
			*/
			optional int64 changedPreferenceIntValue = 5;
			}

	/**		/**
	* Logs that a setting was updated.		* Logs that a setting was updated.
	* Logged from:		* Logged from:

proto/src/metrics_constants/metrics_constants.proto

+5 −0

Original line number	Original line	Diff line number	Diff line
	@@ -6564,6 +6564,11 @@ message MetricsEvent {
	// OS: Q		// OS: Q
	MOBILE_ROAMING_DIALOG = 1583;		MOBILE_ROAMING_DIALOG = 1583;

			// OPEN: Settings > Display > Lock screen display > On lock screen
			// CATEGORY: SETTINGS
			// OS: Q
			LOCK_SCREEN_NOTIFICATION_CONTENT = 1584;

	// ---- End Q Constants, all Q constants go above this line ----		// ---- End Q Constants, all Q constants go above this line ----

	// Add new aosp constants above this line.		// Add new aosp constants above this line.