Merge "Conversation Blocklist" into sc-dev (b3a5d74f) · Commits · e / os / android_frameworks_base

core/java/com/android/internal/config/sysui/SystemUiDeviceConfigFlags.java

+5 −0

Original line number	Diff line number	Diff line
		@@ -62,6 +62,11 @@ public final class SystemUiDeviceConfigFlags {
		*/
		public static final String ENABLE_NAS_FEEDBACK = "enable_nas_feedback";

		/**
		* Whether the Notification Assistant can label a notification not a conversation
		*/
		public static final String ENABLE_NAS_NOT_CONVERSATION = "enable_nas_not_conversation";

		// Flags related to screenshot intelligence

		/**

+9 −1

Original line number	Diff line number	Diff line
		@@ -377,7 +377,8 @@ public class NotificationManagerService extends SystemService {

		static final String[] DEFAULT_ALLOWED_ADJUSTMENTS = new String[] {
		Adjustment.KEY_CONTEXTUAL_ACTIONS,
		Adjustment.KEY_TEXT_REPLIES};
		Adjustment.KEY_TEXT_REPLIES,
		Adjustment.KEY_NOT_CONVERSATION};

		static final String[] NON_BLOCKABLE_DEFAULT_ROLES = new String[] {
		RoleManager.ROLE_DIALER,
		@@ -2313,6 +2314,13 @@ public class NotificationManagerService extends SystemService {
		} else if ("false".equals(value)) {
		mAssistants.disallowAdjustmentType(Adjustment.KEY_RANKING_SCORE);
		}
		} else if (SystemUiDeviceConfigFlags.ENABLE_NAS_NOT_CONVERSATION.equals(name)) {
		String value = properties.getString(name, null);
		if ("true".equals(value)) {
		mAssistants.allowAdjustmentType(Adjustment.KEY_NOT_CONVERSATION);
		} else if ("false".equals(value)) {
		mAssistants.disallowAdjustmentType(Adjustment.KEY_NOT_CONVERSATION);
		}
		}
		}
		};