Merge "Add constants which can be used by Privacy Setting" (cd42d6eb) · Commits · e / os / android_frameworks_base

core/proto/android/app/settings_enums.proto

+3 −0

Original line number	Diff line number	Diff line
		@@ -64,5 +64,8 @@ enum PageId {

		// OPEN: Biometric Enrollment (android.settings.BIOMETRIC_ENROLL action intent)
		BIOMETRIC_ENROLL_ACTIVITY = 1586;

		// OPEN: Settings > Privacy
		TOP_LEVEL_PRIVACY = 1587;
		}

+2 −0

Original line number	Diff line number	Diff line
		@@ -51,6 +51,8 @@ public final class CategoryKey {
		public static final String CATEGORY_GESTURES = "com.android.settings.category.ia.gestures";
		public static final String CATEGORY_NIGHT_DISPLAY =
		"com.android.settings.category.ia.night_display";
		public static final String CATEGORY_PRIVACY =
		"com.android.settings.category.ia.privacy";

		public static final Map<String, String> KEY_COMPAT_MAP;

+6 −1

Original line number	Diff line number	Diff line
		@@ -2832,7 +2832,7 @@ message MetricsEvent {
		// ACTION: Logs the end to end time taken by all provisioning tasks.
		PROVISIONING_TOTAL_TASK_TIME_MS = 627;

		// OPEN: Settings > Privacy
		// OPEN: Settings > Security
		// CATEGORY: SETTINGS
		// OS: O
		ENTERPRISE_PRIVACY_SETTINGS = 628;
		@@ -6579,6 +6579,11 @@ message MetricsEvent {
		// OS: Q
		BIOMETRIC_ENROLL_ACTIVITY = 1586;

		// OPEN: Settings > Privacy
		// CATEGORY: SETTINGS
		// OS: Q
		TOP_LEVEL_PRIVACY = 1587;

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

		// Add new aosp constants above this line.