Merge "Update DND visual interruption choices." into nyc-dev (ae0f0da9) · Commits · e / os / android_frameworks_base

api/current.txt

+4 −7

Original line number	Diff line number	Diff line
		@@ -5259,10 +5259,8 @@ package android.app {
		field public static final int PRIORITY_SENDERS_ANY = 0; // 0x0
		field public static final int PRIORITY_SENDERS_CONTACTS = 1; // 0x1
		field public static final int PRIORITY_SENDERS_STARRED = 2; // 0x2
		field public static final int SUPPRESSED_EFFECTS_UNSET = -1; // 0xffffffff
		field public static final int SUPPRESSED_EFFECT_LIGHTS = 1; // 0x1
		field public static final int SUPPRESSED_EFFECT_PEEK = 2; // 0x2
		field public static final int SUPPRESSED_EFFECT_SCREEN_ON = 4; // 0x4
		field public static final int SUPPRESSED_EFFECT_SCREEN_OFF = 1; // 0x1
		field public static final int SUPPRESSED_EFFECT_SCREEN_ON = 2; // 0x2
		field public final int priorityCallSenders;
		field public final int priorityCategories;
		field public final int priorityMessageSenders;
		@@ -34457,9 +34455,8 @@ package android.service.notification {
		field public static final int INTERRUPTION_FILTER_PRIORITY = 2; // 0x2
		field public static final int INTERRUPTION_FILTER_UNKNOWN = 0; // 0x0
		field public static final java.lang.String SERVICE_INTERFACE = "android.service.notification.NotificationListenerService";
		field public static final int SUPPRESSED_EFFECT_LIGHTS = 1; // 0x1
		field public static final int SUPPRESSED_EFFECT_PEEK = 2; // 0x2
		field public static final int SUPPRESSED_EFFECT_SCREEN_ON = 4; // 0x4
		field public static final int SUPPRESSED_EFFECT_SCREEN_OFF = 1; // 0x1
		field public static final int SUPPRESSED_EFFECT_SCREEN_ON = 2; // 0x2
		}

		public static class NotificationListenerService.Ranking {

api/system-current.txt

+4 −7

Original line number	Diff line number	Diff line
		@@ -5392,10 +5392,8 @@ package android.app {
		field public static final int PRIORITY_SENDERS_ANY = 0; // 0x0
		field public static final int PRIORITY_SENDERS_CONTACTS = 1; // 0x1
		field public static final int PRIORITY_SENDERS_STARRED = 2; // 0x2
		field public static final int SUPPRESSED_EFFECTS_UNSET = -1; // 0xffffffff
		field public static final int SUPPRESSED_EFFECT_LIGHTS = 1; // 0x1
		field public static final int SUPPRESSED_EFFECT_PEEK = 2; // 0x2
		field public static final int SUPPRESSED_EFFECT_SCREEN_ON = 4; // 0x4
		field public static final int SUPPRESSED_EFFECT_SCREEN_OFF = 1; // 0x1
		field public static final int SUPPRESSED_EFFECT_SCREEN_ON = 2; // 0x2
		field public final int priorityCallSenders;
		field public final int priorityCategories;
		field public final int priorityMessageSenders;
		@@ -36904,9 +36902,8 @@ package android.service.notification {
		field public static final int INTERRUPTION_FILTER_PRIORITY = 2; // 0x2
		field public static final int INTERRUPTION_FILTER_UNKNOWN = 0; // 0x0
		field public static final java.lang.String SERVICE_INTERFACE = "android.service.notification.NotificationListenerService";
		field public static final int SUPPRESSED_EFFECT_LIGHTS = 1; // 0x1
		field public static final int SUPPRESSED_EFFECT_PEEK = 2; // 0x2
		field public static final int SUPPRESSED_EFFECT_SCREEN_ON = 4; // 0x4
		field public static final int SUPPRESSED_EFFECT_SCREEN_OFF = 1; // 0x1
		field public static final int SUPPRESSED_EFFECT_SCREEN_ON = 2; // 0x2
		field public static final int TRIM_FULL = 0; // 0x0
		field public static final int TRIM_LIGHT = 1; // 0x1
		}

api/test-current.txt

+4 −7

Original line number	Diff line number	Diff line
		@@ -5259,10 +5259,8 @@ package android.app {
		field public static final int PRIORITY_SENDERS_ANY = 0; // 0x0
		field public static final int PRIORITY_SENDERS_CONTACTS = 1; // 0x1
		field public static final int PRIORITY_SENDERS_STARRED = 2; // 0x2
		field public static final int SUPPRESSED_EFFECTS_UNSET = -1; // 0xffffffff
		field public static final int SUPPRESSED_EFFECT_LIGHTS = 1; // 0x1
		field public static final int SUPPRESSED_EFFECT_PEEK = 2; // 0x2
		field public static final int SUPPRESSED_EFFECT_SCREEN_ON = 4; // 0x4
		field public static final int SUPPRESSED_EFFECT_SCREEN_OFF = 1; // 0x1
		field public static final int SUPPRESSED_EFFECT_SCREEN_ON = 2; // 0x2
		field public final int priorityCallSenders;
		field public final int priorityCategories;
		field public final int priorityMessageSenders;
		@@ -34472,9 +34470,8 @@ package android.service.notification {
		field public static final int INTERRUPTION_FILTER_PRIORITY = 2; // 0x2
		field public static final int INTERRUPTION_FILTER_UNKNOWN = 0; // 0x0
		field public static final java.lang.String SERVICE_INTERFACE = "android.service.notification.NotificationListenerService";
		field public static final int SUPPRESSED_EFFECT_LIGHTS = 1; // 0x1
		field public static final int SUPPRESSED_EFFECT_PEEK = 2; // 0x2
		field public static final int SUPPRESSED_EFFECT_SCREEN_ON = 4; // 0x4
		field public static final int SUPPRESSED_EFFECT_SCREEN_OFF = 1; // 0x1
		field public static final int SUPPRESSED_EFFECT_SCREEN_ON = 2; // 0x2
		}

		public static class NotificationListenerService.Ranking {

core/java/android/app/NotificationManager.java

+15 −7

Original line number	Diff line number	Diff line
		@@ -646,14 +646,23 @@ public class NotificationManager
		* PRIORITY_SENDERS_ANY, PRIORITY_SENDERS_CONTACTS, PRIORITY_SENDERS_STARRED */
		public final int priorityMessageSenders;

		/**
		* @hide
		*/
		public static final int SUPPRESSED_EFFECTS_UNSET = -1;
		public static final int SUPPRESSED_EFFECT_LIGHTS = 1 << 0;
		public static final int SUPPRESSED_EFFECT_PEEK = 1 << 1;
		public static final int SUPPRESSED_EFFECT_SCREEN_ON = 1 << 2;
		/**
		* Whether notification suppressed by DND should not interruption visually when the screen
		* is off.
		*/
		public static final int SUPPRESSED_EFFECT_SCREEN_OFF = 1 << 0;
		/**
		* Whether notification suppressed by DND should not interruption visually when the screen
		* is on.
		*/
		public static final int SUPPRESSED_EFFECT_SCREEN_ON = 1 << 1;

		private static final int[] ALL_SUPPRESSED_EFFECTS = {
		SUPPRESSED_EFFECT_LIGHTS,
		SUPPRESSED_EFFECT_PEEK,
		SUPPRESSED_EFFECT_SCREEN_OFF,
		SUPPRESSED_EFFECT_SCREEN_ON,
		};

		@@ -762,8 +771,7 @@ public class NotificationManager

		private static String effectToString(int effect) {
		switch (effect) {
		case SUPPRESSED_EFFECT_LIGHTS: return "SUPPRESSED_EFFECT_LIGHTS";
		case SUPPRESSED_EFFECT_PEEK: return "SUPPRESSED_EFFECT_PEEK";
		case SUPPRESSED_EFFECT_SCREEN_OFF: return "SUPPRESSED_EFFECT_SCREEN_OFF";
		case SUPPRESSED_EFFECT_SCREEN_ON: return "SUPPRESSED_EFFECT_SCREEN_ON";
		case SUPPRESSED_EFFECTS_UNSET: return "SUPPRESSED_EFFECTS_UNSET";
		default: return "UNKNOWN_" + effect;

core/java/android/service/notification/NotificationListenerService.java

+11 −6

Original line number	Diff line number	Diff line
		@@ -119,10 +119,16 @@ public abstract class NotificationListenerService extends Service {
		* This does not change the interruption filter, only the effects. **/
		public static final int HINT_HOST_DISABLE_EFFECTS = 1;

		public static final int SUPPRESSED_EFFECT_LIGHTS =
		NotificationManager.Policy.SUPPRESSED_EFFECT_LIGHTS;
		public static final int SUPPRESSED_EFFECT_PEEK =
		NotificationManager.Policy.SUPPRESSED_EFFECT_PEEK;
		/**
		* Whether notification suppressed by DND should not interruption visually when the screen is
		* off.
		*/
		public static final int SUPPRESSED_EFFECT_SCREEN_OFF =
		NotificationManager.Policy.SUPPRESSED_EFFECT_SCREEN_OFF;
		/**
		* Whether notification suppressed by DND should not interruption visually when the screen is
		* on.
		*/
		public static final int SUPPRESSED_EFFECT_SCREEN_ON =
		NotificationManager.Policy.SUPPRESSED_EFFECT_SCREEN_ON;

		@@ -993,8 +999,7 @@ public abstract class NotificationListenerService extends Service {

		/**
		* Returns the type(s) of visual effects that should be suppressed for this notification.
		* See {@link #SUPPRESSED_EFFECT_LIGHTS}, {@link #SUPPRESSED_EFFECT_PEEK},
		* {@link #SUPPRESSED_EFFECT_SCREEN_ON}.
		* See {@link #SUPPRESSED_EFFECT_SCREEN_OFF}, {@link #SUPPRESSED_EFFECT_SCREEN_ON}.
		*/
		public int getSuppressedVisualEffects() {
		return mSuppressedVisualEffects;