Merge "Move ACTION_AMBIENT_DISPLAY from O to N-MR1 constant." (5d0338c4) · Commits · e / os / android_frameworks_base

proto/src/metrics_constants.proto

+4 −4

Original line number	Diff line number	Diff line
		@@ -2203,6 +2203,10 @@ message MetricsEvent {
		// System navigation key down.
		ACTION_SYSTEM_NAVIGATION_KEY_DOWN = 494;

		// OPEN: Settings > Display -> Ambient Display
		// CATEGORY: SETTINGS
		ACTION_AMBIENT_DISPLAY = 495;

		// ---- End N-MR1 Constants, all N-MR1 constants go above this line ----

		// ------- Begin N Keyboard Shortcuts Helper -----
		@@ -2262,10 +2266,6 @@ message MetricsEvent {
		// Package: Package of print service
		ACTION_PRINT_RECOMMENDED_SERVICE_INSTALL = 512;

		// OPEN: Settings > Display -> Ambient Display
		// CATEGORY: SETTINGS
		ACTION_AMBIENT_DISPLAY = 513;

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

		// Add new aosp constants above this line.