Revert "Add new importance level for blocking lock screen notifications (1/2)" (7517e805) · Commits · e / os / android_frameworks_base

core/java/android/app/NotificationManager.java

+5 −11

Original line number	Diff line number	Diff line
		@@ -182,7 +182,7 @@ public class NotificationManager

		/** @hide */
		@IntDef({VISIBILITY_NO_OVERRIDE, IMPORTANCE_UNSPECIFIED, IMPORTANCE_NONE,
		IMPORTANCE_MIN, IMPORTANCE_VERY_LOW, IMPORTANCE_LOW, IMPORTANCE_DEFAULT, IMPORTANCE_HIGH,
		IMPORTANCE_MIN, IMPORTANCE_LOW, IMPORTANCE_DEFAULT, IMPORTANCE_HIGH,
		IMPORTANCE_MAX})
		@Retention(RetentionPolicy.SOURCE)
		public @interface Importance {}
		@@ -208,33 +208,27 @@ public class NotificationManager
		*/
		public static final int IMPORTANCE_MIN = 1;

		/**
		* Very low notification importance: shows on the status bar, but never
		* on the lock screen and is not intrusive.
		*/
		public static final int IMPORTANCE_VERY_LOW = 2;

		/**
		* Low notification importance: shows everywhere, but is not intrusive.
		*/
		public static final int IMPORTANCE_LOW = 3;
		public static final int IMPORTANCE_LOW = 2;

		/**
		* Default notification importance: shows everywhere, allowed to makes noise,
		* but does not visually intrude.
		*/
		public static final int IMPORTANCE_DEFAULT = 4;
		public static final int IMPORTANCE_DEFAULT = 3;

		/**
		* Higher notification importance: shows everywhere, allowed to makes noise and peek.
		*/
		public static final int IMPORTANCE_HIGH = 5;
		public static final int IMPORTANCE_HIGH = 4;

		/**
		* Highest notification importance: shows everywhere, allowed to makes noise, peek, and
		* use full screen intents.
		*/
		public static final int IMPORTANCE_MAX = 6;
		public static final int IMPORTANCE_MAX = 5;

		private static INotificationManager sService;

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

+1 −10

Original line number	Diff line number	Diff line
		@@ -1038,13 +1038,6 @@ public abstract class NotificationListenerService extends Service {
		*/
		public static final int IMPORTANCE_MIN = NotificationManager.IMPORTANCE_MIN;

		/**
		* Very low notification importance: not on lock screen and not intrusive.
		*
		* @hide
		*/
		public static final int IMPORTANCE_VERY_LOW = NotificationManager.IMPORTANCE_VERY_LOW;

		/**
		* Low notification importance: shows everywhere, but is not intrusive.
		*
		@@ -1176,7 +1169,7 @@ public abstract class NotificationListenerService extends Service {
		CharSequence explanation, String overrideGroupKey) {
		mKey = key;
		mRank = rank;
		mIsAmbient = importance < IMPORTANCE_VERY_LOW;
		mIsAmbient = importance < IMPORTANCE_LOW;
		mMatchesInterruptionFilter = matchesInterruptionFilter;
		mVisibilityOverride = visibilityOverride;
		mSuppressedVisualEffects = suppressedVisualEffects;
		@@ -1196,8 +1189,6 @@ public abstract class NotificationListenerService extends Service {
		return "NONE";
		case IMPORTANCE_MIN:
		return "MIN";
		case IMPORTANCE_VERY_LOW:
		return "VERY_LOW";
		case IMPORTANCE_LOW:
		return "LOW";
		case IMPORTANCE_DEFAULT:

packages/SystemUI/res/layout/power_notification_controls_settings.xml

+1 −1

Original line number	Diff line number	Diff line
		@@ -25,6 +25,6 @@
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:padding="16dp"
		android:text="@string/cm_power_notification_controls_description"/>
		android:text="@string/power_notification_controls_description"/>

		</LinearLayout>

packages/SystemUI/res/values/cm_strings.xml

+0 −38

Original line number	Diff line number	Diff line
		@@ -36,44 +36,6 @@
		<string name="quick_settings_tile_flashlight_not_title">Flashlight is on</string>
		<string name="quick_settings_tile_flashlight_not_summary">Tap to turn off</string>

		<!-- [CHAR LIMIT=NONE] Importance Tuner setting title -->
		<string name="cm_power_notification_controls_description">With power notification controls, you can set an importance level from 0 to 6 for an app\'s notifications.
		\n\n<b>Level 6</b>
		\n- Show at the top of the notification list
		\n- Allow full screen interruption
		\n- Always peek
		\n\n<b>Level 5</b>
		\n- Prevent full screen interruption
		\n- Always peek
		\n\n<b>Level 4</b>
		\n- Prevent full screen interruption
		\n- Never peek
		\n\n<b>Level 3</b>
		\n- Prevent full screen interruption
		\n- Never peek
		\n- Never make sound and vibration
		\n\n<b>Level 2</b>
		\n- Prevent full screen interruption
		\n- Never peek
		\n- Never make sound or vibrate
		\n- Hide from lock screen
		\n- Show at the bottom of the notification list
		\n\n<b>Level 1</b>
		\n- Prevent full screen interruption
		\n- Never peek
		\n- Never make sound or vibrate
		\n- Hide from lock screen and status bar
		\n- Show at the bottom of the notification list
		\n\n<b>Level 0</b>
		\n- Block all notifications from the app
		</string>

		<!-- Notification importance level title-->
		<string name="importance_level_title">Importance: Level %1$d</string>

		<!-- [CHAR LIMIT=100] Notification Importance slider: very low importance level description -->
		<string name="notification_importance_very_low">No full screen interruption, peeking, sound, or vibration. Hide from lock screen.</string>

		<!-- Screen pinning dialog description (for devices without navbar) -->
		<string name="screen_pinning_description_no_navbar">This keeps it in view until you unpin. Touch and hold the Back button to unpin.</string>

packages/SystemUI/res/values/strings.xml

+36 −0

Original line number	Diff line number	Diff line
		@@ -1279,9 +1279,45 @@
		<string name="tuner_full_importance_settings">Power notification controls</string>
		<string name="tuner_full_importance_settings_on">On</string>
		<string name="tuner_full_importance_settings_off">Off</string>
		<string name="power_notification_controls_description">With power notification controls, you can set an importance level from 0 to 5 for an app\'s notifications.
		\n\n<b>Level 5</b>
		\n- Show at the top of the notification list
		\n- Allow full screen interruption
		\n- Always peek
		\n\n<b>Level 4</b>
		\n- Prevent full screen interruption
		\n- Always peek
		\n\n<b>Level 3</b>
		\n- Prevent full screen interruption
		\n- Never peek
		\n\n<b>Level 2</b>
		\n- Prevent full screen interruption
		\n- Never peek
		\n- Never make sound and vibration
		\n\n<b>Level 1</b>
		\n- Prevent full screen interruption
		\n- Never peek
		\n- Never make sound or vibrate
		\n- Hide from lock screen and status bar
		\n- Show at the bottom of the notification list
		\n\n<b>Level 0</b>
		\n- Block all notifications from the app
		</string>

		<!-- Notification importance title, user unspecified status-->
		<string name="user_unspecified_importance">Importance: Automatic</string>
		<!-- Notification importance title, blocked status-->
		<string name="blocked_importance">Importance: Level 0</string>
		<!-- Notification importance title, min status-->
		<string name="min_importance">Importance: Level 1</string>
		<!-- Notification importance title, low status-->
		<string name="low_importance">Importance: Level 2</string>
		<!-- Notification importance title, normal status-->
		<string name="default_importance">Importance: Level 3</string>
		<!-- Notification importance title, high status-->
		<string name="high_importance">Importance: Level 4</string>
		<!-- Notification importance title, max status-->
		<string name="max_importance">Importance: Level 5</string>

		<!-- [CHAR LIMIT=100] Notification Importance slider: blocked importance level description -->
		<string name="notification_importance_user_unspecified">App determines importance for each notification.</string>