Merge "DND visual interruptions: prevent screen on." (ed150013) · Commits · e / os / android_frameworks_base

api/current.txt

+2 −0

Original line number	Diff line number	Diff line
		@@ -5197,6 +5197,7 @@ package android.app {
		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 final int priorityCallSenders;
		field public final int priorityCategories;
		field public final int priorityMessageSenders;
		@@ -33560,6 +33561,7 @@ package android.service.notification {
		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
		}

		public static class NotificationListenerService.Ranking {

+2 −0

Original line number	Diff line number	Diff line
		@@ -5317,6 +5317,7 @@ package android.app {
		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 final int priorityCallSenders;
		field public final int priorityCategories;
		field public final int priorityMessageSenders;
		@@ -35707,6 +35708,7 @@ package android.service.notification {
		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 TRIM_FULL = 0; // 0x0
		field public static final int TRIM_LIGHT = 1; // 0x1
		}

+2 −0

Original line number	Diff line number	Diff line
		@@ -5197,6 +5197,7 @@ package android.app {
		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 final int priorityCallSenders;
		field public final int priorityCategories;
		field public final int priorityMessageSenders;
		@@ -33563,6 +33564,7 @@ package android.service.notification {
		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
		}

		public static class NotificationListenerService.Ranking {

+3 −0

Original line number	Diff line number	Diff line
		@@ -637,10 +637,12 @@ public class NotificationManager
		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;

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

		/**
		@@ -750,6 +752,7 @@ public class NotificationManager
		switch (effect) {
		case SUPPRESSED_EFFECT_LIGHTS: return "SUPPRESSED_EFFECT_LIGHTS";
		case SUPPRESSED_EFFECT_PEEK: return "SUPPRESSED_EFFECT_PEEK";
		case SUPPRESSED_EFFECT_SCREEN_ON: return "SUPPRESSED_EFFECT_SCREEN_ON";
		case SUPPRESSED_EFFECTS_UNSET: return "SUPPRESSED_EFFECTS_UNSET";
		default: return "UNKNOWN_" + effect;
		}

+4 −1

Original line number	Diff line number	Diff line
		@@ -123,6 +123,8 @@ public abstract class NotificationListenerService extends Service {
		NotificationManager.Policy.SUPPRESSED_EFFECT_LIGHTS;
		public static final int SUPPRESSED_EFFECT_PEEK =
		NotificationManager.Policy.SUPPRESSED_EFFECT_PEEK;
		public static final int SUPPRESSED_EFFECT_SCREEN_ON =
		NotificationManager.Policy.SUPPRESSED_EFFECT_SCREEN_ON;

		/**
		* The full trim of the StatusBarNotification including all its features.
		@@ -961,7 +963,8 @@ 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}}.
		* See {@link #SUPPRESSED_EFFECT_LIGHTS}, {@link #SUPPRESSED_EFFECT_PEEK},
		* {@link #SUPPRESSED_EFFECT_SCREEN_ON}.
		*/
		public int getSuppressedVisualEffects() {
		return mSuppressedVisualEffects;