Merge "Create SMART_SUGGESTIONS_IN_NOTIFICATIONS_FLAGS" (0b243df3) · Commits · e / os / android_frameworks_base

core/java/android/provider/Settings.java

+16 −0

Original line number	Diff line number	Diff line
		@@ -13670,6 +13670,22 @@ public final class Settings {
		public static final String SMART_REPLIES_IN_NOTIFICATIONS_FLAGS =
		"smart_replies_in_notifications_flags";

		/**
		* Configuration flags for the automatic generation of smart replies and smart actions in
		* notifications. This is encoded as a key=value list, separated by commas. Ex:
		* "generate_replies=false,generate_actions=true".
		*
		* The following keys are supported:
		*
		* <pre>
		* generate_replies (boolean)
		* generate_actions (boolean)
		* </pre>
		* @hide
		*/
		public static final String SMART_SUGGESTIONS_IN_NOTIFICATIONS_FLAGS =
		"smart_suggestions_in_notifications_flags";

		/**
		* If nonzero, crashes in foreground processes will bring up a dialog.
		* Otherwise, the process will be silently killed.

+3 −0

Original line number	Diff line number	Diff line
		@@ -635,6 +635,9 @@ message GlobalSettingsProto {
		// separated by commas.
		optional SettingProto snooze_options = 3 [ (android.privacy).dest = DEST_AUTOMATIC ];
		optional SettingProto smart_replies_in_notifications_flags = 4 [ (android.privacy).dest = DEST_AUTOMATIC ];
		// Configuration options for smart replies and smart actions in notifications. This is
		// encoded as a key=value list separated by commas.
		optional SettingProto smart_suggestions_in_notifications_flags = 5 [ (android.privacy).dest = DEST_AUTOMATIC ];
		}
		optional Notification notification = 82;

+1 −0

Original line number	Diff line number	Diff line
		@@ -248,6 +248,7 @@ public class SettingsBackupTest {
		Settings.Global.DYNAMIC_POWER_SAVINGS_ENABLED,
		Settings.Global.DYNAMIC_POWER_SAVINGS_DISABLE_THRESHOLD,
		Settings.Global.SMART_REPLIES_IN_NOTIFICATIONS_FLAGS,
		Settings.Global.SMART_SUGGESTIONS_IN_NOTIFICATIONS_FLAGS,
		Settings.Global.ENHANCED_4G_MODE_ENABLED,
		Settings.Global.EPHEMERAL_COOKIE_MAX_SIZE_BYTES,
		Settings.Global.ERROR_LOGCAT_PREFIX,

+3 −0

Original line number	Diff line number	Diff line
		@@ -1004,6 +1004,9 @@ class SettingsProtoDumpUtil {
		dumpSetting(s, p,
		Settings.Global.SMART_REPLIES_IN_NOTIFICATIONS_FLAGS,
		GlobalSettingsProto.Notification.SMART_REPLIES_IN_NOTIFICATIONS_FLAGS);
		dumpSetting(s, p,
		Settings.Global.SMART_SUGGESTIONS_IN_NOTIFICATIONS_FLAGS,
		GlobalSettingsProto.Notification.SMART_SUGGESTIONS_IN_NOTIFICATIONS_FLAGS);
		p.end(notificationToken);

		dumpSetting(s, p,