Merge "Clean up smart_suggestions_in_notifications_flags settings" into main (823999d1) · Commits · e / os / android_frameworks_base

core/java/android/provider/Settings.java

+0 −17

Original line number	Diff line number	Diff line
		@@ -19932,23 +19932,6 @@ 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
		*/
		@Readable
		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.

+0 −3

Original line number	Diff line number	Diff line
		@@ -719,9 +719,6 @@ 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 SettingProto bubbles = 6 [ (android.privacy).dest = DEST_AUTOMATIC ];
		optional SettingProto disable_screen_share_protections_for_apps_and_notifications = 7 [ (android.privacy).dest = DEST_AUTOMATIC ];
		}

+0 −3

Original line number	Diff line number	Diff line
		@@ -1116,9 +1116,6 @@ 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);
		dumpSetting(s, p,
		Settings.Global.DISABLE_SCREEN_SHARE_PROTECTIONS_FOR_APPS_AND_NOTIFICATIONS,
		GlobalSettingsProto.Notification

+0 −1

Original line number	Diff line number	Diff line
		@@ -229,7 +229,6 @@ 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.STYLUS_EVER_USED,
		Settings.Global.ENABLE_ADB_INCREMENTAL_INSTALL_DEFAULT,
		Settings.Global.ENABLE_MULTI_SLOT_TIMEOUT_MILLIS,