Merge "Add gesture touch counts" into qt-r1-dev am: 8607680ee7 (20b25eb1) · Commits · e / os / android_frameworks_base

core/java/android/provider/Settings.java

+28 −5

Original line number	Diff line number	Diff line
		@@ -7764,6 +7764,12 @@ public final class Settings {
		*/
		public static final String SKIP_GESTURE_COUNT = "skip_gesture_count";

		/**
		* Count of non-gesture interaction.
		* @hide
		*/
		public static final String SKIP_TOUCH_COUNT = "skip_touch_count";

		private static final Validator SKIP_GESTURE_COUNT_VALIDATOR =
		NON_NEGATIVE_INTEGER_VALIDATOR;

		@@ -7808,11 +7814,22 @@ public final class Settings {
		public static final String SILENCE_CALL_GESTURE_COUNT = "silence_call_gesture_count";

		/**
		* Count of successful silence notification gestures.
		* Count of non-gesture interaction.
		* @hide
		*/
		public static final String SILENCE_ALARMS_TOUCH_COUNT = "silence_alarms_touch_count";

		/**
		* Count of non-gesture interaction.
		* @hide
		*/
		public static final String SILENCE_TIMER_TOUCH_COUNT = "silence_timer_touch_count";

		/**
		* Count of non-gesture interaction.
		* @hide
		*/
		public static final String SILENCE_NOTIFICATION_GESTURE_COUNT =
		"silence_notification_gesture_count";
		public static final String SILENCE_CALL_TOUCH_COUNT = "silence_call_touch_count";

		private static final Validator SILENCE_GESTURE_COUNT_VALIDATOR =
		NON_NEGATIVE_INTEGER_VALIDATOR;
		@@ -9031,10 +9048,13 @@ public final class Settings {
		NAVIGATION_MODE,
		AWARE_ENABLED,
		SKIP_GESTURE_COUNT,
		SKIP_TOUCH_COUNT,
		SILENCE_ALARMS_GESTURE_COUNT,
		SILENCE_NOTIFICATION_GESTURE_COUNT,
		SILENCE_CALL_GESTURE_COUNT,
		SILENCE_TIMER_GESTURE_COUNT,
		SILENCE_ALARMS_TOUCH_COUNT,
		SILENCE_CALL_TOUCH_COUNT,
		SILENCE_TIMER_TOUCH_COUNT,
		DARK_MODE_DIALOG_SEEN,
		GLOBAL_ACTIONS_PANEL_ENABLED,
		AWARE_LOCK_ENABLED
		@@ -9222,10 +9242,13 @@ public final class Settings {
		VALIDATORS.put(NAVIGATION_MODE, NAVIGATION_MODE_VALIDATOR);
		VALIDATORS.put(AWARE_ENABLED, AWARE_ENABLED_VALIDATOR);
		VALIDATORS.put(SKIP_GESTURE_COUNT, SKIP_GESTURE_COUNT_VALIDATOR);
		VALIDATORS.put(SKIP_TOUCH_COUNT, SKIP_GESTURE_COUNT_VALIDATOR);
		VALIDATORS.put(SILENCE_ALARMS_GESTURE_COUNT, SILENCE_GESTURE_COUNT_VALIDATOR);
		VALIDATORS.put(SILENCE_TIMER_GESTURE_COUNT, SILENCE_GESTURE_COUNT_VALIDATOR);
		VALIDATORS.put(SILENCE_CALL_GESTURE_COUNT, SILENCE_GESTURE_COUNT_VALIDATOR);
		VALIDATORS.put(SILENCE_NOTIFICATION_GESTURE_COUNT, SILENCE_GESTURE_COUNT_VALIDATOR);
		VALIDATORS.put(SILENCE_ALARMS_TOUCH_COUNT, SILENCE_GESTURE_COUNT_VALIDATOR);
		VALIDATORS.put(SILENCE_TIMER_TOUCH_COUNT, SILENCE_GESTURE_COUNT_VALIDATOR);
		VALIDATORS.put(SILENCE_CALL_TOUCH_COUNT, SILENCE_GESTURE_COUNT_VALIDATOR);
		VALIDATORS.put(ODI_CAPTIONS_ENABLED, ODI_CAPTIONS_ENABLED_VALIDATOR);
		VALIDATORS.put(DARK_MODE_DIALOG_SEEN, BOOLEAN_VALIDATOR);
		VALIDATORS.put(UI_NIGHT_MODE, UI_NIGHT_MODE_VALIDATOR);

core/proto/android/providers/settings/secure.proto

+9 −1

Original line number	Diff line number	Diff line
		@@ -198,11 +198,19 @@ message SecureSettingsProto {
		optional SettingProto silence_alarms_count = 2 [ (android.privacy).dest = DEST_AUTOMATIC ];
		optional SettingProto silence_calls_count = 3 [ (android.privacy).dest = DEST_AUTOMATIC ];
		optional SettingProto silence_enabled = 4 [ (android.privacy).dest = DEST_AUTOMATIC ];
		optional SettingProto silence_notification_count = 5 [ (android.privacy).dest = DEST_AUTOMATIC ];
		// del: silence_notification_count = 5
		optional SettingProto silence_timer_count = 6 [ (android.privacy).dest = DEST_AUTOMATIC ];

		optional SettingProto skip_count = 7 [ (android.privacy).dest = DEST_AUTOMATIC ];
		optional SettingProto skip_enabled = 8 [ (android.privacy).dest = DEST_AUTOMATIC ];

		optional SettingProto silence_alarms_touch_count = 9 [ (android.privacy).dest =
		DEST_AUTOMATIC ];
		optional SettingProto silence_calls_touch_count = 10 [ (android.privacy).dest =
		DEST_AUTOMATIC ];
		optional SettingProto silence_timer_touch_count = 11 [ (android.privacy).dest =
		DEST_AUTOMATIC ];
		optional SettingProto skip_touch_count = 12 [ (android.privacy).dest = DEST_AUTOMATIC ];
		}
		optional Gesture gesture = 74;

packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java

+13 −3

Original line number	Diff line number	Diff line
		@@ -1943,9 +1943,6 @@ class SettingsProtoDumpUtil {
		dumpSetting(s, p,
		Settings.Secure.SILENCE_GESTURE,
		SecureSettingsProto.Gesture.SILENCE_ENABLED);
		dumpSetting(s, p,
		Settings.Secure.SILENCE_NOTIFICATION_GESTURE_COUNT,
		SecureSettingsProto.Gesture.SILENCE_NOTIFICATION_COUNT);
		dumpSetting(s, p,
		Settings.Secure.SILENCE_TIMER_GESTURE_COUNT,
		SecureSettingsProto.Gesture.SILENCE_TIMER_COUNT);
		@@ -1956,6 +1953,19 @@ class SettingsProtoDumpUtil {
		dumpSetting(s, p,
		Settings.Secure.SKIP_GESTURE,
		SecureSettingsProto.Gesture.SKIP_ENABLED);

		dumpSetting(s, p,
		Settings.Secure.SILENCE_ALARMS_TOUCH_COUNT,
		SecureSettingsProto.Gesture.SILENCE_ALARMS_TOUCH_COUNT);
		dumpSetting(s, p,
		Settings.Secure.SILENCE_CALL_TOUCH_COUNT,
		SecureSettingsProto.Gesture.SILENCE_CALLS_TOUCH_COUNT);
		dumpSetting(s, p,
		Settings.Secure.SILENCE_TIMER_TOUCH_COUNT,
		SecureSettingsProto.Gesture.SILENCE_TIMER_TOUCH_COUNT);
		dumpSetting(s, p,
		Settings.Secure.SKIP_TOUCH_COUNT,
		SecureSettingsProto.Gesture.SKIP_TOUCH_COUNT);
		p.end(gestureToken);

		dumpSetting(s, p,